Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2475240lqp; Sun, 24 Mar 2024 22:25:56 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWUQethHVG5K2advHmYX+pgJqoxsQ4UENU7PN9xXM77CaAgpnhQvtouS6LVP/VB8Y1vBdIohRhJTdam8AQsnzzOGSUMDL8CtspM26ukRg== X-Google-Smtp-Source: AGHT+IGxidhvk1LlZCYrm11H0sa+6bXm/cchFBW+nlHZx4HzCqyzotNvELOv5p5L+GZG7pi/lJni X-Received: by 2002:a17:90a:d998:b0:29c:6fc1:17e0 with SMTP id d24-20020a17090ad99800b0029c6fc117e0mr3980480pjv.10.1711344355924; Sun, 24 Mar 2024 22:25:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711344355; cv=pass; d=google.com; s=arc-20160816; b=ef+gW+SIkuF2VxAV3XSPhqkAk7tj4zxdBtpjGLAwThIs6hVPgLhiUn4tqv/tr+gosF 850RX8K08mJLuJWikMhlYGAeYIugY8G0CKL7i6l3Bh4AwTL9Z44jvcmD1KwrZQoVBjlN AUxsBoRoqAw+rCqNdg/czwgzG0OqLPlpJkt9H9C8ytZZ4Ad1ustqgaTIZI5U1Tp6cW8y n5ucDx1V6s5jFNkXaoHO8YTybw/aVMRvzKdVTdBckZi8OzyRObG3OaR+tlQhNAzCquyx r9fXKGIm6BMwiF5HsSMYod0BHJ3hRiR94a8+jz8wTl5DCU59Ve5og2G+CGQ6UCm1YLd8 WSDA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=eTW/1VMfkzMwMPjWGGd7jbAIJeuoyoS6tmfznIaX0oI=; fh=T76h3w2ErbhRaTZqt9I2gPES9WSx2B+raUbkTdeo0Gk=; b=fMQk/zoY63i7ucRx8cid3HQ8j8tLCgtz2DAKiqbnWdYwCJGaNnyRZfHld/m8hwyY+0 m7nTKIhdvlrfJn8nqeEyiP8mxOP4ASO7shd0IZtI8PHFPWb4IuWtOKtL+BJAC/IO19yu JQcxA/y/yzCk2ZrnM+rw52h66Hda2WYY93ufB8UC7B2uTrRxOJqKx/7srAbKuGTsrIvG GmL6tJ5/I9VFD/Y/oGFyCNJ6d8M5Fkosq7srLMpW8049LhXCldSH413n7uUpwiAu8TPm xpAAAE2HogbmztMwueEhSY3FZd1HeqGfT7xj9XR/c478ae18LWY8QJumhsNHAkye+Q4X QCKw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EX3hjf6j; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113812-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113812-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id w5-20020a17090abc0500b0029de4312c58si10860666pjr.81.2024.03.24.22.25.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 22:25:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-113812-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EX3hjf6j; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113812-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113812-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id A040E28C083 for ; Mon, 25 Mar 2024 05:23:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CBD5F1FD115; Sun, 24 Mar 2024 23:02:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EX3hjf6j" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 59A441E6F5A; Sun, 24 Mar 2024 22:54:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320857; cv=none; b=nb7ynsoVXB6BiYbJuv0HJGcbCbxIK09t5SdSg2tEJf9sfWhmhkipeB8vC1ppVKqJhbyAkYFEjn4PXs0+wzFqwpYL05cGxylslHgDL5s1EMyGGuaz7ZczIELyZlazdGeNA50hAl+h0dSToyFXi72RECjIx6XMVN+Lbya22qNWV/Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320857; c=relaxed/simple; bh=NxVz+WguTMB6Coo2YUZwzcntSivhyOF+Rdca8TF9s9s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VfMNck0h5zP4YYeQaezEInvf4Iv7bgHVH+RsP6sgPm/QxaReP7O6gjum5ezBWaBmmsNzrfWH8bLV0SB6xpt/h40E2xBI4MGLWYNLsXtXPalsu+BjEPHHdPBBli0r6j3T/OfR1itaewqEaVveYGwLGCB2gyyveUA68+1wmpm++Ew= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EX3hjf6j; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85C92C433F1; Sun, 24 Mar 2024 22:54:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320856; bh=NxVz+WguTMB6Coo2YUZwzcntSivhyOF+Rdca8TF9s9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EX3hjf6jIMvbSHt383OCMIWBMGn/qWZZik2gV1LV/Pq9EmRvHlsAjM1FYnF9DYlz7 dq8hRkaL7/PZe6uXRKxCB58GMYokE3RAMYSeCauo75QzimDQMyCCkEIczO9YRYXd2P PfkQVaNqD8jIvzdegxfsgnmxRA6p7AuVhzbxQWKSTaUMIIK/h5n8VUEwuFNp5F6e/C o/tmJJaZZKYuqG1Oyx5CwvEE2Ytb6HI89qBMxHwkh8h2wQcvW2gJy7ZP8ADIZkdyCc GyDsRYr/Oc6vcJVP8uGOeJ8eV0fLvsQ0hGXiL/zU8VEuFhvhB69jHAQ9ecfacwTGEq Hl66bqQIwWswg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Krastev , Maaz Mombasawala , Zack Rusin , Sasha Levin Subject: [PATCH 6.7 420/713] drm/vmwgfx: Fix vmw_du_get_cursor_mob fencing of newly-created MOBs Date: Sun, 24 Mar 2024 18:42:26 -0400 Message-ID: <20240324224720.1345309-421-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Martin Krastev [ Upstream commit ed96cf7ad590989b009d6da5cd26387d995dac13 ] The fencing of MOB creation used in vmw_du_get_cursor_mob was incompatible with register-based device communication employed by this routine. As a result cursor MOB creation was racy, leading to potentially broken/missing mouse cursor on desktops using CursorMob device feature. Fixes: 53bc3f6fb6b3 ("drm/vmwgfx: Clean up cursor mobs") Signed-off-by: Martin Krastev Reviewed-by: Maaz Mombasawala Reviewed-by: Zack Rusin Signed-off-by: Zack Rusin Link: https://patchwork.freedesktop.org/patch/msgid/20240126200804.732454-5-zack.rusin@broadcom.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 818b7f109f538..b51578918cf8d 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -272,6 +272,7 @@ static int vmw_du_get_cursor_mob(struct vmw_cursor_plane *vcp, u32 size = vmw_du_cursor_mob_size(vps->base.crtc_w, vps->base.crtc_h); u32 i; u32 cursor_max_dim, mob_max_size; + struct vmw_fence_obj *fence = NULL; int ret; if (!dev_priv->has_mob || @@ -313,7 +314,15 @@ static int vmw_du_get_cursor_mob(struct vmw_cursor_plane *vcp, if (ret != 0) goto teardown; - vmw_bo_fence_single(&vps->cursor.bo->tbo, NULL); + ret = vmw_execbuf_fence_commands(NULL, dev_priv, &fence, NULL); + if (ret != 0) { + ttm_bo_unreserve(&vps->cursor.bo->tbo); + goto teardown; + } + + dma_fence_wait(&fence->base, false); + dma_fence_put(&fence->base); + ttm_bo_unreserve(&vps->cursor.bo->tbo); return 0; -- 2.43.0