From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: Re: [PATCH v6 2/6] drm/i915: hdmi: add CEC notifier to intel_hdmi Date: Wed, 30 May 2018 16:26:05 -0700 Message-ID: <20180530232605.GM2115@intel.com> References: <1527155841-28494-1-git-send-email-narmstrong@baylibre.com> <1527155841-28494-3-git-send-email-narmstrong@baylibre.com> <20180530152936.GQ23723@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20180530152936.GQ23723@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: seanpaul@google.com, Neil Armstrong , airlied@linux.ie, sadolfsson@google.com, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, fparent@baylibre.com, hans.verkuil@cisco.com, felixe@google.com, bleung@google.com, darekm@google.com, lee.jones@linaro.org, linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBNYXkgMzAsIDIwMTggYXQgMDY6Mjk6MzZQTSArMDMwMCwgVmlsbGUgU3lyasOkbMOk IHdyb3RlOgo+IE9uIFRodSwgTWF5IDI0LCAyMDE4IGF0IDExOjU3OjE3QU0gKzAyMDAsIE5laWwg QXJtc3Ryb25nIHdyb3RlOgo+ID4gVGhpcyBwYXRjaHMgYWRkcyB0aGUgY2VjX25vdGlmaWVyIGZl YXR1cmUgdG8gdGhlIGludGVsX2hkbWkgcGFydAo+ID4gb2YgdGhlIGk5MTUgRFJNIGRyaXZlci4g SXQgdXNlcyB0aGUgSERNSSBEUk0gY29ubmVjdG9yIG5hbWUgdG8gZGlmZmVyZW50aWF0ZQo+ID4g YmV0d2VlbiBlYWNoIEhETUkgcG9ydHMuCj4gPiBUaGUgY2hhbmdlcyB3aWxsIGFsbG93IHRoZSBp OTE1IEhETUkgY29kZSB0byBub3RpZnkgRURJRCBhbmQgSFBEIGNoYW5nZXMKPiA+IHRvIGFuIGV2 ZW50dWFsIENFQyBhZGFwdGVyLgo+ID4gCj4gPiBTaWduZWQtb2ZmLWJ5OiBOZWlsIEFybXN0cm9u ZyA8bmFybXN0cm9uZ0BiYXlsaWJyZS5jb20+Cj4gPiBSZXZpZXdlZC1ieTogSGFucyBWZXJrdWls IDxoYW5zLnZlcmt1aWxAY2lzY28uY29tPgo+ID4gLS0tCj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvS2NvbmZpZyAgICAgICAgIHwgIDEgKwo+ID4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuaCB8IDIwICsrKysrKysrKysrKysrKysrKysrCj4gPiAgZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDIgKysKPiA+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9oZG1pLmMgICAgfCAxMyArKysrKysrKysrKysrCj4gPiAgNCBmaWxlcyBjaGFuZ2VkLCAz NiBpbnNlcnRpb25zKCspCj4gPiAKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9LY29uZmlnIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvS2NvbmZpZwo+ID4gaW5kZXggZGZkOTU4 OC4uMmQ2NWQ1NiAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L0tjb25maWcK PiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L0tjb25maWcKPiA+IEBAIC0yMyw2ICsyMyw3 IEBAIGNvbmZpZyBEUk1fSTkxNQo+ID4gIAlzZWxlY3QgU1lOQ19GSUxFCj4gPiAgCXNlbGVjdCBJ T1NGX01CSQo+ID4gIAlzZWxlY3QgQ1JDMzIKPiA+ICsJc2VsZWN0IENFQ19DT1JFIGlmIENFQ19O T1RJRklFUgo+ID4gIAloZWxwCj4gPiAgCSAgQ2hvb3NlIHRoaXMgb3B0aW9uIGlmIHlvdSBoYXZl IGEgc3lzdGVtIHRoYXQgaGFzICJJbnRlbCBHcmFwaGljcwo+ID4gIAkgIE1lZGlhIEFjY2VsZXJh dG9yIiBvciAiSEQgR3JhcGhpY3MiIGludGVncmF0ZWQgZ3JhcGhpY3MsCj4gPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5oCj4gPiBpbmRleCA0ZTc0MThiLi5jNjhkMWM4IDEwMDY0NAo+ ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5oCj4gPiArKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmgKPiA+IEBAIC0xMjYsNiArMTI2LDI2 IEBAIGVudW0gcG9ydCB7Cj4gPiAgCj4gPiAgI2RlZmluZSBwb3J0X25hbWUocCkgKChwKSArICdB JykKPiA+ICAKPiA+ICtzdGF0aWMgaW5saW5lIGNvbnN0IGNoYXIgKnBvcnRfaWRlbnRpZmllcihl bnVtIHBvcnQgcG9ydCkKPiA+ICt7Cj4gPiArCXN3aXRjaCAocG9ydCkgewo+ID4gKwljYXNlIFBP UlRfQToKPiA+ICsJCXJldHVybiAiUG9ydCBBIjsKPiA+ICsJY2FzZSBQT1JUX0I6Cj4gPiArCQly ZXR1cm4gIlBvcnQgQiI7Cj4gPiArCWNhc2UgUE9SVF9DOgo+ID4gKwkJcmV0dXJuICJQb3J0IEMi Owo+ID4gKwljYXNlIFBPUlRfRDoKPiA+ICsJCXJldHVybiAiUG9ydCBEIjsKPiA+ICsJY2FzZSBQ T1JUX0U6Cj4gPiArCQlyZXR1cm4gIlBvcnQgRSI7Cj4gPiArCWNhc2UgUE9SVF9GOgo+ID4gKwkJ cmV0dXJuICJQb3J0IEYiOwo+ID4gKwlkZWZhdWx0Ogo+ID4gKwkJcmV0dXJuICI8aW52YWxpZD4i Owo+ID4gKwl9Cj4gPiArfQo+IAo+IENvdWxkIHVzZSBhIGNvbW1lbnQgdG8gbWFrZSBpdCBjbGVh ciB0aGF0IHRoaXMgaWRlbnRpZmllciBpcwo+IGV4cGVjdGVkIHRvIHJlbWFpbiBzdGFibGUgc2lu Y2UgaXQncyByZWZlcmVuY2VkIGZyb20gb3RoZXIgZHJpdmVycy4KPiAKPiA+ICsKPiA+ICBlbnVt IGRwaW9fY2hhbm5lbCB7Cj4gPiAgCURQSU9fQ0gwLAo+ID4gIAlEUElPX0NIMQo+ID4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKPiA+IGluZGV4IGQ0MzY4NTguLmI1MGU1MWIgMTAwNjQ0Cj4gPiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+ID4gKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKPiA+IEBAIC0zOSw2ICszOSw3IEBACj4gPiAgI2luY2x1 ZGUgPGRybS9kcm1fZHBfbXN0X2hlbHBlci5oPgo+ID4gICNpbmNsdWRlIDxkcm0vZHJtX3JlY3Qu aD4KPiA+ICAjaW5jbHVkZSA8ZHJtL2RybV9hdG9taWMuaD4KPiA+ICsjaW5jbHVkZSA8bWVkaWEv Y2VjLW5vdGlmaWVyLmg+Cj4gPiAgCj4gPiAgLyoqCj4gPiAgICogX193YWl0X2ZvciAtIG1hZ2lj IHdhaXQgbWFjcm8KPiA+IEBAIC0xMDAxLDYgKzEwMDIsNyBAQCBzdHJ1Y3QgaW50ZWxfaGRtaSB7 Cj4gPiAgCWJvb2wgaGFzX2F1ZGlvOwo+ID4gIAlib29sIHJnYl9xdWFudF9yYW5nZV9zZWxlY3Rh YmxlOwo+ID4gIAlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICphdHRhY2hlZF9jb25uZWN0b3I7Cj4g PiArCXN0cnVjdCBjZWNfbm90aWZpZXIgKm5vdGlmaWVyOwo+IAo+ICJub3RpZmllciIgc2VlbXMg YSBiaXQgdG9vIGdlbmVyaWMgYSBuYW1lLiAiY2VjX25vdGlmaWVyIiB3b3VsZCBiZQo+IGJldHRl ci4KPiAKPiBBcGFydCBmcm9tIHRoYXQgdGhpcyBzZWVtcyBPSyB0byBtZQo+IFJldmlld2VkLWJ5 OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgoKSXQgc2Vl bXMgdGhhdCB5b3Ugd2lsbCBuZWVkIHRvIHB1c2ggdGhpcyB0byBvdGhlciB0cmVlcyByaWdodD8K RmVlbCBmcmVlIHRvIHVzZToKCkFja2VkLWJ5OiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBp bnRlbC5jb20+Cgo+IAo+ID4gIH07Cj4gPiAgCj4gPiAgc3RydWN0IGludGVsX2RwX21zdF9lbmNv ZGVyOwo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwo+ID4gaW5kZXggMWJhZWY0YS4uZDUy MmI1YiAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwo+ ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCj4gPiBAQCAtMTg2OCw2 ICsxODY4LDggQEAgaW50ZWxfaGRtaV9zZXRfZWRpZChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yKQo+ID4gIAkJY29ubmVjdGVkID0gdHJ1ZTsKPiA+ICAJfQo+ID4gIAo+ID4gKwljZWNf bm90aWZpZXJfc2V0X3BoeXNfYWRkcl9mcm9tX2VkaWQoaW50ZWxfaGRtaS0+bm90aWZpZXIsIGVk aWQpOwo+ID4gKwo+ID4gIAlyZXR1cm4gY29ubmVjdGVkOwo+ID4gIH0KPiA+ICAKPiA+IEBAIC0x ODc2LDYgKzE4NzgsNyBAQCBpbnRlbF9oZG1pX2RldGVjdChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAq Y29ubmVjdG9yLCBib29sIGZvcmNlKQo+ID4gIHsKPiA+ICAJZW51bSBkcm1fY29ubmVjdG9yX3N0 YXR1cyBzdGF0dXM7Cj4gPiAgCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoY29ubmVjdG9yLT5kZXYpOwo+ID4gKwlzdHJ1Y3QgaW50ZWxfaGRtaSAqaW50ZWxfaGRt aSA9IGludGVsX2F0dGFjaGVkX2hkbWkoY29ubmVjdG9yKTsKPiA+ICAKPiA+ICAJRFJNX0RFQlVH X0tNUygiW0NPTk5FQ1RPUjolZDolc11cbiIsCj4gPiAgCQkgICAgICBjb25uZWN0b3ItPmJhc2Uu aWQsIGNvbm5lY3Rvci0+bmFtZSk7Cj4gPiBAQCAtMTg5MSw2ICsxODk0LDkgQEAgaW50ZWxfaGRt aV9kZXRlY3Qoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwgYm9vbCBmb3JjZSkKPiA+ ICAKPiA+ICAJaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJTl9H TUJVUyk7Cj4gPiAgCj4gPiArCWlmIChzdGF0dXMgIT0gY29ubmVjdG9yX3N0YXR1c19jb25uZWN0 ZWQpCj4gPiArCQljZWNfbm90aWZpZXJfcGh5c19hZGRyX2ludmFsaWRhdGUoaW50ZWxfaGRtaS0+ bm90aWZpZXIpOwo+ID4gKwo+ID4gIAlyZXR1cm4gc3RhdHVzOwo+ID4gIH0KPiA+ICAKPiA+IEBA IC0yMDMxLDYgKzIwMzcsOCBAQCBzdGF0aWMgdm9pZCBjaHZfaGRtaV9wcmVfZW5hYmxlKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAo+ID4gIAo+ID4gIHN0YXRpYyB2b2lkIGludGVsX2hk bWlfZGVzdHJveShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQo+ID4gIHsKPiA+ICsJ aWYgKGludGVsX2F0dGFjaGVkX2hkbWkoY29ubmVjdG9yKS0+bm90aWZpZXIpCj4gPiArCQljZWNf bm90aWZpZXJfcHV0KGludGVsX2F0dGFjaGVkX2hkbWkoY29ubmVjdG9yKS0+bm90aWZpZXIpOwo+ ID4gIAlrZnJlZSh0b19pbnRlbF9jb25uZWN0b3IoY29ubmVjdG9yKS0+ZGV0ZWN0X2VkaWQpOwo+ ID4gIAlkcm1fY29ubmVjdG9yX2NsZWFudXAoY29ubmVjdG9yKTsKPiA+ICAJa2ZyZWUoY29ubmVj dG9yKTsKPiA+IEBAIC0yMzU4LDYgKzIzNjYsMTEgQEAgdm9pZCBpbnRlbF9oZG1pX2luaXRfY29u bmVjdG9yKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAo+ID4gIAkJ dTMyIHRlbXAgPSBJOTE1X1JFQUQoUEVHX0JBTkRfR0FQX0RBVEEpOwo+ID4gIAkJSTkxNV9XUklU RShQRUdfQkFORF9HQVBfREFUQSwgKHRlbXAgJiB+MHhmKSB8IDB4ZCk7Cj4gPiAgCX0KPiA+ICsK PiA+ICsJaW50ZWxfaGRtaS0+bm90aWZpZXIgPSBjZWNfbm90aWZpZXJfZ2V0X2Nvbm4oZGV2LT5k ZXYsCj4gPiArCQkJCQkJICAgICBwb3J0X2lkZW50aWZpZXIocG9ydCkpOwo+ID4gKwlpZiAoIWlu dGVsX2hkbWktPm5vdGlmaWVyKQo+ID4gKwkJRFJNX0RFQlVHX0tNUygiQ0VDIG5vdGlmaWVyIGdl dCBmYWlsZWRcbiIpOwo+ID4gIH0KPiA+ICAKPiA+ICB2b2lkIGludGVsX2hkbWlfaW5pdChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gPiAtLSAKPiA+IDIuNy40Cj4gPiAKPiA+ IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gPiBJbnRl bC1nZnggbWFpbGluZyBsaXN0Cj4gPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4g PiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo+IAo+IC0tIAo+IFZpbGxlIFN5cmrDpGzDpAo+IEludGVsCj4gX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4g ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mga17.intel.com ([192.55.52.151]:61307 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753734AbeE3X0E (ORCPT ); Wed, 30 May 2018 19:26:04 -0400 Date: Wed, 30 May 2018 16:26:05 -0700 From: Rodrigo Vivi To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: Neil Armstrong , felixe@google.com, seanpaul@google.com, airlied@linux.ie, sadolfsson@google.com, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, fparent@baylibre.com, hans.verkuil@cisco.com, bleung@google.com, darekm@google.com, lee.jones@linaro.org, linux-media@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH v6 2/6] drm/i915: hdmi: add CEC notifier to intel_hdmi Message-ID: <20180530232605.GM2115@intel.com> References: <1527155841-28494-1-git-send-email-narmstrong@baylibre.com> <1527155841-28494-3-git-send-email-narmstrong@baylibre.com> <20180530152936.GQ23723@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180530152936.GQ23723@intel.com> Sender: linux-media-owner@vger.kernel.org List-ID: On Wed, May 30, 2018 at 06:29:36PM +0300, Ville Syrjälä wrote: > On Thu, May 24, 2018 at 11:57:17AM +0200, Neil Armstrong wrote: > > This patchs adds the cec_notifier feature to the intel_hdmi part > > of the i915 DRM driver. It uses the HDMI DRM connector name to differentiate > > between each HDMI ports. > > The changes will allow the i915 HDMI code to notify EDID and HPD changes > > to an eventual CEC adapter. > > > > Signed-off-by: Neil Armstrong > > Reviewed-by: Hans Verkuil > > --- > > drivers/gpu/drm/i915/Kconfig | 1 + > > drivers/gpu/drm/i915/intel_display.h | 20 ++++++++++++++++++++ > > drivers/gpu/drm/i915/intel_drv.h | 2 ++ > > drivers/gpu/drm/i915/intel_hdmi.c | 13 +++++++++++++ > > 4 files changed, 36 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig > > index dfd9588..2d65d56 100644 > > --- a/drivers/gpu/drm/i915/Kconfig > > +++ b/drivers/gpu/drm/i915/Kconfig > > @@ -23,6 +23,7 @@ config DRM_I915 > > select SYNC_FILE > > select IOSF_MBI > > select CRC32 > > + select CEC_CORE if CEC_NOTIFIER > > help > > Choose this option if you have a system that has "Intel Graphics > > Media Accelerator" or "HD Graphics" integrated graphics, > > diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/intel_display.h > > index 4e7418b..c68d1c8 100644 > > --- a/drivers/gpu/drm/i915/intel_display.h > > +++ b/drivers/gpu/drm/i915/intel_display.h > > @@ -126,6 +126,26 @@ enum port { > > > > #define port_name(p) ((p) + 'A') > > > > +static inline const char *port_identifier(enum port port) > > +{ > > + switch (port) { > > + case PORT_A: > > + return "Port A"; > > + case PORT_B: > > + return "Port B"; > > + case PORT_C: > > + return "Port C"; > > + case PORT_D: > > + return "Port D"; > > + case PORT_E: > > + return "Port E"; > > + case PORT_F: > > + return "Port F"; > > + default: > > + return ""; > > + } > > +} > > Could use a comment to make it clear that this identifier is > expected to remain stable since it's referenced from other drivers. > > > + > > enum dpio_channel { > > DPIO_CH0, > > DPIO_CH1 > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > > index d436858..b50e51b 100644 > > --- a/drivers/gpu/drm/i915/intel_drv.h > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > @@ -39,6 +39,7 @@ > > #include > > #include > > #include > > +#include > > > > /** > > * __wait_for - magic wait macro > > @@ -1001,6 +1002,7 @@ struct intel_hdmi { > > bool has_audio; > > bool rgb_quant_range_selectable; > > struct intel_connector *attached_connector; > > + struct cec_notifier *notifier; > > "notifier" seems a bit too generic a name. "cec_notifier" would be > better. > > Apart from that this seems OK to me > Reviewed-by: Ville Syrjälä It seems that you will need to push this to other trees right? Feel free to use: Acked-by: Rodrigo Vivi > > > }; > > > > struct intel_dp_mst_encoder; > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c > > index 1baef4a..d522b5b 100644 > > --- a/drivers/gpu/drm/i915/intel_hdmi.c > > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > > @@ -1868,6 +1868,8 @@ intel_hdmi_set_edid(struct drm_connector *connector) > > connected = true; > > } > > > > + cec_notifier_set_phys_addr_from_edid(intel_hdmi->notifier, edid); > > + > > return connected; > > } > > > > @@ -1876,6 +1878,7 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) > > { > > enum drm_connector_status status; > > struct drm_i915_private *dev_priv = to_i915(connector->dev); > > + struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector); > > > > DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", > > connector->base.id, connector->name); > > @@ -1891,6 +1894,9 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) > > > > intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS); > > > > + if (status != connector_status_connected) > > + cec_notifier_phys_addr_invalidate(intel_hdmi->notifier); > > + > > return status; > > } > > > > @@ -2031,6 +2037,8 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder, > > > > static void intel_hdmi_destroy(struct drm_connector *connector) > > { > > + if (intel_attached_hdmi(connector)->notifier) > > + cec_notifier_put(intel_attached_hdmi(connector)->notifier); > > kfree(to_intel_connector(connector)->detect_edid); > > drm_connector_cleanup(connector); > > kfree(connector); > > @@ -2358,6 +2366,11 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, > > u32 temp = I915_READ(PEG_BAND_GAP_DATA); > > I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd); > > } > > + > > + intel_hdmi->notifier = cec_notifier_get_conn(dev->dev, > > + port_identifier(port)); > > + if (!intel_hdmi->notifier) > > + DRM_DEBUG_KMS("CEC notifier get failed\n"); > > } > > > > void intel_hdmi_init(struct drm_i915_private *dev_priv, > > -- > > 2.7.4 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Ville Syrjälä > Intel > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel