projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'spi/topic/build' into spi-next
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
radeon
/
rv770.c
diff --git
a/drivers/gpu/drm/radeon/rv770.c
b/drivers/gpu/drm/radeon/rv770.c
index 30ea14e8854c465add9148cb4099142a3295fbd0..f5e92cfcc140984bd63e1a892fa88277bb7530c3 100644
(file)
--- a/
drivers/gpu/drm/radeon/rv770.c
+++ b/
drivers/gpu/drm/radeon/rv770.c
@@
-744,10
+744,10
@@
static void rv770_init_golden_registers(struct radeon_device *rdev)
(const u32)ARRAY_SIZE(r7xx_golden_dyn_gpr_registers));
radeon_program_register_sequence(rdev,
rv730_golden_registers,
(const u32)ARRAY_SIZE(r7xx_golden_dyn_gpr_registers));
radeon_program_register_sequence(rdev,
rv730_golden_registers,
- (const u32)ARRAY_SIZE(rv7
7
0_golden_registers));
+ (const u32)ARRAY_SIZE(rv7
3
0_golden_registers));
radeon_program_register_sequence(rdev,
rv730_mgcg_init,
radeon_program_register_sequence(rdev,
rv730_mgcg_init,
- (const u32)ARRAY_SIZE(rv7
7
0_mgcg_init));
+ (const u32)ARRAY_SIZE(rv7
3
0_mgcg_init));
break;
case CHIP_RV710:
radeon_program_register_sequence(rdev,
break;
case CHIP_RV710:
radeon_program_register_sequence(rdev,
@@
-758,18
+758,18
@@
static void rv770_init_golden_registers(struct radeon_device *rdev)
(const u32)ARRAY_SIZE(r7xx_golden_dyn_gpr_registers));
radeon_program_register_sequence(rdev,
rv710_golden_registers,
(const u32)ARRAY_SIZE(r7xx_golden_dyn_gpr_registers));
radeon_program_register_sequence(rdev,
rv710_golden_registers,
- (const u32)ARRAY_SIZE(rv7
7
0_golden_registers));
+ (const u32)ARRAY_SIZE(rv7
1
0_golden_registers));
radeon_program_register_sequence(rdev,
rv710_mgcg_init,
radeon_program_register_sequence(rdev,
rv710_mgcg_init,
- (const u32)ARRAY_SIZE(rv7
7
0_mgcg_init));
+ (const u32)ARRAY_SIZE(rv7
1
0_mgcg_init));
break;
case CHIP_RV740:
radeon_program_register_sequence(rdev,
rv740_golden_registers,
break;
case CHIP_RV740:
radeon_program_register_sequence(rdev,
rv740_golden_registers,
- (const u32)ARRAY_SIZE(rv7
7
0_golden_registers));
+ (const u32)ARRAY_SIZE(rv7
4
0_golden_registers));
radeon_program_register_sequence(rdev,
rv740_mgcg_init,
radeon_program_register_sequence(rdev,
rv740_mgcg_init,
- (const u32)ARRAY_SIZE(rv7
7
0_mgcg_init));
+ (const u32)ARRAY_SIZE(rv7
4
0_mgcg_init));
break;
default:
break;
break;
default:
break;
@@
-813,7
+813,7
@@
int rv770_uvd_resume(struct radeon_device *rdev)
/* programm the VCPU memory controller bits 0-27 */
addr = rdev->uvd.gpu_addr >> 3;
/* programm the VCPU memory controller bits 0-27 */
addr = rdev->uvd.gpu_addr >> 3;
- size = RADEON_GPU_PAGE_ALIGN(rdev->uvd
.fw_
size + 4) >> 3;
+ size = RADEON_GPU_PAGE_ALIGN(rdev->uvd
_fw->
size + 4) >> 3;
WREG32(UVD_VCPU_CACHE_OFFSET0, addr);
WREG32(UVD_VCPU_CACHE_SIZE0, size);
WREG32(UVD_VCPU_CACHE_OFFSET0, addr);
WREG32(UVD_VCPU_CACHE_SIZE0, size);
@@
-1829,6
+1829,8
@@
static int rv770_startup(struct radeon_device *rdev)
/* enable pcie gen2 link */
rv770_pcie_gen2_enable(rdev);
/* enable pcie gen2 link */
rv770_pcie_gen2_enable(rdev);
+ rv770_mc_program(rdev);
+
if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {
r = r600_init_microcode(rdev);
if (r) {
if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {
r = r600_init_microcode(rdev);
if (r) {
@@
-1841,7
+1843,6
@@
static int rv770_startup(struct radeon_device *rdev)
if (r)
return r;
if (r)
return r;
- rv770_mc_program(rdev);
if (rdev->flags & RADEON_IS_AGP) {
rv770_agp_enable(rdev);
} else {
if (rdev->flags & RADEON_IS_AGP) {
rv770_agp_enable(rdev);
} else {
@@
-1983,6
+1984,7
@@
int rv770_resume(struct radeon_device *rdev)
int rv770_suspend(struct radeon_device *rdev)
{
r600_audio_fini(rdev);
int rv770_suspend(struct radeon_device *rdev)
{
r600_audio_fini(rdev);
+ r600_uvd_stop(rdev);
radeon_uvd_suspend(rdev);
r700_cp_stop(rdev);
r600_dma_stop(rdev);
radeon_uvd_suspend(rdev);
r700_cp_stop(rdev);
r600_dma_stop(rdev);
@@
-2098,6
+2100,7
@@
void rv770_fini(struct radeon_device *rdev)
radeon_ib_pool_fini(rdev);
radeon_irq_kms_fini(rdev);
rv770_pcie_gart_fini(rdev);
radeon_ib_pool_fini(rdev);
radeon_irq_kms_fini(rdev);
rv770_pcie_gart_fini(rdev);
+ r600_uvd_stop(rdev);
radeon_uvd_fini(rdev);
r600_vram_scratch_fini(rdev);
radeon_gem_fini(rdev);
radeon_uvd_fini(rdev);
r600_vram_scratch_fini(rdev);
radeon_gem_fini(rdev);
This page took
0.026309 seconds
and
5
git commands to generate.