diff options
author | Rodrigo Vivi <rodrigo.vivi@gmail.com> | 2013-07-11 17:45:00 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-07-18 04:17:21 -0400 |
commit | 3f51e4713fc57ab0fc225c3f0e67578a53c24a11 (patch) | |
tree | 805ccec916c12cc168dfb34a8bd07d957d69e654 /drivers/gpu/drm/i915/i915_reg.h | |
parent | e91fd8c6dec2ffa903b4f695fce4b9d7248ed2d5 (diff) |
drm/i915: Match all PSR mode entry conditions before enabling it.
v2: Prefer seq_puts to seq_printf by Paulo Zanoni.
v3: small changes like avoiding calling dp_to_dig_port twice as noticed by
Paulo Zanoni.
v4: Avoiding reading non-existent registers - noticed by Paulo
on first psr debugfs patch.
v5: Accepting more suggestions from Paulo:
* check sw interlace flag instead of i915_read
* introduce PSR_S3D_ENABLED to avoid forgeting it whenever added.
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Shobhit Kumar <shobhit.kumar@intel.com>
[danvet: Fix up debugfs output (spotted by Paulo) and rip out the
power well check since we really can't do that in a race-free manner,
so it's bogus.]
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 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index bb898bfe053d..1d710966983e 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -4150,6 +4150,13 @@ | |||
4150 | #define HSW_TVIDEO_DIP_VSC_DATA(trans) \ | 4150 | #define HSW_TVIDEO_DIP_VSC_DATA(trans) \ |
4151 | _TRANSCODER(trans, HSW_VIDEO_DIP_VSC_DATA_A, HSW_VIDEO_DIP_VSC_DATA_B) | 4151 | _TRANSCODER(trans, HSW_VIDEO_DIP_VSC_DATA_A, HSW_VIDEO_DIP_VSC_DATA_B) |
4152 | 4152 | ||
4153 | #define HSW_STEREO_3D_CTL_A 0x70020 | ||
4154 | #define S3D_ENABLE (1<<31) | ||
4155 | #define HSW_STEREO_3D_CTL_B 0x71020 | ||
4156 | |||
4157 | #define HSW_STEREO_3D_CTL(trans) \ | ||
4158 | _TRANSCODER(trans, HSW_STEREO_3D_CTL_A, HSW_STEREO_3D_CTL_A) | ||
4159 | |||
4153 | #define _PCH_TRANS_HTOTAL_B 0xe1000 | 4160 | #define _PCH_TRANS_HTOTAL_B 0xe1000 |
4154 | #define _PCH_TRANS_HBLANK_B 0xe1004 | 4161 | #define _PCH_TRANS_HBLANK_B 0xe1004 |
4155 | #define _PCH_TRANS_HSYNC_B 0xe1008 | 4162 | #define _PCH_TRANS_HSYNC_B 0xe1008 |