drm/radeon/kms: add sanity check to wptr.
Subsystems (2)
Dave Airlie
maintainerPATCH 1/3 drm/radeon/kms: add sanity check to wptr.
From: Dave Airlie <[email protected]>
If we resume in a bad way, we'll get 0xffffffff in wptr, and then oops with no console. This just adds a sanity check so that we can avoid the oops and hopefully get more details out of people's systems.
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/radeon/r100.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/r100.c +2 -0
@@ -741,6 +741,8 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)udelay (10 ); rdev->cp.rptr =RREG32 (RADEON_CP_RB_RPTR ); rdev->cp.wptr =RREG32 (RADEON_CP_RB_WPTR ); +/* protect against crazy HW on resume */ + rdev->cp.wptr &= rdev->cp.ptr_mask;/* Set cp mode to bus mastering & enable cp*/ WREG32(RADEON_CP_CSQ_MODE, REG_SET(RADEON_INDIRECT2_START, indirect2_start) |
Signature · 10 lines
1.6.6 ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev --
Dave Airlie
maintainerPATCH 2/3 drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus.
From: Dave Airlie <[email protected]>
Some GPUs have an APM/ACPI PM mode selection switch and some BIOSes set this to APM. We really want this in ACPI mode for Linux.
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/radeon/r100.c | 7 +++++++ drivers/gpu/drm/radeon/radeon_reg.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/r100.c +7 -0
@@ -1806,6 +1806,7 @@ void r100_set_common_regs(struct radeon_device *rdev) {struct drm_device *dev = rdev->ddev;bool force_dac2 = false; +u32 tmp;/* set these so they don't interfere with anything */ WREG32 (RADEON_OV0_SCALE_CNTL ,0 );
@@ -1877,6 +1878,12 @@ void r100_set_common_regs(struct radeon_device *rdev)WREG32 (RADEON_DISP_HW_DEBUG , disp_hw_debug);WREG32 (RADEON_DAC_CNTL2 , dac2_cntl); } + +/* switch PM block to ACPI mode */ + tmp =RREG32_PLL (RADEON_PLL_PWRMGT_CNTL ); + tmp &= ~RADEON_PM_MODE_SEL ; +WREG32_PLL (RADEON_PLL_PWRMGT_CNTL , tmp); + }/*
drivers/gpu/drm/radeon/radeon_reg.h +1 -0
@@ -346,6 +346,7 @@# define RADEON_TVPLL_PWRMGT_OFF (1 << 30)# define RADEON_TVCLK_TURNOFF (1 << 31)#define RADEON_PLL_PWRMGT_CNTL 0x0015/* PLL */ +# define RADEON_PM_MODE_SEL (1 << 13)# define RADEON_TCL_BYPASS_DISABLE (1 << 20)#define RADEON_CLR_CMP_CLR_3D 0x1a24#define RADEON_CLR_CMP_CLR_DST 0x15c8
Signature · 10 lines
1.6.6 ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev --
Dave Airlie
maintainerPATCH 3/3 drm/radeon/kms: rs400/480 should set common registers.
From: Dave Airlie <[email protected]>
These GPUs should be setting these registers up also.
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/radeon/rs400.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/rs400.c +2 -0
@@ -388,6 +388,8 @@ static int rs400_startup(struct radeon_device *rdev) {int r; +r100_set_common_regs (rdev); +rs400_mc_program (rdev);/* Resume clock */ r300_clock_startup (rdev);
Signature · 10 lines
1.6.6 ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev --