From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751302AbeEBU3g (ORCPT ); Wed, 2 May 2018 16:29:36 -0400 Received: from mail.bootlin.com ([62.4.15.54]:34520 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750993AbeEBU3e (ORCPT ); Wed, 2 May 2018 16:29:34 -0400 Date: Wed, 2 May 2018 22:29:21 +0200 From: Boris Brezillon To: Eric Anholt Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/vc4: Fix oops dereferencing DPI's connector since panel_bridge. Message-ID: <20180502222921.4399847a@bbrezillon> In-Reply-To: <20180309233256.1667-1-eric@anholt.net> References: <20180309233256.1667-1-eric@anholt.net> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 9 Mar 2018 15:32:56 -0800 Eric Anholt wrote: > In the cleanup, I didn't notice that we needed to dereference the > connector for the bus_format. Fix the regression by looking up the > first (and only) connector attached to us, and assume that its > bus_format is what we want. Some day it would be good to have that > part of display_info attached to the bridge, instead. > > Signed-off-by: Eric Anholt > Fixes: 7b1298e05310 ("drm/vc4: Switch DPI to using the panel-bridge helper.") > Cc: Boris Brezillon Reviewed-by: Boris Brezillon > --- > drivers/gpu/drm/vc4/vc4_dpi.c | 27 +++++++++++++++++++++++---- > 1 file changed, 23 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c > index 72c9dbd81d7f..88783e143cc2 100644 > --- a/drivers/gpu/drm/vc4/vc4_dpi.c > +++ b/drivers/gpu/drm/vc4/vc4_dpi.c > @@ -96,7 +96,6 @@ struct vc4_dpi { > struct platform_device *pdev; > > struct drm_encoder *encoder; > - struct drm_connector *connector; > > void __iomem *regs; > > @@ -164,14 +163,31 @@ static void vc4_dpi_encoder_disable(struct drm_encoder *encoder) > > static void vc4_dpi_encoder_enable(struct drm_encoder *encoder) > { > + struct drm_device *dev = encoder->dev; > struct drm_display_mode *mode = &encoder->crtc->mode; > struct vc4_dpi_encoder *vc4_encoder = to_vc4_dpi_encoder(encoder); > struct vc4_dpi *dpi = vc4_encoder->dpi; > + struct drm_connector_list_iter conn_iter; > + struct drm_connector *connector = NULL, *connector_scan; > u32 dpi_c = DPI_ENABLE | DPI_OUTPUT_ENABLE_MODE; > int ret; > > - if (dpi->connector->display_info.num_bus_formats) { > - u32 bus_format = dpi->connector->display_info.bus_formats[0]; > + /* Look up the connector attached to DPI so we can get the > + * bus_format. Ideally the bridge would tell us the > + * bus_format we want, but it doesn't yet, so assume that it's > + * uniform throughout the bridge chain. > + */ > + drm_connector_list_iter_begin(dev, &conn_iter); > + drm_for_each_connector_iter(connector_scan, &conn_iter) { > + if (connector_scan->encoder == encoder) { > + connector = connector_scan; > + break; > + } > + } > + drm_connector_list_iter_end(&conn_iter); > + > + if (connector && connector->display_info.num_bus_formats) { > + u32 bus_format = connector->display_info.bus_formats[0]; > > switch (bus_format) { > case MEDIA_BUS_FMT_RGB888_1X24: > @@ -199,6 +215,9 @@ static void vc4_dpi_encoder_enable(struct drm_encoder *encoder) > DRM_ERROR("Unknown media bus format %d\n", bus_format); > break; > } > + } else { > + /* Default to 24bit if no connector found. */ > + dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, DPI_FORMAT); > } > > if (mode->flags & DRM_MODE_FLAG_NHSYNC) > @@ -264,7 +283,7 @@ static int vc4_dpi_init_bridge(struct vc4_dpi *dpi) > return ret; > } > > - if (panel) > + if (panel) > bridge = drm_panel_bridge_add(panel, DRM_MODE_CONNECTOR_DPI); > > return drm_bridge_attach(dpi->encoder, bridge, NULL); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Brezillon Subject: Re: [PATCH] drm/vc4: Fix oops dereferencing DPI's connector since panel_bridge. Date: Wed, 2 May 2018 22:29:21 +0200 Message-ID: <20180502222921.4399847a@bbrezillon> References: <20180309233256.1667-1-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.bootlin.com (mail.bootlin.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id F3ED36E572 for ; Wed, 2 May 2018 20:29:33 +0000 (UTC) In-Reply-To: <20180309233256.1667-1-eric@anholt.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Eric Anholt Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCAgOSBNYXIgMjAxOCAxNTozMjo1NiAtMDgwMApFcmljIEFuaG9sdCA8ZXJpY0Bhbmhv bHQubmV0PiB3cm90ZToKCj4gSW4gdGhlIGNsZWFudXAsIEkgZGlkbid0IG5vdGljZSB0aGF0IHdl IG5lZWRlZCB0byBkZXJlZmVyZW5jZSB0aGUKPiBjb25uZWN0b3IgZm9yIHRoZSBidXNfZm9ybWF0 LiAgRml4IHRoZSByZWdyZXNzaW9uIGJ5IGxvb2tpbmcgdXAgdGhlCj4gZmlyc3QgKGFuZCBvbmx5 KSBjb25uZWN0b3IgYXR0YWNoZWQgdG8gdXMsIGFuZCBhc3N1bWUgdGhhdCBpdHMKPiBidXNfZm9y bWF0IGlzIHdoYXQgd2Ugd2FudC4gIFNvbWUgZGF5IGl0IHdvdWxkIGJlIGdvb2QgdG8gaGF2ZSB0 aGF0Cj4gcGFydCBvZiBkaXNwbGF5X2luZm8gYXR0YWNoZWQgdG8gdGhlIGJyaWRnZSwgaW5zdGVh ZC4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBFcmljIEFuaG9sdCA8ZXJpY0BhbmhvbHQubmV0Pgo+IEZp eGVzOiA3YjEyOThlMDUzMTAgKCJkcm0vdmM0OiBTd2l0Y2ggRFBJIHRvIHVzaW5nIHRoZSBwYW5l bC1icmlkZ2UgaGVscGVyLiIpCj4gQ2M6IEJvcmlzIEJyZXppbGxvbiA8Ym9yaXMuYnJlemlsbG9u QGJvb3RsaW4uY29tPgoKUmV2aWV3ZWQtYnk6IEJvcmlzIEJyZXppbGxvbiA8Ym9yaXMuYnJlemls bG9uQGJvb3RsaW4uY29tPgoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZHBpLmMg fCAyNyArKysrKysrKysrKysrKysrKysrKysrKy0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDIzIGlu c2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS92YzQvdmM0X2RwaS5jIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZHBpLmMKPiBpbmRl eCA3MmM5ZGJkODFkN2YuLjg4NzgzZTE0M2NjMiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9k cm0vdmM0L3ZjNF9kcGkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2RwaS5jCj4g QEAgLTk2LDcgKzk2LDYgQEAgc3RydWN0IHZjNF9kcGkgewo+ICAJc3RydWN0IHBsYXRmb3JtX2Rl dmljZSAqcGRldjsKPiAgCj4gIAlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXI7Cj4gLQlzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwo+ICAKPiAgCXZvaWQgX19pb21lbSAqcmVnczsK PiAgCj4gQEAgLTE2NCwxNCArMTYzLDMxIEBAIHN0YXRpYyB2b2lkIHZjNF9kcGlfZW5jb2Rlcl9k aXNhYmxlKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKPiAgCj4gIHN0YXRpYyB2b2lkIHZj NF9kcGlfZW5jb2Rlcl9lbmFibGUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQo+ICB7Cj4g KwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+ZGV2Owo+ICAJc3RydWN0IGRybV9k aXNwbGF5X21vZGUgKm1vZGUgPSAmZW5jb2Rlci0+Y3J0Yy0+bW9kZTsKPiAgCXN0cnVjdCB2YzRf ZHBpX2VuY29kZXIgKnZjNF9lbmNvZGVyID0gdG9fdmM0X2RwaV9lbmNvZGVyKGVuY29kZXIpOwo+ ICAJc3RydWN0IHZjNF9kcGkgKmRwaSA9IHZjNF9lbmNvZGVyLT5kcGk7Cj4gKwlzdHJ1Y3QgZHJt X2Nvbm5lY3Rvcl9saXN0X2l0ZXIgY29ubl9pdGVyOwo+ICsJc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3RvciA9IE5VTEwsICpjb25uZWN0b3Jfc2NhbjsKPiAgCXUzMiBkcGlfYyA9IERQSV9F TkFCTEUgfCBEUElfT1VUUFVUX0VOQUJMRV9NT0RFOwo+ICAJaW50IHJldDsKPiAgCj4gLQlpZiAo ZHBpLT5jb25uZWN0b3ItPmRpc3BsYXlfaW5mby5udW1fYnVzX2Zvcm1hdHMpIHsKPiAtCQl1MzIg YnVzX2Zvcm1hdCA9IGRwaS0+Y29ubmVjdG9yLT5kaXNwbGF5X2luZm8uYnVzX2Zvcm1hdHNbMF07 Cj4gKwkvKiBMb29rIHVwIHRoZSBjb25uZWN0b3IgYXR0YWNoZWQgdG8gRFBJIHNvIHdlIGNhbiBn ZXQgdGhlCj4gKwkgKiBidXNfZm9ybWF0LiAgSWRlYWxseSB0aGUgYnJpZGdlIHdvdWxkIHRlbGwg dXMgdGhlCj4gKwkgKiBidXNfZm9ybWF0IHdlIHdhbnQsIGJ1dCBpdCBkb2Vzbid0IHlldCwgc28g YXNzdW1lIHRoYXQgaXQncwo+ICsJICogdW5pZm9ybSB0aHJvdWdob3V0IHRoZSBicmlkZ2UgY2hh aW4uCj4gKwkgKi8KPiArCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX2JlZ2luKGRldiwgJmNvbm5f aXRlcik7Cj4gKwlkcm1fZm9yX2VhY2hfY29ubmVjdG9yX2l0ZXIoY29ubmVjdG9yX3NjYW4sICZj b25uX2l0ZXIpIHsKPiArCQlpZiAoY29ubmVjdG9yX3NjYW4tPmVuY29kZXIgPT0gZW5jb2Rlcikg ewo+ICsJCQljb25uZWN0b3IgPSBjb25uZWN0b3Jfc2NhbjsKPiArCQkJYnJlYWs7Cj4gKwkJfQo+ ICsJfQo+ICsJZHJtX2Nvbm5lY3Rvcl9saXN0X2l0ZXJfZW5kKCZjb25uX2l0ZXIpOwo+ICsKPiAr CWlmIChjb25uZWN0b3IgJiYgY29ubmVjdG9yLT5kaXNwbGF5X2luZm8ubnVtX2J1c19mb3JtYXRz KSB7Cj4gKwkJdTMyIGJ1c19mb3JtYXQgPSBjb25uZWN0b3ItPmRpc3BsYXlfaW5mby5idXNfZm9y bWF0c1swXTsKPiAgCj4gIAkJc3dpdGNoIChidXNfZm9ybWF0KSB7Cj4gIAkJY2FzZSBNRURJQV9C VVNfRk1UX1JHQjg4OF8xWDI0Ogo+IEBAIC0xOTksNiArMjE1LDkgQEAgc3RhdGljIHZvaWQgdmM0 X2RwaV9lbmNvZGVyX2VuYWJsZShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpCj4gIAkJCURS TV9FUlJPUigiVW5rbm93biBtZWRpYSBidXMgZm9ybWF0ICVkXG4iLCBidXNfZm9ybWF0KTsKPiAg CQkJYnJlYWs7Cj4gIAkJfQo+ICsJfSBlbHNlIHsKPiArCQkvKiBEZWZhdWx0IHRvIDI0Yml0IGlm IG5vIGNvbm5lY3RvciBmb3VuZC4gKi8KPiArCQlkcGlfYyB8PSBWQzRfU0VUX0ZJRUxEKERQSV9G T1JNQVRfMjRCSVRfODg4X1JHQiwgRFBJX0ZPUk1BVCk7Cj4gIAl9Cj4gIAo+ICAJaWYgKG1vZGUt PmZsYWdzICYgRFJNX01PREVfRkxBR19OSFNZTkMpCj4gQEAgLTI2NCw3ICsyODMsNyBAQCBzdGF0 aWMgaW50IHZjNF9kcGlfaW5pdF9icmlkZ2Uoc3RydWN0IHZjNF9kcGkgKmRwaSkKPiAgCQkJcmV0 dXJuIHJldDsKPiAgCX0KPiAgCj4gLQlpZiAocGFuZWwpCj4gKwlpZiAocGFuZWwpIAo+ICAJCWJy aWRnZSA9IGRybV9wYW5lbF9icmlkZ2VfYWRkKHBhbmVsLCBEUk1fTU9ERV9DT05ORUNUT1JfRFBJ KTsKPiAgCj4gIAlyZXR1cm4gZHJtX2JyaWRnZV9hdHRhY2goZHBpLT5lbmNvZGVyLCBicmlkZ2Us IE5VTEwpOwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==