From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.20 096/304] drm: Clear state->acquire_ctx before leaving drm_atomic_helper_commit_duplicated_state() Date: Mon, 28 Jan 2019 10:40:13 -0500 Message-ID: <20190128154341.47195-96-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 8786C6E4EB for ; Mon, 28 Jan 2019 15:47:41 +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 dCBhYTM5NGIwZGQ2OGNiMDBjNDgzZTE1MWRjZDg0NzEzZDRkNTE3ZWQxIF0KCmRybV9hdG9taWNf aGVscGVyX2NvbW1pdF9kdXBsaWNhdGVkX3N0YXRlKCkgc2V0cyBzdGF0ZS0+YWNxdWlyZV9jdHgg dG8KdGhlIGNvbnRleHQgZ2l2ZW4gaW4gdGhlIGFyZ3VtZW50IGFuZCBsZWF2ZXMgaXQgaW4gc3Rh dGUgYWZ0ZXIgaXQKcXVpdHMuIFRoZSBsaWZldGltZSBvZiBzdGF0ZSBhbmQgY29udGV4dCBhcmUg bm90IGd1YXJhbnRlZWQgdG8gYmUgdGhlCnNhbWUsIHNvIHdlIHNob3VsZG4ndCBsZWF2ZSB0aGF0 IHBvaW50ZXIgaGFuZ2luZyBhcm91bmQuIFRoaXMgcGF0Y2gKcmVzZXRzIHRoZSBjb250ZXh0IHRv IE5VTEwgdG8gYXZvaWQgYW55IG9vcHNlcy4KCkNoYW5nZXMgaW4gdjI6Ci0gQWRkZWQgdG8gdGhl IHNldAoKU3VnZ2VzdGVkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+ClJldmll d2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpTaWduZWQtb2Zm LWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KTGluazogaHR0cHM6Ly9wYXRj aHdvcmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lkLzIwMTgxMTI5MTUwNDIzLjIzOTA4MS0x LXNlYW5AcG9vcmx5LnJ1bgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5l bC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgfCA4ICsrKysr Ky0tCiAxIGZpbGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIGIvZHJpdmVycy9n cHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKaW5kZXggYjRlMjkyYTU2MDQ2Li5kZjg2YzJlYmZj MTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCkBAIC0zMjEyLDcgKzMyMTIsNyBA QCBFWFBPUlRfU1lNQk9MKGRybV9hdG9taWNfaGVscGVyX3N1c3BlbmQpOwogaW50IGRybV9hdG9t aWNfaGVscGVyX2NvbW1pdF9kdXBsaWNhdGVkX3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSwKIAkJCQkJICAgICAgc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4ICpjdHgp CiB7Ci0JaW50IGk7CisJaW50IGksIHJldDsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKIAlz dHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpuZXdfcGxhbmVfc3RhdGU7CiAJc3RydWN0IGRybV9jb25u ZWN0b3IgKmNvbm5lY3RvcjsKQEAgLTMyMzEsNyArMzIzMSwxMSBAQCBpbnQgZHJtX2F0b21pY19o ZWxwZXJfY29tbWl0X2R1cGxpY2F0ZWRfc3RhdGUoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlLAogCWZvcl9lYWNoX25ld19jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3Rvciwg bmV3X2Nvbm5fc3RhdGUsIGkpCiAJCXN0YXRlLT5jb25uZWN0b3JzW2ldLm9sZF9zdGF0ZSA9IGNv bm5lY3Rvci0+c3RhdGU7CiAKLQlyZXR1cm4gZHJtX2F0b21pY19jb21taXQoc3RhdGUpOworCXJl dCA9IGRybV9hdG9taWNfY29tbWl0KHN0YXRlKTsKKworCXN0YXRlLT5hY3F1aXJlX2N0eCA9IE5V TEw7CisKKwlyZXR1cm4gcmV0OwogfQogRVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX2hlbHBlcl9j b21taXRfZHVwbGljYXRlZF9zdGF0ZSk7CiAKLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== 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 F1553C282CD for ; Mon, 28 Jan 2019 17:45:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C162E20881 for ; Mon, 28 Jan 2019 17:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548697540; bh=sGAeEOEyVi0+YKfusaYm6eKkz6VSBsZUlgkQg7OO0zo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MMkFqqIAdj6nYiSzIY1Z54/WRY66wDTzzuCM1JR+X8onBapyX+8xibHLppI9U4SxI Ghswvftpn3b+NaCQHsFA1mlSf2pq9iCFVSCFf5XhYZ6mK+rUVG38i3qr564c4b71vE u/w08dg/LtXo5aGDtBCxXh8WP4PJUzx179WwobY8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728570AbfA1Rph (ORCPT ); Mon, 28 Jan 2019 12:45:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:33094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727823AbfA1Prl (ORCPT ); Mon, 28 Jan 2019 10:47:41 -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 46F3520880; Mon, 28 Jan 2019 15:47:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690461; bh=sGAeEOEyVi0+YKfusaYm6eKkz6VSBsZUlgkQg7OO0zo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kUwgWeSn9QuEeOUnCYsx95QovG3gQkMYrqWAe17QjtcooETij+rpjDrzNMijDutp1 BIAZnFWgJIdDOBPJA3XDn6W8VvtxjOp1UoV2yTWN+DUeQ9AIxi/oPU8hqLETN+dYK1 NW2WwfquSC+UP8dfBijN9cwG/PIc1SeQnMlyWjEc= 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 096/304] drm: Clear state->acquire_ctx before leaving drm_atomic_helper_commit_duplicated_state() Date: Mon, 28 Jan 2019 10:40:13 -0500 Message-Id: <20190128154341.47195-96-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 aa394b0dd68cb00c483e151dcd84713d4d517ed1 ] drm_atomic_helper_commit_duplicated_state() sets state->acquire_ctx to the context given in the argument and leaves it in state after it quits. The lifetime of state and context are not guaranteed to be the same, so we shouldn't leave that pointer hanging around. This patch resets the context to NULL to avoid any oopses. Changes in v2: - Added to the set Suggested-by: Daniel Vetter Reviewed-by: Daniel Vetter Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20181129150423.239081-1-sean@poorly.run Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_atomic_helper.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index b4e292a56046..df86c2ebfc12 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3212,7 +3212,7 @@ EXPORT_SYMBOL(drm_atomic_helper_suspend); int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state, struct drm_modeset_acquire_ctx *ctx) { - int i; + int i, ret; struct drm_plane *plane; struct drm_plane_state *new_plane_state; struct drm_connector *connector; @@ -3231,7 +3231,11 @@ int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state, for_each_new_connector_in_state(state, connector, new_conn_state, i) state->connectors[i].old_state = connector->state; - return drm_atomic_commit(state); + ret = drm_atomic_commit(state); + + state->acquire_ctx = NULL; + + return ret; } EXPORT_SYMBOL(drm_atomic_helper_commit_duplicated_state); -- 2.19.1