Merge branch 'vmwgfx-fixes-5.8' of git://people.freedesktop.org/~sroland/linux into drm-fixes (8257a0d9) · Commits · 戴 / test

fix for black screens Signed-off-by:

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;