Attachment 86350 Details for Bug 69691 – Better patch

[patch] Better patch

0001-drm-i915-Add-HSW-CRT-pipe_bpp-readout-support.patch (text/plain), 3.71 KB, created by Ville Syrjala on 2013-09-23 09:34:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Syrjala

Created: 2013-09-23 09:34:29 UTC

Size: 3.71 KB

patch

obsolete

>From 5776d86713b9674cf51d56dc2ca6cbd97a372333 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
>Date: Mon, 23 Sep 2013 12:20:01 +0300
>Subject: [PATCH] drm/i915: Add HSW CRT pipe_bpp readout support
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>On HSW read out the pipe_bpp from DDI even on CRT output.
>
>Also check that the DDI and ADPA sync polarities match.
>
>Signed-off-by: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>---
> drivers/gpu/drm/i915/intel_crt.c | 36 +++++++++++++++++++++++++++++++++++-
> drivers/gpu/drm/i915/intel_ddi.c |  4 ++--
> drivers/gpu/drm/i915/intel_drv.h |  2 ++
> 3 files changed, 39 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
>index f9a5f3d..7e90d9f 100644
>--- a/drivers/gpu/drm/i915/intel_crt.c
>+++ b/drivers/gpu/drm/i915/intel_crt.c
>@@ -113,6 +113,37 @@ static void intel_crt_get_config(struct intel_encoder *encoder,
> 	pipe_config->adjusted_mode.clock = dotclock;
> }
> 
>+static void hsw_crt_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_crt *crt = intel_encoder_to_crt(encoder);
>+	u32 tmp, flags = 0, ddi_flags;
>+
>+	intel_ddi_get_config(encoder, pipe_config);
>+
>+	ddi_flags = pipe_config->adjusted_mode.flags & (DRM_MODE_FLAG_PHSYNC |
>+							DRM_MODE_FLAG_NHSYNC |
>+							DRM_MODE_FLAG_PVSYNC |
>+							DRM_MODE_FLAG_NVSYNC);
>+
>+	tmp = I915_READ(crt->adpa_reg);
>+
>+	if (tmp & ADPA_HSYNC_ACTIVE_HIGH)
>+		flags |= DRM_MODE_FLAG_PHSYNC;
>+	else
>+		flags |= DRM_MODE_FLAG_NHSYNC;
>+
>+	if (tmp & ADPA_VSYNC_ACTIVE_HIGH)
>+		flags |= DRM_MODE_FLAG_PVSYNC;
>+	else
>+		flags |= DRM_MODE_FLAG_NVSYNC;
>+
>+	WARN(flags != ddi_flags,
>+	     "ADPA vs. DDI sync polarity mismatch, apda: %x, ddi: %x\n",
>+	     flags, ddi_flags);
>+}
>+
> /* 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)
>@@ -804,7 +835,10 @@ void intel_crt_init(struct drm_device *dev)
> 	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))
>diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
>index 7e9fa53..a43ac3a 100644
>--- a/drivers/gpu/drm/i915/intel_ddi.c
>+++ b/drivers/gpu/drm/i915/intel_ddi.c
>@@ -1269,8 +1269,8 @@ static void intel_ddi_hot_plug(struct intel_encoder *intel_encoder)
> 		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);
>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>index fb38ef1..e7fe5f1 100644
>--- 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_dotclock(const struct intel_crtc_config *pipe
> 
> 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__ */
>-- 
>1.8.1.5
>

Actions: View | Splinter Review

Attachments on bug 69691: 86332 | 86343 | 86350 | 86403

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.