Attachment 136853 Details for Bug 104139 – Ignore invalid pin.

[patch] Ignore invalid pin.

0001-drm-i915-cnp-Ignore-VBT-request-for-know-invalid-DDC.patch (text/plain), 1.33 KB, created by Rodrigo Vivi on 2018-01-19 18:13:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rodrigo Vivi

Created: 2018-01-19 18:13:46 UTC

Size: 1.33 KB

patch

obsolete

>From 4690293fef25df15d660815668cbeed7c22d8850 Mon Sep 17 00:00:00 2001
>From: Rodrigo Vivi <rodrigo.vivi@intel.com>
>Date: Fri, 19 Jan 2018 10:07:38 -0800
>Subject: [PATCH] drm/i915/cnp: Ignore VBT request for know invalid DDC pin.
>
>Let's ignore VBT request if the pin is clearly wrong.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104139
>Cc: Kai Heng Feng <kai.heng.feng@canonical.com>
>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>---
> drivers/gpu/drm/i915/intel_bios.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
>index b820d595ebc8..ac39234eb53c 100644
>--- a/drivers/gpu/drm/i915/intel_bios.c
>+++ b/drivers/gpu/drm/i915/intel_bios.c
>@@ -1115,9 +1115,14 @@ static const u8 cnp_ddc_pin_map[] = {
> 
> static u8 map_ddc_pin(struct drm_i915_private *dev_priv, u8 vbt_pin)
> {
>-	if (HAS_PCH_CNP(dev_priv) &&
>-	    vbt_pin > 0 && vbt_pin < ARRAY_SIZE(cnp_ddc_pin_map))
>-		return cnp_ddc_pin_map[vbt_pin];
>+	if (HAS_PCH_CNP(dev_priv)) {
>+		if (vbt_pin > 0 && vbt_pin < ARRAY_SIZE(cnp_ddc_pin_map))
>+			return cnp_ddc_pin_map[vbt_pin];
>+		if (vbt_pin > GMBUS_PIN_4_CNP) {
>+			DRM_DEBUG_KMS("Ignoring alternate pin: VBT claims DDC pin %d, which is not valid for this platform\n", vbt_pin);
>+			return 0;
>+		}
>+	}
> 
> 	return vbt_pin;
> }
>-- 
>2.13.6
>

Actions: View | Splinter Review

Attachments on bug 104139: 135993 | 136841 | 136843 | 136853 | 136887 | 136933 | 136935 | 137708 | 137709

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.