From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D873CA9EA9 for ; Fri, 18 Oct 2019 22:05:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F26A222C6 for ; Fri, 18 Oct 2019 22:05:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571436350; bh=2K3Nhn17oyQlttcoEwq3Au9rsNdUXZ/WhlXS/lb70BA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YbvlRJ3yeqtsDIvFY85uU7cgwuIT/CuStsj/b1/H1E/JcgBEx76Qbh+PU6YjUEECb GTixXALEYCIKzILcLHpevkF4eLG6KMXpLcXN3B+OgfBhOpnYHOu9TwDfOC3wRRjaTh XcdPPIAYUuHU06nU6ATOdV9FgEVumJUOX2+RgDtM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730169AbfJRWFt (ORCPT ); Fri, 18 Oct 2019 18:05:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:37700 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730129AbfJRWFr (ORCPT ); Fri, 18 Oct 2019 18:05:47 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B7552222C6; Fri, 18 Oct 2019 22:05:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571436346; bh=2K3Nhn17oyQlttcoEwq3Au9rsNdUXZ/WhlXS/lb70BA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hjrGiBd5YuiReS77LKj/0bAf6oktgCFlZsCWLYMskiyxXlW8j5aTk2SJIJzlK6w33 2Wt0cwDl7o1eOT2bzeXFFR7DeFFyCTJC2OnJ+pZzE7NKIr+4ltV6eO4BvFZLcr8R3D B/nAZn0pbFKslb1fAR/YaBBFhm2XZgposE2YDU1o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jeykumar Sankaran , Sean Paul , Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 012/100] drm/msm/dpu: handle failures while initializing displays Date: Fri, 18 Oct 2019 18:03:57 -0400 Message-Id: <20191018220525.9042-12-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191018220525.9042-1-sashal@kernel.org> References: <20191018220525.9042-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Jeykumar Sankaran [ Upstream commit a802ee99c448ca0496fa307f3e46b834ae2a46a3 ] Bail out KMS hw init on display initialization failures with proper error logging. changes in v3: - introduced in the series changes in v4: - avoid duplicate return on errors (Sean Paul) - avoid spamming errors on failures (Jordon Crouse) Signed-off-by: Jeykumar Sankaran Signed-off-by: Sean Paul Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 31 ++++++++++++++----------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 74cc204b07e80..2d9b7b5fb49c8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -442,35 +442,38 @@ static void dpu_kms_wait_for_commit_done(struct msm_kms *kms, } } -static void _dpu_kms_initialize_dsi(struct drm_device *dev, +static int _dpu_kms_initialize_dsi(struct drm_device *dev, struct msm_drm_private *priv, struct dpu_kms *dpu_kms) { struct drm_encoder *encoder = NULL; - int i, rc; + int i, rc = 0; + + if (!(priv->dsi[0] || priv->dsi[1])) + return rc; /*TODO: Support two independent DSI connectors */ encoder = dpu_encoder_init(dev, DRM_MODE_ENCODER_DSI); - if (IS_ERR_OR_NULL(encoder)) { + if (IS_ERR(encoder)) { DPU_ERROR("encoder init failed for dsi display\n"); - return; + return PTR_ERR(encoder); } priv->encoders[priv->num_encoders++] = encoder; for (i = 0; i < ARRAY_SIZE(priv->dsi); i++) { - if (!priv->dsi[i]) { - DPU_DEBUG("invalid msm_dsi for ctrl %d\n", i); - return; - } + if (!priv->dsi[i]) + continue; rc = msm_dsi_modeset_init(priv->dsi[i], dev, encoder); if (rc) { DPU_ERROR("modeset_init failed for dsi[%d], rc = %d\n", i, rc); - continue; + break; } } + + return rc; } /** @@ -481,16 +484,16 @@ static void _dpu_kms_initialize_dsi(struct drm_device *dev, * @dpu_kms: Pointer to dpu kms structure * Returns: Zero on success */ -static void _dpu_kms_setup_displays(struct drm_device *dev, +static int _dpu_kms_setup_displays(struct drm_device *dev, struct msm_drm_private *priv, struct dpu_kms *dpu_kms) { - _dpu_kms_initialize_dsi(dev, priv, dpu_kms); - /** * Extend this function to initialize other * types of displays */ + + return _dpu_kms_initialize_dsi(dev, priv, dpu_kms); } static void _dpu_kms_drm_obj_destroy(struct dpu_kms *dpu_kms) @@ -552,7 +555,9 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms) * Create encoder and query display drivers to create * bridges and connectors */ - _dpu_kms_setup_displays(dev, priv, dpu_kms); + ret = _dpu_kms_setup_displays(dev, priv, dpu_kms); + if (ret) + goto fail; max_crtc_count = min(catalog->mixer_count, priv->num_encoders); -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 012/100] drm/msm/dpu: handle failures while initializing displays Date: Fri, 18 Oct 2019 18:03:57 -0400 Message-ID: <20191018220525.9042-12-sashal@kernel.org> References: <20191018220525.9042-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191018220525.9042-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Sean Paul , Jeykumar Sankaran , freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogSmV5a3VtYXIgU2Fua2FyYW4gPGpzYW5rYUBjb2RlYXVyb3JhLm9yZz4KClsgVXBzdHJl YW0gY29tbWl0IGE4MDJlZTk5YzQ0OGNhMDQ5NmZhMzA3ZjNlNDZiODM0YWUyYTQ2YTMgXQoKQmFp bCBvdXQgS01TIGh3IGluaXQgb24gZGlzcGxheSBpbml0aWFsaXphdGlvbiBmYWlsdXJlcyB3aXRo CnByb3BlciBlcnJvciBsb2dnaW5nLgoKY2hhbmdlcyBpbiB2MzoKICAgIC0gaW50cm9kdWNlZCBp biB0aGUgc2VyaWVzCmNoYW5nZXMgaW4gdjQ6CiAgICAtIGF2b2lkIGR1cGxpY2F0ZSByZXR1cm4g b24gZXJyb3JzIChTZWFuIFBhdWwpCiAgICAtIGF2b2lkIHNwYW1taW5nIGVycm9ycyBvbiBmYWls dXJlcyAoSm9yZG9uIENyb3VzZSkKClNpZ25lZC1vZmYtYnk6IEpleWt1bWFyIFNhbmthcmFuIDxq c2Fua2FAY29kZWF1cm9yYS5vcmc+ClNpZ25lZC1vZmYtYnk6IFNlYW4gUGF1bCA8c2VhbnBhdWxA Y2hyb21pdW0ub3JnPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5v cmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2ttcy5jIHwgMzEgKysr KysrKysrKysrKystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyks IDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9k cHUxL2RwdV9rbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9rbXMuYwpp bmRleCA3NGNjMjA0YjA3ZTgwLi4yZDliN2I1ZmI0OWM4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfa21zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9k aXNwL2RwdTEvZHB1X2ttcy5jCkBAIC00NDIsMzUgKzQ0MiwzOCBAQCBzdGF0aWMgdm9pZCBkcHVf a21zX3dhaXRfZm9yX2NvbW1pdF9kb25lKHN0cnVjdCBtc21fa21zICprbXMsCiAJfQogfQogCi1z dGF0aWMgdm9pZCBfZHB1X2ttc19pbml0aWFsaXplX2RzaShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAorc3RhdGljIGludCBfZHB1X2ttc19pbml0aWFsaXplX2RzaShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCQkJCSAgICBzdHJ1Y3QgbXNtX2RybV9wcml2YXRlICpwcml2LAogCQkJCSAgICBzdHJ1 Y3QgZHB1X2ttcyAqZHB1X2ttcykKIHsKIAlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIgPSBO VUxMOwotCWludCBpLCByYzsKKwlpbnQgaSwgcmMgPSAwOworCisJaWYgKCEocHJpdi0+ZHNpWzBd IHx8IHByaXYtPmRzaVsxXSkpCisJCXJldHVybiByYzsKIAogCS8qVE9ETzogU3VwcG9ydCB0d28g aW5kZXBlbmRlbnQgRFNJIGNvbm5lY3RvcnMgKi8KIAllbmNvZGVyID0gZHB1X2VuY29kZXJfaW5p dChkZXYsIERSTV9NT0RFX0VOQ09ERVJfRFNJKTsKLQlpZiAoSVNfRVJSX09SX05VTEwoZW5jb2Rl cikpIHsKKwlpZiAoSVNfRVJSKGVuY29kZXIpKSB7CiAJCURQVV9FUlJPUigiZW5jb2RlciBpbml0 IGZhaWxlZCBmb3IgZHNpIGRpc3BsYXlcbiIpOwotCQlyZXR1cm47CisJCXJldHVybiBQVFJfRVJS KGVuY29kZXIpOwogCX0KIAogCXByaXYtPmVuY29kZXJzW3ByaXYtPm51bV9lbmNvZGVycysrXSA9 IGVuY29kZXI7CiAKIAlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShwcml2LT5kc2kpOyBpKysp IHsKLQkJaWYgKCFwcml2LT5kc2lbaV0pIHsKLQkJCURQVV9ERUJVRygiaW52YWxpZCBtc21fZHNp IGZvciBjdHJsICVkXG4iLCBpKTsKLQkJCXJldHVybjsKLQkJfQorCQlpZiAoIXByaXYtPmRzaVtp XSkKKwkJCWNvbnRpbnVlOwogCiAJCXJjID0gbXNtX2RzaV9tb2Rlc2V0X2luaXQocHJpdi0+ZHNp W2ldLCBkZXYsIGVuY29kZXIpOwogCQlpZiAocmMpIHsKIAkJCURQVV9FUlJPUigibW9kZXNldF9p bml0IGZhaWxlZCBmb3IgZHNpWyVkXSwgcmMgPSAlZFxuIiwKIAkJCQlpLCByYyk7Ci0JCQljb250 aW51ZTsKKwkJCWJyZWFrOwogCQl9CiAJfQorCisJcmV0dXJuIHJjOwogfQogCiAvKioKQEAgLTQ4 MSwxNiArNDg0LDE2IEBAIHN0YXRpYyB2b2lkIF9kcHVfa21zX2luaXRpYWxpemVfZHNpKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAgKiBAZHB1X2ttczogICAgUG9pbnRlciB0byBkcHUga21zIHN0 cnVjdHVyZQogICogUmV0dXJuczogICAgIFplcm8gb24gc3VjY2VzcwogICovCi1zdGF0aWMgdm9p ZCBfZHB1X2ttc19zZXR1cF9kaXNwbGF5cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorc3RhdGlj IGludCBfZHB1X2ttc19zZXR1cF9kaXNwbGF5cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJ CSAgICBzdHJ1Y3QgbXNtX2RybV9wcml2YXRlICpwcml2LAogCQkJCSAgICBzdHJ1Y3QgZHB1X2tt cyAqZHB1X2ttcykKIHsKLQlfZHB1X2ttc19pbml0aWFsaXplX2RzaShkZXYsIHByaXYsIGRwdV9r bXMpOwotCiAJLyoqCiAJICogRXh0ZW5kIHRoaXMgZnVuY3Rpb24gdG8gaW5pdGlhbGl6ZSBvdGhl cgogCSAqIHR5cGVzIG9mIGRpc3BsYXlzCiAJICovCisKKwlyZXR1cm4gX2RwdV9rbXNfaW5pdGlh bGl6ZV9kc2koZGV2LCBwcml2LCBkcHVfa21zKTsKIH0KIAogc3RhdGljIHZvaWQgX2RwdV9rbXNf ZHJtX29ial9kZXN0cm95KHN0cnVjdCBkcHVfa21zICpkcHVfa21zKQpAQCAtNTUyLDcgKzU1NSw5 IEBAIHN0YXRpYyBpbnQgX2RwdV9rbXNfZHJtX29ial9pbml0KHN0cnVjdCBkcHVfa21zICpkcHVf a21zKQogCSAqIENyZWF0ZSBlbmNvZGVyIGFuZCBxdWVyeSBkaXNwbGF5IGRyaXZlcnMgdG8gY3Jl YXRlCiAJICogYnJpZGdlcyBhbmQgY29ubmVjdG9ycwogCSAqLwotCV9kcHVfa21zX3NldHVwX2Rp c3BsYXlzKGRldiwgcHJpdiwgZHB1X2ttcyk7CisJcmV0ID0gX2RwdV9rbXNfc2V0dXBfZGlzcGxh eXMoZGV2LCBwcml2LCBkcHVfa21zKTsKKwlpZiAocmV0KQorCQlnb3RvIGZhaWw7CiAKIAltYXhf Y3J0Y19jb3VudCA9IG1pbihjYXRhbG9nLT5taXhlcl9jb3VudCwgcHJpdi0+bnVtX2VuY29kZXJz KTsKIAotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpGcmVlZHJlbm8gbWFpbGluZyBsaXN0CkZyZWVkcmVub0BsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9mcmVl ZHJlbm8=