drm/vmwgfx: fix update of display surface when resolution changes (1f054fd2) · Commits · 戴 / test

The assignment of metadata overwrote the new display resolution values, hence we'd miss the size actually changed and wouldn't redefine the surface. This would then lead to command buffer error when trying to update the screen target (due to the size mismatch), and result in a VM with black screen. Fixes: ("drm/vmwgfx: Refactor surface_define to use vmw_surface_metadata") Reviewed-by:

Charmaine Lee <charmainel@vmware.com> Signed-off-by:

Roland Scheidegger <sroland@vmware.com> Cc: stable@vger.kernel.org

drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1069,10 +1069,6 @@ vmw_stdu_primary_plane_prepare_fb(struct drm_plane *plane,
		if (new_content_type != SAME_AS_DISPLAY) {
		struct vmw_surface_metadata metadata = {0};

		metadata.base_size.width = hdisplay;
		metadata.base_size.height = vdisplay;
		metadata.base_size.depth = 1;

		/*
		* If content buffer is a buffer object, then we have to
		* construct surface info
		@@ -1104,6 +1100,10 @@ vmw_stdu_primary_plane_prepare_fb(struct drm_plane *plane,
		metadata = new_vfbs->surface->metadata;
		}

		metadata.base_size.width = hdisplay;
		metadata.base_size.height = vdisplay;
		metadata.base_size.depth = 1;

		if (vps->surf) {
		struct drm_vmw_size cur_base_size =
		vps->surf->metadata.base_size;

Admin message