From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.20 097/304] drm: Move drm_mode_setcrtc() local re-init to failure path Date: Mon, 28 Jan 2019 10:40:14 -0500 Message-ID: <20190128154341.47195-97-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1382C6E4EC for ; Mon, 28 Jan 2019 15:47:43 +0000 (UTC) In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Sean Paul , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CgpbIFVwc3RyZWFtIGNvbW1p dCBjMjMyZTlmNDFiMTM2YzE0MWRmOTkzODAyNGU1MjExOTFhN2I5MTBkIF0KCkluc3RlYWQgb2Yg YWx3YXlzIHJlLWluaXRpYWxpemluZyB0aGUgdmFyaWFibGVzIHdlIG5lZWQgdG8gY2xlYW4gdXAg b24Kb3V0LCBtb3ZlIHRoZSByZS1pbml0aWFsaXphdGlvbiBpbnRvIHRoZSBicmFuY2ggdGhhdCBn b2VzIGJhY2sgdG8gcmV0cnkKbGFiZWwuCgpUaGlzIGlzIGEgbGF0ZXJhbCBtb3ZlIHJpZ2h0IG5v dywgYnV0IHdpbGwgYWxsb3cgdXMgdG8gcHVsbCBvdXQgdGhlCm1vZGVzZXQgbG9ja2luZyBpbnRv IGNvbW1vbiBjb2RlLiBJIGtlcHQgdGhpcyBjaGFuZ2Ugc2VwYXJhdGUgdG8gbWFrZQp0aGluZ3Mg ZWFzaWVyIHRvIHJldmlldy4KCkNoYW5nZXMgaW4gdjI6Ci0gTm9uZQoKUmV2aWV3ZWQtYnk6IERh bmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4KU2lnbmVkLW9mZi1ieTogU2VhbiBQYXVsIDxz ZWFucGF1bEBjaHJvbWl1bS5vcmc+Ckxpbms6IGh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9w Lm9yZy9wYXRjaC9tc2dpZC8yMDE4MTEyOTE1MDQyMy4yMzkwODEtMi1zZWFuQHBvb3JseS5ydW4K U2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9kcm1fY3J0Yy5jIHwgMTYgKysrKysrKysrLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDkgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2NydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5jCmluZGV4IDI2 OGExODJhZTE4OS4uYWY0Yjk0Y2U4ZTk0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJt X2NydGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYwpAQCAtNTcwLDkgKzU3MCw5 IEBAIGludCBkcm1fbW9kZV9zZXRjcnRjKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRh dGEsCiAJc3RydWN0IGRybV9tb2RlX2NydGMgKmNydGNfcmVxID0gZGF0YTsKIAlzdHJ1Y3QgZHJt X2NydGMgKmNydGM7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7Ci0Jc3RydWN0IGRybV9jb25u ZWN0b3IgKipjb25uZWN0b3Jfc2V0LCAqY29ubmVjdG9yOwotCXN0cnVjdCBkcm1fZnJhbWVidWZm ZXIgKmZiOwotCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlOworCXN0cnVjdCBkcm1fY29u bmVjdG9yICoqY29ubmVjdG9yX3NldCA9IE5VTEwsICpjb25uZWN0b3I7CisJc3RydWN0IGRybV9m cmFtZWJ1ZmZlciAqZmIgPSBOVUxMOworCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlID0g TlVMTDsKIAlzdHJ1Y3QgZHJtX21vZGVfc2V0IHNldDsKIAl1aW50MzJfdCBfX3VzZXIgKnNldF9j b25uZWN0b3JzX3B0cjsKIAlzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggY3R4OwpAQCAt NjAxLDEwICs2MDEsNiBAQCBpbnQgZHJtX21vZGVfc2V0Y3J0YyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB2b2lkICpkYXRhLAogCW11dGV4X2xvY2soJmNydGMtPmRldi0+bW9kZV9jb25maWcubXV0 ZXgpOwogCWRybV9tb2Rlc2V0X2FjcXVpcmVfaW5pdCgmY3R4LCBEUk1fTU9ERVNFVF9BQ1FVSVJF X0lOVEVSUlVQVElCTEUpOwogcmV0cnk6Ci0JY29ubmVjdG9yX3NldCA9IE5VTEw7Ci0JZmIgPSBO VUxMOwotCW1vZGUgPSBOVUxMOwotCiAJcmV0ID0gZHJtX21vZGVzZXRfbG9ja19hbGxfY3R4KGNy dGMtPmRldiwgJmN0eCk7CiAJaWYgKHJldCkKIAkJZ290byBvdXQ7CkBAIC03NjYsNiArNzYyLDEy IEBAIG91dDoKIAl9CiAJa2ZyZWUoY29ubmVjdG9yX3NldCk7CiAJZHJtX21vZGVfZGVzdHJveShk ZXYsIG1vZGUpOworCisJLyogSW4gY2FzZSB3ZSBuZWVkIHRvIHJldHJ5Li4uICovCisJY29ubmVj dG9yX3NldCA9IE5VTEw7CisJZmIgPSBOVUxMOworCW1vZGUgPSBOVUxMOworCiAJaWYgKHJldCA9 PSAtRURFQURMSykgewogCQlyZXQgPSBkcm1fbW9kZXNldF9iYWNrb2ZmKCZjdHgpOwogCQlpZiAo IXJldCkKLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp LWRldmVsCg== 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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 1C590C282C8 for ; Mon, 28 Jan 2019 15:47:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1B8221741 for ; Mon, 28 Jan 2019 15:47:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690469; bh=SDdDHVPe2v0aKPHu1WctkwU4nvAnGBGp5d8pnNIlKi0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nbwaNv1WzmPmHs02wLLvj0vFoHANBSpnaTSMDcxrEiZdUjpeNXdmB4P7ifIIe7lrX CuXd46051QecvJfQYk58Plbp2YNo4aVtOQvKUSMDVq0l1QZ5X1pdsdKQNmR1fgdZKp 7up7KUTNY8Hh7TmAXS6ecYaIFTUWFw+RH58XCEHg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728397AbfA1Prr (ORCPT ); Mon, 28 Jan 2019 10:47:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:33120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728370AbfA1Prn (ORCPT ); Mon, 28 Jan 2019 10:47:43 -0500 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 E7EE92147A; Mon, 28 Jan 2019 15:47:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690463; bh=SDdDHVPe2v0aKPHu1WctkwU4nvAnGBGp5d8pnNIlKi0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fnWy1hBoUHMVUYW9NSkoOD8JRaEKtDPIy4+V+XkF8qzIr62TFo0VXSTZKnFDVlud3 Jb/Aq41cO5Z/LHl3fdiU3M1Mos7QaNnrtfSpOWX//YMSVdtT9byGq9yG1JBUuji5GW IR5f5AFRt4pTj6vuucsF6tAb51/ZRhb+W7i/+jSk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sean Paul , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.20 097/304] drm: Move drm_mode_setcrtc() local re-init to failure path Date: Mon, 28 Jan 2019 10:40:14 -0500 Message-Id: <20190128154341.47195-97-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sean Paul [ Upstream commit c232e9f41b136c141df9938024e521191a7b910d ] Instead of always re-initializing the variables we need to clean up on out, move the re-initialization into the branch that goes back to retry label. This is a lateral move right now, but will allow us to pull out the modeset locking into common code. I kept this change separate to make things easier to review. Changes in v2: - None Reviewed-by: Daniel Vetter Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20181129150423.239081-2-sean@poorly.run Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_crtc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 268a182ae189..af4b94ce8e94 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -570,9 +570,9 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, struct drm_mode_crtc *crtc_req = data; struct drm_crtc *crtc; struct drm_plane *plane; - struct drm_connector **connector_set, *connector; - struct drm_framebuffer *fb; - struct drm_display_mode *mode; + struct drm_connector **connector_set = NULL, *connector; + struct drm_framebuffer *fb = NULL; + struct drm_display_mode *mode = NULL; struct drm_mode_set set; uint32_t __user *set_connectors_ptr; struct drm_modeset_acquire_ctx ctx; @@ -601,10 +601,6 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, mutex_lock(&crtc->dev->mode_config.mutex); drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE); retry: - connector_set = NULL; - fb = NULL; - mode = NULL; - ret = drm_modeset_lock_all_ctx(crtc->dev, &ctx); if (ret) goto out; @@ -766,6 +762,12 @@ out: } kfree(connector_set); drm_mode_destroy(dev, mode); + + /* In case we need to retry... */ + connector_set = NULL; + fb = NULL; + mode = NULL; + if (ret == -EDEADLK) { ret = drm_modeset_backoff(&ctx); if (!ret) -- 2.19.1