From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com ([192.55.52.115]:29309 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752161AbdI1IWo (ORCPT ); Thu, 28 Sep 2017 04:22:44 -0400 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Cc: jani.nikula@intel.com, ville.syrjala@linux.intel.com, stable@vger.kernel.org Subject: [PATCH 1/8] drm/i915/bios: parse DDI ports also for CHV for HDMI DDC pin and DP AUX channel Date: Thu, 28 Sep 2017 11:21:57 +0300 Message-Id: In-Reply-To: References: In-Reply-To: References: Sender: stable-owner@vger.kernel.org List-ID: While technically CHV isn't DDI, we do look at the VBT based DDI port info for HDMI DDC pin and DP AUX channel. (We call these "alternate", but they're really just something that aren't platform defaults.) In commit e4ab73a13291 ("drm/i915: Respect alternate_ddc_pin for all DDI ports") Ville writes, "IIRC there may be CHV system that might actually need this." I'm not sure why there couldn't be even more platforms that need this, but start conservative, and parse the info for CHV in addition to DDI. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100553 Reported-by: Marek Wilczewski Cc: stable@vger.kernel.org Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/intel_bios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 3747d8df0175..6b8d396ab605 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -1247,7 +1247,7 @@ static void parse_ddi_ports(struct drm_i915_private *dev_priv, { enum port port; - if (!HAS_DDI(dev_priv)) + if (!HAS_DDI(dev_priv) && !IS_CHERRYVIEW(dev_priv)) return; if (!dev_priv->vbt.child_dev_num) -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH 1/8] drm/i915/bios: parse DDI ports also for CHV for HDMI DDC pin and DP AUX channel Date: Thu, 28 Sep 2017 11:21:57 +0300 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 737806E8A0 for ; Thu, 28 Sep 2017 08:22:50 +0000 (UTC) In-Reply-To: In-Reply-To: References: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: jani.nikula@intel.com, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org V2hpbGUgdGVjaG5pY2FsbHkgQ0hWIGlzbid0IERESSwgd2UgZG8gbG9vayBhdCB0aGUgVkJUIGJh c2VkIERESSBwb3J0CmluZm8gZm9yIEhETUkgRERDIHBpbiBhbmQgRFAgQVVYIGNoYW5uZWwuIChX ZSBjYWxsIHRoZXNlICJhbHRlcm5hdGUiLApidXQgdGhleSdyZSByZWFsbHkganVzdCBzb21ldGhp bmcgdGhhdCBhcmVuJ3QgcGxhdGZvcm0gZGVmYXVsdHMuKQoKSW4gY29tbWl0IGU0YWI3M2ExMzI5 MSAoImRybS9pOTE1OiBSZXNwZWN0IGFsdGVybmF0ZV9kZGNfcGluIGZvciBhbGwgRERJCnBvcnRz IikgVmlsbGUgd3JpdGVzLCAiSUlSQyB0aGVyZSBtYXkgYmUgQ0hWIHN5c3RlbSB0aGF0IG1pZ2h0 IGFjdHVhbGx5Cm5lZWQgdGhpcy4iCgpJJ20gbm90IHN1cmUgd2h5IHRoZXJlIGNvdWxkbid0IGJl IGV2ZW4gbW9yZSBwbGF0Zm9ybXMgdGhhdCBuZWVkIHRoaXMsCmJ1dCBzdGFydCBjb25zZXJ2YXRp dmUsIGFuZCBwYXJzZSB0aGUgaW5mbyBmb3IgQ0hWIGluIGFkZGl0aW9uIHRvIERESS4KCkJ1Z3pp bGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDA1NTMK UmVwb3J0ZWQtYnk6IE1hcmVrIFdpbGN6ZXdza2kgPG13QDNjdGUucGw+CkNjOiBzdGFibGVAdmdl ci5rZXJuZWwub3JnClNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5jIHwgMiArLQogMSBm aWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfYmlvcy5jCmluZGV4IDM3NDdkOGRmMDE3NS4uNmI4ZDM5NmFiNjA1IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9iaW9zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfYmlvcy5jCkBAIC0xMjQ3LDcgKzEyNDcsNyBAQCBzdGF0aWMgdm9pZCBwYXJz ZV9kZGlfcG9ydHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogewogCWVudW0g cG9ydCBwb3J0OwogCi0JaWYgKCFIQVNfRERJKGRldl9wcml2KSkKKwlpZiAoIUhBU19EREkoZGV2 X3ByaXYpICYmICFJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJcmV0dXJuOwogCiAJaWYgKCFk ZXZfcHJpdi0+dmJ0LmNoaWxkX2Rldl9udW0pCi0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=