aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/i915_reg.h4
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index eb44432d79bf..edced95aa75f 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -3020,6 +3020,10 @@
3020#define ILK_DPFC_DIS1 (1<<8) 3020#define ILK_DPFC_DIS1 (1<<8)
3021#define ILK_DPFC_DIS2 (1<<9) 3021#define ILK_DPFC_DIS2 (1<<9)
3022 3022
3023#define IVB_CHICKEN3 0x4200c
3024# define CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE (1 << 5)
3025# define CHICKEN3_DGMG_DONE_FIX_DISABLE (1 << 2)
3026
3023#define DISP_ARB_CTL 0x45000 3027#define DISP_ARB_CTL 0x45000
3024#define DISP_TILE_SURFACE_SWIZZLING (1<<13) 3028#define DISP_TILE_SURFACE_SWIZZLING (1<<13)
3025#define DISP_FBC_WM_DIS (1<<15) 3029#define DISP_FBC_WM_DIS (1<<15)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 30397b74a4a3..2e00c8ae361c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8450,6 +8450,10 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)
8450 8450
8451 I915_WRITE(ILK_DSPCLK_GATE, IVB_VRHUNIT_CLK_GATE); 8451 I915_WRITE(ILK_DSPCLK_GATE, IVB_VRHUNIT_CLK_GATE);
8452 8452
8453 I915_WRITE(IVB_CHICKEN3,
8454 CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE |
8455 CHICKEN3_DGMG_DONE_FIX_DISABLE);
8456
8453 for_each_pipe(pipe) { 8457 for_each_pipe(pipe) {
8454 I915_WRITE(DSPCNTR(pipe), 8458 I915_WRITE(DSPCNTR(pipe),
8455 I915_READ(DSPCNTR(pipe)) | 8459 I915_READ(DSPCNTR(pipe)) |