diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-01 05:50:23 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-01 13:27:56 -0400 |
commit | 26756809583c1023dcbc896261105c1e289d262b (patch) | |
tree | baf28921b8c45cd39a689495db2b22c75b0b7502 /drivers/gpu/drm/i915/i915_debugfs.c | |
parent | 8d2f24ca1f19e1e5ca6b941a3f6488f9ccae5390 (diff) |
drm/i915: Enable DP port CRC for the "auto" source on g4x/vlv
Now that DP port CRCs are stable, we can use it for generic CRC tests.
Yay, the auto CRC source should now work everywhere!
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 82c58eb1aa66..7008aacfc3c9 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -1990,6 +1990,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe, | |||
1990 | { | 1990 | { |
1991 | struct intel_encoder *encoder; | 1991 | struct intel_encoder *encoder; |
1992 | struct intel_crtc *crtc; | 1992 | struct intel_crtc *crtc; |
1993 | struct intel_digital_port *dig_port; | ||
1993 | int ret = 0; | 1994 | int ret = 0; |
1994 | 1995 | ||
1995 | *source = INTEL_PIPE_CRC_SOURCE_PIPE; | 1996 | *source = INTEL_PIPE_CRC_SOURCE_PIPE; |
@@ -2011,8 +2012,22 @@ static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe, | |||
2011 | break; | 2012 | break; |
2012 | case INTEL_OUTPUT_DISPLAYPORT: | 2013 | case INTEL_OUTPUT_DISPLAYPORT: |
2013 | case INTEL_OUTPUT_EDP: | 2014 | case INTEL_OUTPUT_EDP: |
2014 | /* We can't get stable CRCs for DP ports somehow. */ | 2015 | dig_port = enc_to_dig_port(&encoder->base); |
2015 | ret = -ENODEV; | 2016 | switch (dig_port->port) { |
2017 | case PORT_B: | ||
2018 | *source = INTEL_PIPE_CRC_SOURCE_DP_B; | ||
2019 | break; | ||
2020 | case PORT_C: | ||
2021 | *source = INTEL_PIPE_CRC_SOURCE_DP_C; | ||
2022 | break; | ||
2023 | case PORT_D: | ||
2024 | *source = INTEL_PIPE_CRC_SOURCE_DP_D; | ||
2025 | break; | ||
2026 | default: | ||
2027 | WARN(1, "nonexisting DP port %c\n", | ||
2028 | port_name(dig_port->port)); | ||
2029 | break; | ||
2030 | } | ||
2016 | break; | 2031 | break; |
2017 | } | 2032 | } |
2018 | } | 2033 | } |