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 6CAB25228; Wed, 5 Feb 2025 14:01:13 +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=1738764073; cv=none; b=Da/kY5VeYCzpKr528ITydOawxWZ1W4jqzyfNrnlGmEh0Y0pg7ywEn5XNFQzkHzK9KhJML9fyrxjHYVAquL2WWvoj2ukt8Sr9bpRQxtmaFQNryPfmPoJKo1mb4NIExNPXq5oBzGcTzh/OATX+EuNIXtfy+Xs7H2PMRORiu9cy0N4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738764073; c=relaxed/simple; bh=dn0plMn5LyOeb9Aez2DXg8rIGlDBsJpcC5V5V7e1DnU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=diz3CW6WB5ZiuuXIcaJUk5rHfI59qBRN1a0S6mf0q1AFjpijYQBTxAnhvTvkmCxubfnP09H4JbtSXWgVreTUggUrHLzB890ltecJdg21ZcTjhZNWq2z6jx1UBFpzQTG4lUApvCpQOOqjfBNyOD/ZgtqJZRF0BR8NpBRPCPsfINM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=p5RiIM5z; 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="p5RiIM5z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF204C4CEDD; Wed, 5 Feb 2025 14:01:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738764073; bh=dn0plMn5LyOeb9Aez2DXg8rIGlDBsJpcC5V5V7e1DnU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p5RiIM5zr2LIaxNgJv+PghN4nAo2NCvm3p1G2CBijzMGEJOpoYvk7x7aNFhMh+SCT FTlT9cUYQfOAjLq0AiNwZgwzW+K+N1tVS5XC90gnFr5ozOf6yxhwph+E8AyNHvzzVy wMCENC7O/8dGLEWeWIfvKxLAQi6veU4ffIwtKevY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sui Jingfeng , Lucas Stach , Sasha Levin Subject: [PATCH 6.13 045/623] drm/etnaviv: Fix page property being used for non writecombine buffers Date: Wed, 5 Feb 2025 14:36:27 +0100 Message-ID: <20250205134457.953974377@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134456.221272033@linuxfoundation.org> References: <20250205134456.221272033@linuxfoundation.org> User-Agent: quilt/0.68 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-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sui Jingfeng [ Upstream commit 834f304192834d6f0941954f3277ae0ba11a9a86 ] In the etnaviv_gem_vmap_impl() function, the driver vmap whatever buffers with write combine(WC) page property, this is incorrect. Cached buffers should be mapped with the cached page property and uncached buffers should be mapped with the uncached page property. Fixes: a0a5ab3e99b8 ("drm/etnaviv: call correct function when trying to vmap a DMABUF") Signed-off-by: Sui Jingfeng Signed-off-by: Lucas Stach Signed-off-by: Sasha Levin --- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index 16473c371444c..da30179de02b5 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -342,6 +342,7 @@ void *etnaviv_gem_vmap(struct drm_gem_object *obj) static void *etnaviv_gem_vmap_impl(struct etnaviv_gem_object *obj) { struct page **pages; + pgprot_t prot; lockdep_assert_held(&obj->lock); @@ -349,8 +350,19 @@ static void *etnaviv_gem_vmap_impl(struct etnaviv_gem_object *obj) if (IS_ERR(pages)) return NULL; - return vmap(pages, obj->base.size >> PAGE_SHIFT, - VM_MAP, pgprot_writecombine(PAGE_KERNEL)); + switch (obj->flags & ETNA_BO_CACHE_MASK) { + case ETNA_BO_CACHED: + prot = PAGE_KERNEL; + break; + case ETNA_BO_UNCACHED: + prot = pgprot_noncached(PAGE_KERNEL); + break; + case ETNA_BO_WC: + default: + prot = pgprot_writecombine(PAGE_KERNEL); + } + + return vmap(pages, obj->base.size >> PAGE_SHIFT, VM_MAP, prot); } static inline enum dma_data_direction etnaviv_op_to_dma_dir(u32 op) -- 2.39.5