From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932721AbeCIXdB (ORCPT ); Fri, 9 Mar 2018 18:33:01 -0500 Received: from anholt.net ([50.246.234.109]:38324 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932508AbeCIXdA (ORCPT ); Fri, 9 Mar 2018 18:33:00 -0500 From: Eric Anholt To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Eric Anholt , Boris Brezillon Subject: [PATCH] drm/vc4: Fix oops dereferencing DPI's connector since panel_bridge. Date: Fri, 9 Mar 2018 15:32:56 -0800 Message-Id: <20180309233256.1667-1-eric@anholt.net> X-Mailer: git-send-email 2.16.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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); -- 2.16.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Anholt Subject: [PATCH] drm/vc4: Fix oops dereferencing DPI's connector since panel_bridge. Date: Fri, 9 Mar 2018 15:32:56 -0800 Message-ID: <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 anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id 400586E034 for ; Fri, 9 Mar 2018 23:33:00 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Boris Brezillon List-Id: dri-devel@lists.freedesktop.org SW4gdGhlIGNsZWFudXAsIEkgZGlkbid0IG5vdGljZSB0aGF0IHdlIG5lZWRlZCB0byBkZXJlZmVy ZW5jZSB0aGUKY29ubmVjdG9yIGZvciB0aGUgYnVzX2Zvcm1hdC4gIEZpeCB0aGUgcmVncmVzc2lv biBieSBsb29raW5nIHVwIHRoZQpmaXJzdCAoYW5kIG9ubHkpIGNvbm5lY3RvciBhdHRhY2hlZCB0 byB1cywgYW5kIGFzc3VtZSB0aGF0IGl0cwpidXNfZm9ybWF0IGlzIHdoYXQgd2Ugd2FudC4gIFNv bWUgZGF5IGl0IHdvdWxkIGJlIGdvb2QgdG8gaGF2ZSB0aGF0CnBhcnQgb2YgZGlzcGxheV9pbmZv IGF0dGFjaGVkIHRvIHRoZSBicmlkZ2UsIGluc3RlYWQuCgpTaWduZWQtb2ZmLWJ5OiBFcmljIEFu aG9sdCA8ZXJpY0BhbmhvbHQubmV0PgpGaXhlczogN2IxMjk4ZTA1MzEwICgiZHJtL3ZjNDogU3dp dGNoIERQSSB0byB1c2luZyB0aGUgcGFuZWwtYnJpZGdlIGhlbHBlci4iKQpDYzogQm9yaXMgQnJl emlsbG9uIDxib3Jpcy5icmV6aWxsb25AYm9vdGxpbi5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L3ZjNC92YzRfZHBpLmMgfCAyNyArKysrKysrKysrKysrKysrKysrKysrKy0tLS0KIDEgZmlsZSBj aGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS92YzQvdmM0X2RwaS5jIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZHBp LmMKaW5kZXggNzJjOWRiZDgxZDdmLi44ODc4M2UxNDNjYzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS92YzQvdmM0X2RwaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2RwaS5j CkBAIC05Niw3ICs5Niw2IEBAIHN0cnVjdCB2YzRfZHBpIHsKIAlzdHJ1Y3QgcGxhdGZvcm1fZGV2 aWNlICpwZGV2OwogCiAJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyOwotCXN0cnVjdCBkcm1f Y29ubmVjdG9yICpjb25uZWN0b3I7CiAKIAl2b2lkIF9faW9tZW0gKnJlZ3M7CiAKQEAgLTE2NCwx NCArMTYzLDMxIEBAIHN0YXRpYyB2b2lkIHZjNF9kcGlfZW5jb2Rlcl9kaXNhYmxlKHN0cnVjdCBk cm1fZW5jb2RlciAqZW5jb2RlcikKIAogc3RhdGljIHZvaWQgdmM0X2RwaV9lbmNvZGVyX2VuYWJs ZShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpCiB7CisJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGVuY29kZXItPmRldjsKIAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSA9ICZlbmNv ZGVyLT5jcnRjLT5tb2RlOwogCXN0cnVjdCB2YzRfZHBpX2VuY29kZXIgKnZjNF9lbmNvZGVyID0g dG9fdmM0X2RwaV9lbmNvZGVyKGVuY29kZXIpOwogCXN0cnVjdCB2YzRfZHBpICpkcGkgPSB2YzRf ZW5jb2Rlci0+ZHBpOworCXN0cnVjdCBkcm1fY29ubmVjdG9yX2xpc3RfaXRlciBjb25uX2l0ZXI7 CisJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciA9IE5VTEwsICpjb25uZWN0b3Jfc2Nh bjsKIAl1MzIgZHBpX2MgPSBEUElfRU5BQkxFIHwgRFBJX09VVFBVVF9FTkFCTEVfTU9ERTsKIAlp bnQgcmV0OwogCi0JaWYgKGRwaS0+Y29ubmVjdG9yLT5kaXNwbGF5X2luZm8ubnVtX2J1c19mb3Jt YXRzKSB7Ci0JCXUzMiBidXNfZm9ybWF0ID0gZHBpLT5jb25uZWN0b3ItPmRpc3BsYXlfaW5mby5i dXNfZm9ybWF0c1swXTsKKwkvKiBMb29rIHVwIHRoZSBjb25uZWN0b3IgYXR0YWNoZWQgdG8gRFBJ IHNvIHdlIGNhbiBnZXQgdGhlCisJICogYnVzX2Zvcm1hdC4gIElkZWFsbHkgdGhlIGJyaWRnZSB3 b3VsZCB0ZWxsIHVzIHRoZQorCSAqIGJ1c19mb3JtYXQgd2Ugd2FudCwgYnV0IGl0IGRvZXNuJ3Qg eWV0LCBzbyBhc3N1bWUgdGhhdCBpdCdzCisJICogdW5pZm9ybSB0aHJvdWdob3V0IHRoZSBicmlk Z2UgY2hhaW4uCisJICovCisJZHJtX2Nvbm5lY3Rvcl9saXN0X2l0ZXJfYmVnaW4oZGV2LCAmY29u bl9pdGVyKTsKKwlkcm1fZm9yX2VhY2hfY29ubmVjdG9yX2l0ZXIoY29ubmVjdG9yX3NjYW4sICZj b25uX2l0ZXIpIHsKKwkJaWYgKGNvbm5lY3Rvcl9zY2FuLT5lbmNvZGVyID09IGVuY29kZXIpIHsK KwkJCWNvbm5lY3RvciA9IGNvbm5lY3Rvcl9zY2FuOworCQkJYnJlYWs7CisJCX0KKwl9CisJZHJt X2Nvbm5lY3Rvcl9saXN0X2l0ZXJfZW5kKCZjb25uX2l0ZXIpOworCisJaWYgKGNvbm5lY3RvciAm JiBjb25uZWN0b3ItPmRpc3BsYXlfaW5mby5udW1fYnVzX2Zvcm1hdHMpIHsKKwkJdTMyIGJ1c19m b3JtYXQgPSBjb25uZWN0b3ItPmRpc3BsYXlfaW5mby5idXNfZm9ybWF0c1swXTsKIAogCQlzd2l0 Y2ggKGJ1c19mb3JtYXQpIHsKIAkJY2FzZSBNRURJQV9CVVNfRk1UX1JHQjg4OF8xWDI0OgpAQCAt MTk5LDYgKzIxNSw5IEBAIHN0YXRpYyB2b2lkIHZjNF9kcGlfZW5jb2Rlcl9lbmFibGUoc3RydWN0 IGRybV9lbmNvZGVyICplbmNvZGVyKQogCQkJRFJNX0VSUk9SKCJVbmtub3duIG1lZGlhIGJ1cyBm b3JtYXQgJWRcbiIsIGJ1c19mb3JtYXQpOwogCQkJYnJlYWs7CiAJCX0KKwl9IGVsc2UgeworCQkv KiBEZWZhdWx0IHRvIDI0Yml0IGlmIG5vIGNvbm5lY3RvciBmb3VuZC4gKi8KKwkJZHBpX2MgfD0g VkM0X1NFVF9GSUVMRChEUElfRk9STUFUXzI0QklUXzg4OF9SR0IsIERQSV9GT1JNQVQpOwogCX0K IAogCWlmIChtb2RlLT5mbGFncyAmIERSTV9NT0RFX0ZMQUdfTkhTWU5DKQpAQCAtMjY0LDcgKzI4 Myw3IEBAIHN0YXRpYyBpbnQgdmM0X2RwaV9pbml0X2JyaWRnZShzdHJ1Y3QgdmM0X2RwaSAqZHBp KQogCQkJcmV0dXJuIHJldDsKIAl9CiAKLQlpZiAocGFuZWwpCisJaWYgKHBhbmVsKSAKIAkJYnJp ZGdlID0gZHJtX3BhbmVsX2JyaWRnZV9hZGQocGFuZWwsIERSTV9NT0RFX0NPTk5FQ1RPUl9EUEkp OwogCiAJcmV0dXJuIGRybV9icmlkZ2VfYXR0YWNoKGRwaS0+ZW5jb2RlciwgYnJpZGdlLCBOVUxM KTsKLS0gCjIuMTYuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVsCg==