Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/vmwgfx: Set dmabuf_size when vmw_dmabuf_init is" failed to apply to 4.14-stable tree

PATCH [email protected] 1 participant 1 message May 20, 2018

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-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 ------------------

Quoted 1 line

From 91ba9f28a3de97761c2b5fd5df5d88421268e507 Mon Sep 17 00:00:00 2001

From: Deepak Rawat <[email protected]>
Date: Tue, 15 May 2018 15:39:09 +0200
Subject: [PATCH] drm/vmwgfx: Set dmabuf_size when vmw_dmabuf_init is
successful

SOU primary plane prepare_fb hook depends upon dmabuf_size to pin up BO (and not call a new vmw_dmabuf_init) when a new fb size is same as current fb. This was changed in a recent commit which is causing page_flip to fail on VM with low display memory and multi-mon failure when cycle monitors from secondary display.

Cc <[email protected]> # 4.14, 4.16
Fixes 20fb5a635a0c ("drm/vmwgfx: Unpin the screen object backup buffer when not used")
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +2 -0
index 648f8127f65a..3d667e903beb 100644
@@ -482,6 +482,8 @@ vmw_sou_primary_plane_prepare_fb(struct drm_plane *plane,
 		return ret;
 	}
 
+	vps->dmabuf_size = size;
+
 	/*
 	 * TTM already thinks the buffer is pinned, but make sure the
 	 * pin_count is upped.