Skip to content

Commit 5d44346

Browse files
author
CKI KWF Bot
committed
Merge: drm/vmwgfx: Fix guests running with TDX/SEV
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1320 JIRA: https://issues.redhat.com/browse/RHEL-101642 Commit 81256a5 ("x86/mm: Make memremap(MEMREMAP_WB) map memory as encrypted by default") changed the default behavior of memremap(MEMREMAP_WB) and started mapping memory as encrypted. The driver requires the fifo memory to be decrypted to communicate with the host but was relaying on the old default behavior of memremap(MEMREMAP_WB) and thus broke. Fix it by explicitly specifying the desired behavior and passing MEMREMAP_DEC to memremap. Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com> Approved-by: Mika Penttilä <mpenttil@redhat.com> Approved-by: José Expósito <jexposit@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 7a87352 + 2b250d0 commit 5d44346

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ static int vmw_setup_pci_resources(struct vmw_private *dev,
769769
dev->fifo_mem = devm_memremap(dev->drm.dev,
770770
fifo_start,
771771
fifo_size,
772-
MEMREMAP_WB);
772+
MEMREMAP_WB | MEMREMAP_DEC);
773773

774774
if (IS_ERR(dev->fifo_mem)) {
775775
drm_err(&dev->drm,

0 commit comments

Comments
 (0)