From mboxrd@z Thu Jan 1 00:00:00 1970 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 830003AB27F; Mon, 23 Mar 2026 14:00:02 +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=1774274402; cv=none; b=BAi0OnQ0sWv+SiEa1gQeVlVIzEJs71UpG3WYc+1GaYMP2jvT2d0ZQEi1afwhG1fzuhx4LHWDnI7xVpQ7NX5Uk9M4aiuUvC2Vv+sqzayvvzrqH3yaa/jgUndts809PwygXMptAktJPAdj/aDmUzcqNeEBiYvBMKladrtyE9vE6pg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774274402; c=relaxed/simple; bh=UzvTfDE88vnBKsv+w89wHweCGhssCNnxYW17lTHJbZ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GwfvCJqm5u89pfaSfgp2f8yYm/hLgBV4k9vc4y5yTUrQX/r3ukwDUyAytVjXmcbdH0pqSZ1C1xMCPLMl8Qtq/BbSqER3PnjhjvnpfpVsGUkWg9B6EsFx6AV7cUyvmezFcrM/19nr8kNKEdbpcNpoEUDoRiG0DUiAjLAWOYxDCXQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LskZTgEs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LskZTgEs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A42ABC2BCB6; Mon, 23 Mar 2026 14:00:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774274402; bh=UzvTfDE88vnBKsv+w89wHweCGhssCNnxYW17lTHJbZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LskZTgEs2S8pA26uEsn+FIKBkQc4A7oR5kIltt+cr+GSGyanLNUeQPpittIrHloXh x5l3vQ4fOr2QAjEuAQNLbSafjX0/CfNOO1XPLpn3uYfXQCslK7buN9Qzn31YrnfXnB RjDbhaN3LTq9+KMk3e/kHTcLd30SsoyGk2L6q9CA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Mika=20Penttil=C3=A4?= , Ian Forbes , Maaz Mombasawala , Zack Rusin , Sasha Levin Subject: [PATCH 6.19 205/220] drm/vmwgfx: Dont overwrite KMS surface dirty tracker Date: Mon, 23 Mar 2026 14:46:22 +0100 Message-ID: <20260323134511.045663705@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134504.575022936@linuxfoundation.org> References: <20260323134504.575022936@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Forbes [ Upstream commit c6cb77c474a32265e21c4871c7992468bf5e7638 ] We were overwriting the surface's dirty tracker here causing a memory leak. Reported-by: Mika Penttilä Closes: https://lore.kernel.org/dri-devel/8c53f3c6-c6de-46fe-a8ca-d98dd52b3abe@redhat.com/ Fixes: 965544150d1c ("drm/vmwgfx: Refactor cursor handling") Signed-off-by: Ian Forbes Reviewed-by: Maaz Mombasawala Signed-off-by: Zack Rusin Link: https://patch.msgid.link/20260302200330.66763-1-ian.forbes@broadcom.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index bc51b5d55e38a..35c7277521a90 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -771,7 +771,8 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev, ret = vmw_bo_dirty_add(bo); if (!ret && surface && surface->res.func->dirty_alloc) { surface->res.coherent = true; - ret = surface->res.func->dirty_alloc(&surface->res); + if (surface->res.dirty == NULL) + ret = surface->res.func->dirty_alloc(&surface->res); } ttm_bo_unreserve(&bo->tbo); } -- 2.51.0