From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.1 03/11] drm/virtio: move drm_connector_update_edid_property() call Date: Wed, 10 Jul 2019 11:02:30 -0400 Message-ID: <20190710150240.6984-3-sashal@kernel.org> References: <20190710150240.6984-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 199CA6E0E9 for ; Wed, 10 Jul 2019 15:02:47 +0000 (UTC) In-Reply-To: <20190710150240.6984-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 , Cornelia Huck , dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org, Max Filippov , Gerd Hoffmann List-Id: dri-devel@lists.freedesktop.org RnJvbTogR2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+CgpbIFVwc3RyZWFtIGNvbW1p dCA0MWRlNGJlNmY2ZWZhNDEzMmIyOWFmNTExNThjZDY3MmQ5M2YyNTQzIF0KCmRybV9jb25uZWN0 b3JfdXBkYXRlX2VkaWRfcHJvcGVydHkgY2FuIHNsZWVwLCB3ZSBtdXN0IG5vdApjYWxsIGl0IHdo aWxlIGhvbGRpbmcgYSBzcGlubG9jay4gIE1vdmUgdGhlIGNhbGxzaXRlLgoKRml4ZXM6IGI0YjAx YjQ5OTVmYiAoImRybS92aXJ0aW86IGFkZCBlZGlkIHN1cHBvcnQiKQpSZXBvcnRlZC1ieTogTWF4 IEZpbGlwcG92IDxqY212YmtiY0BnbWFpbC5jb20+ClNpZ25lZC1vZmYtYnk6IEdlcmQgSG9mZm1h bm4gPGtyYXhlbEByZWRoYXQuY29tPgpUZXN0ZWQtYnk6IE1heCBGaWxpcHBvdiA8amNtdmJrYmNA Z21haWwuY29tPgpUZXN0ZWQtYnk6IENvcm5lbGlhIEh1Y2sgPGNvaHVja0ByZWRoYXQuY29tPgpB Y2tlZC1ieTogQ29ybmVsaWEgSHVjayA8Y29odWNrQHJlZGhhdC5jb20+Ckxpbms6IGh0dHA6Ly9w YXRjaHdvcmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lkLzIwMTkwNDA1MDQ0NjAyLjIzMzQt MS1rcmF4ZWxAcmVkaGF0LmNvbQpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtl cm5lbC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X3ZxLmMgfCAyICst CiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfdnEuYyBiL2RyaXZlcnMvZ3B1L2Ry bS92aXJ0aW8vdmlydGdwdV92cS5jCmluZGV4IDZiYzIwMDhiMGQwZC4uM2VmMjRmODllZjkzIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfdnEuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfdnEuYwpAQCAtNjIwLDExICs2MjAsMTEgQEAgc3Rh dGljIHZvaWQgdmlydGlvX2dwdV9jbWRfZ2V0X2VkaWRfY2Ioc3RydWN0IHZpcnRpb19ncHVfZGV2 aWNlICp2Z2RldiwKIAlvdXRwdXQgPSB2Z2Rldi0+b3V0cHV0cyArIHNjYW5vdXQ7CiAKIAluZXdf ZWRpZCA9IGRybV9kb19nZXRfZWRpZCgmb3V0cHV0LT5jb25uLCB2aXJ0aW9fZ2V0X2VkaWRfYmxv Y2ssIHJlc3ApOworCWRybV9jb25uZWN0b3JfdXBkYXRlX2VkaWRfcHJvcGVydHkoJm91dHB1dC0+ Y29ubiwgbmV3X2VkaWQpOwogCiAJc3Bpbl9sb2NrKCZ2Z2Rldi0+ZGlzcGxheV9pbmZvX2xvY2sp OwogCW9sZF9lZGlkID0gb3V0cHV0LT5lZGlkOwogCW91dHB1dC0+ZWRpZCA9IG5ld19lZGlkOwot CWRybV9jb25uZWN0b3JfdXBkYXRlX2VkaWRfcHJvcGVydHkoJm91dHB1dC0+Y29ubiwgb3V0cHV0 LT5lZGlkKTsKIAlzcGluX3VubG9jaygmdmdkZXYtPmRpc3BsYXlfaW5mb19sb2NrKTsKIAogCWtm cmVlKG9sZF9lZGlkKTsKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vZHJpLWRldmVs 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,USER_AGENT_GIT autolearn=unavailable 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 68392C74A2B for ; Wed, 10 Jul 2019 15:02:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 354002064B for ; Wed, 10 Jul 2019 15:02:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562770972; bh=iDWaGuCyFWXcNVHxVD68Z0CNqAgj+ipuFl5jzHmj4kA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xskL533USnZKhnXDogh00EWl0i+DtgJLLILBOecxDxV8a/EKWvmG/tYhv2AqOt/rT j/ddzmRZOxNtFpJMK8yg389/nMz49Jl1eP4pmTub/0clYtsqLFrYRwpScXc5oyHvkW 7Xkz+VV03vpiEVaaaql/K+HSGOI6t40NrsjGoyiw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727991AbfGJPCv (ORCPT ); Wed, 10 Jul 2019 11:02:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:34552 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727964AbfGJPCr (ORCPT ); Wed, 10 Jul 2019 11:02: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 039F42064B; Wed, 10 Jul 2019 15:02:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562770966; bh=iDWaGuCyFWXcNVHxVD68Z0CNqAgj+ipuFl5jzHmj4kA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ry5jxnTIsLHN8kFUiyUPGvn8wgjYz4kNq7bT2vJRzmzCiK2OFkeI0K/AjwYhujbGu pjl6z+HpwjjSZN+V9BONgpuiUyWoNrb7Jicd5EhYIf/8Xy9CsKrWF87Wp7qUyixY15 D9b2Q6KRH5JPdt9aY/t1XSLhkQRBS9Up+PwCHA1E= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gerd Hoffmann , Max Filippov , Cornelia Huck , Sasha Levin , dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org Subject: [PATCH AUTOSEL 5.1 03/11] drm/virtio: move drm_connector_update_edid_property() call Date: Wed, 10 Jul 2019 11:02:30 -0400 Message-Id: <20190710150240.6984-3-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190710150240.6984-1-sashal@kernel.org> References: <20190710150240.6984-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review 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: Gerd Hoffmann [ Upstream commit 41de4be6f6efa4132b29af51158cd672d93f2543 ] drm_connector_update_edid_property can sleep, we must not call it while holding a spinlock. Move the callsite. Fixes: b4b01b4995fb ("drm/virtio: add edid support") Reported-by: Max Filippov Signed-off-by: Gerd Hoffmann Tested-by: Max Filippov Tested-by: Cornelia Huck Acked-by: Cornelia Huck Link: http://patchwork.freedesktop.org/patch/msgid/20190405044602.2334-1-kraxel@redhat.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c index 6bc2008b0d0d..3ef24f89ef93 100644 --- a/drivers/gpu/drm/virtio/virtgpu_vq.c +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c @@ -620,11 +620,11 @@ static void virtio_gpu_cmd_get_edid_cb(struct virtio_gpu_device *vgdev, output = vgdev->outputs + scanout; new_edid = drm_do_get_edid(&output->conn, virtio_get_edid_block, resp); + drm_connector_update_edid_property(&output->conn, new_edid); spin_lock(&vgdev->display_info_lock); old_edid = output->edid; output->edid = new_edid; - drm_connector_update_edid_property(&output->conn, output->edid); spin_unlock(&vgdev->display_info_lock); kfree(old_edid); -- 2.20.1