drm/i915: Set two chicken bits implicated in missed IRQs on Ivybridge.
Subsystems (2)
PATCH 1/1 drm/i915: Set two chicken bits implicated in missed IRQs on Ivybridge.
They don't fix our problems alone, but we're told to set them.
---
I think this is -next material, since it's not clearly fixing a bug.
drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_display.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -2883,6 +2883,10 @@#define ILK_DPFC_DIS1 (1<<8)#define ILK_DPFC_DIS2 (1<<9) +#define IVB_CHICKEN3 0x4200c +# define CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE (1 << 5) +# define CHICKEN3_DGMG_DONE_FIX_DISABLE (1 << 2) +#define DISP_ARB_CTL 0x45000#define DISP_TILE_SURFACE_SWIZZLING (1<<13)#define DISP_FBC_WM_DIS (1<<15)
drivers/gpu/drm/i915/intel_display.c +4 -0
@@ -8252,6 +8252,10 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)I915_WRITE (ILK_DSPCLK_GATE ,IVB_VRHUNIT_CLK_GATE ); +I915_WRITE (IVB_CHICKEN3 , +CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE | +CHICKEN3_DGMG_DONE_FIX_DISABLE ); +for_each_pipe (pipe) { I915_WRITE(DSPCNTR(pipe), I915_READ(DSPCNTR(pipe)) |
Signature · 1 line
1.7.7.3
Quoted 31 lines · Eric Anholt
They don't fix our problems alone, but we're told to set them.
Signed-off-by Eric Anholt <[email protected]>---
I think this is -next material, since it's not clearly fixing a bug.
drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_display.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-)drivers/gpu/drm/i915/i915_reg.h +4
-0@@ -2883,6 +2883,10 @@#define ILK_DPFC_DIS1 (1<<8)#define ILK_DPFC_DIS2 (1<<9) +#define IVB_CHICKEN3 0x4200c +# define CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE (1 << 5) +# define CHICKEN3_DGMG_DONE_FIX_DISABLE (1 << 2) +#define DISP_ARB_CTL 0x45000#define DISP_TILE_SURFACE_SWIZZLING (1<<13)#define DISP_FBC_WM_DIS (1<<15)drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c static void ivybridge_init_clock_gating(struct drm_device *dev) · line 8261
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +4
-0@@ -8252,6 +8252,10 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)I915_WRITE (ILK_DSPCLK_GATE ,IVB_VRHUNIT_CLK_GATE ); +I915_WRITE (IVB_CHICKEN3 , +CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE | +CHICKEN3_DGMG_DONE_FIX_DISABLE ); +for_each_pipe (pipe) { I915_WRITE(DSPCNTR(pipe), I915_READ(DSPCNTR(pipe)) |
Fwiw, CHICKEN3_DGMG_DONE_FIX_DISABLE also applies to SNB, but we're waiting on feedback if we should set it. It may be better to set both platforms at once (ie. hold off on this patch)?
Ben
Quoted 9 lines · Ben Widawsky
Quoted 8 lines · Eric Anholt
drivers/gpu/drm/i915/intel_display.c +0
-0@@ -8252,6 +8252,10 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)I915_WRITE (ILK_DSPCLK_GATE ,IVB_VRHUNIT_CLK_GATE );
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c static void ivybridge_init_clock_gating(struct drm_device *dev) · line 8261
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +4
-0+I915_WRITE (IVB_CHICKEN3 , +CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE | +CHICKEN3_DGMG_DONE_FIX_DISABLE ); +for_each_pipe (pipe) { I915_WRITE(DSPCNTR(pipe), I915_READ(DSPCNTR(pipe)) |Fwiw,
CHICKEN3_DGMG_DONE_FIX_DISABLEalso applies to SNB, but we're waiting on feedback if we should set it. It may be better to set both platforms at once (ie. hold off on this patch)?
If it's different code in a different place for a different platform, it should definitely be a different patch.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx