| From 1c1b4ad7f4181331c5f91f2ea857bbe19772e6ae Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Tue, 24 Sep 2013 14:24:05 +0300 |
| Subject: drm/i915: Add HSW CRT output readout support |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Call intel_ddi_get_config() to get the pipe_bpp settings from |
| DDI. |
| |
| The sync polarity settings from DDI are irrelevant for CRT |
| output, so override them with data from the ADPA register. |
| |
| v2: Extract intel_crt_get_flags() |
| |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=69691 |
| Tested-by: Qingshuai Tian <qingshuai.tian@intel.com> |
| Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 6801c18c0a43386bb44712cbc028a7e05adb9f0d) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_crt.c | 34 ++++++++++++++++++++++++++++------ |
| drivers/gpu/drm/i915/intel_ddi.c | 4 ++-- |
| drivers/gpu/drm/i915/intel_drv.h | 2 ++ |
| 3 files changed, 32 insertions(+), 8 deletions(-) |
| |
| --- a/drivers/gpu/drm/i915/intel_crt.c |
| +++ b/drivers/gpu/drm/i915/intel_crt.c |
| @@ -83,13 +83,11 @@ static bool intel_crt_get_hw_state(struc |
| return true; |
| } |
| |
| -static void intel_crt_get_config(struct intel_encoder *encoder, |
| - struct intel_crtc_config *pipe_config) |
| +static unsigned int intel_crt_get_flags(struct intel_encoder *encoder) |
| { |
| struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; |
| struct intel_crt *crt = intel_encoder_to_crt(encoder); |
| u32 tmp, flags = 0; |
| - int dotclock; |
| |
| tmp = I915_READ(crt->adpa_reg); |
| |
| @@ -103,16 +101,37 @@ static void intel_crt_get_config(struct |
| else |
| flags |= DRM_MODE_FLAG_NVSYNC; |
| |
| - pipe_config->adjusted_mode.flags |= flags; |
| + return flags; |
| +} |
| + |
| +static void intel_crt_get_config(struct intel_encoder *encoder, |
| + struct intel_crtc_config *pipe_config) |
| +{ |
| + struct drm_device *dev = encoder->base.dev; |
| + int dotclock; |
| + |
| + pipe_config->adjusted_mode.flags |= intel_crt_get_flags(encoder); |
| |
| dotclock = pipe_config->port_clock; |
| |
| - if (HAS_PCH_SPLIT(dev_priv->dev)) |
| + if (HAS_PCH_SPLIT(dev)) |
| ironlake_check_encoder_dotclock(pipe_config, dotclock); |
| |
| pipe_config->adjusted_mode.clock = dotclock; |
| } |
| |
| +static void hsw_crt_get_config(struct intel_encoder *encoder, |
| + struct intel_crtc_config *pipe_config) |
| +{ |
| + intel_ddi_get_config(encoder, pipe_config); |
| + |
| + pipe_config->adjusted_mode.flags &= ~(DRM_MODE_FLAG_PHSYNC | |
| + DRM_MODE_FLAG_NHSYNC | |
| + DRM_MODE_FLAG_PVSYNC | |
| + DRM_MODE_FLAG_NVSYNC); |
| + pipe_config->adjusted_mode.flags |= intel_crt_get_flags(encoder); |
| +} |
| + |
| /* Note: The caller is required to filter out dpms modes not supported by the |
| * platform. */ |
| static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode) |
| @@ -813,7 +832,10 @@ void intel_crt_init(struct drm_device *d |
| crt->base.mode_set = intel_crt_mode_set; |
| crt->base.disable = intel_disable_crt; |
| crt->base.enable = intel_enable_crt; |
| - crt->base.get_config = intel_crt_get_config; |
| + if (IS_HASWELL(dev)) |
| + crt->base.get_config = hsw_crt_get_config; |
| + else |
| + crt->base.get_config = intel_crt_get_config; |
| if (I915_HAS_HOTPLUG(dev)) |
| crt->base.hpd_pin = HPD_CRT; |
| if (HAS_DDI(dev)) |
| --- a/drivers/gpu/drm/i915/intel_ddi.c |
| +++ b/drivers/gpu/drm/i915/intel_ddi.c |
| @@ -1275,8 +1275,8 @@ static void intel_ddi_hot_plug(struct in |
| intel_dp_check_link_status(intel_dp); |
| } |
| |
| -static void intel_ddi_get_config(struct intel_encoder *encoder, |
| - struct intel_crtc_config *pipe_config) |
| +void intel_ddi_get_config(struct intel_encoder *encoder, |
| + struct intel_crtc_config *pipe_config) |
| { |
| struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; |
| struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); |
| --- a/drivers/gpu/drm/i915/intel_drv.h |
| +++ b/drivers/gpu/drm/i915/intel_drv.h |
| @@ -828,5 +828,7 @@ extern void ironlake_check_encoder_dotcl |
| |
| extern bool intel_crtc_active(struct drm_crtc *crtc); |
| extern void i915_disable_vga_mem(struct drm_device *dev); |
| +extern void intel_ddi_get_config(struct intel_encoder *encoder, |
| + struct intel_crtc_config *pipe_config); |
| |
| #endif /* __INTEL_DRV_H__ */ |