diff options
author | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-11-03 00:07:54 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-08 12:10:03 -0500 |
commit | fe4ab3ceef20655d651160841a48f0419dfa0a5a (patch) | |
tree | 74a38bb8aa787825b6bcfb6c68acf5391f94babe /drivers/gpu/drm/i915/i915_reg.h | |
parent | e64c4a1b8a1fbf56cbeed794816e6587719fab5c (diff) |
drm/i915/bdw: Implement edp PSR workarounds
This implements a workaround for PSR dealing with some vblank issue.
WaPsrDPAMaskVBlankInSRD && WaPsrDPRSUnmaskVBlankInSRD
v2: forgot to git add bogus whitespace fix
v3: Update with workaround names.
Use for_each_pipe() and CHICKEN_PIPESL_1(pipe) macro (Ville)
Cc: Art Runyan <arthur.j.runyan@intel.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Jesse Barnes <jbarnes@virtuosugeek.org>
[danvet: Kill redundant IS_BDW check and remove the copious amount of
uneeded lines added.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index ffe88745898c..f5701ff8847d 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -4113,8 +4113,14 @@ | |||
4113 | # define CHICKEN3_DGMG_DONE_FIX_DISABLE (1 << 2) | 4113 | # define CHICKEN3_DGMG_DONE_FIX_DISABLE (1 << 2) |
4114 | 4114 | ||
4115 | #define CHICKEN_PAR1_1 0x42080 | 4115 | #define CHICKEN_PAR1_1 0x42080 |
4116 | #define DPA_MASK_VBLANK_SRD (1 << 15) | ||
4116 | #define FORCE_ARB_IDLE_PLANES (1 << 14) | 4117 | #define FORCE_ARB_IDLE_PLANES (1 << 14) |
4117 | 4118 | ||
4119 | #define _CHICKEN_PIPESL_1_A 0x420b0 | ||
4120 | #define _CHICKEN_PIPESL_1_B 0x420b4 | ||
4121 | #define DPRS_MASK_VBLANK_SRD (1 << 0) | ||
4122 | #define CHICKEN_PIPESL_1(pipe) _PIPE(pipe, _CHICKEN_PIPESL_1_A, _CHICKEN_PIPESL_1_B) | ||
4123 | |||
4118 | #define DISP_ARB_CTL 0x45000 | 4124 | #define DISP_ARB_CTL 0x45000 |
4119 | #define DISP_TILE_SURFACE_SWIZZLING (1<<13) | 4125 | #define DISP_TILE_SURFACE_SWIZZLING (1<<13) |
4120 | #define DISP_FBC_WM_DIS (1<<15) | 4126 | #define DISP_FBC_WM_DIS (1<<15) |