Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amdgpu: force fbdev into vram" failed to apply to 4.19-stable tree

PATCH [email protected] 1 participant 1 message May 18, 2020

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From a6aacb2b26e85aa619cf0c6f98d0ca77314cd2a1 Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Tue, 5 May 2020 09:42:26 -0400
Subject: [PATCH] drm/amdgpu: force fbdev into vram
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We set the fb smem pointer to the offset into the BAR, so keep the fbdev bo in vram.

Fixes 6c8d74caa2fa33 ("drm/amdgpu: Enable scatter gather display support")
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +1 -2
index 9ae7b61f696a..25ddb482466a 100644
@@ -133,8 +133,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,
 	u32 cpp;
 	u64 flags = AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
 			       AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS     |
-			       AMDGPU_GEM_CREATE_VRAM_CLEARED 	     |
-			       AMDGPU_GEM_CREATE_CPU_GTT_USWC;
+			       AMDGPU_GEM_CREATE_VRAM_CLEARED;
 
 	info = drm_get_format_info(adev->ddev, mode_cmd);
 	cpp = info->cpp[0];