Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bef23f9 authored by Michel Dänzer's avatar Michel Dänzer Committed by Dave Airlie
Browse files

vmwgfx: Print error diagnostics if depth doesn't match the host expectation 



Signed-off-by: default avatarMichel Dänzer <daenzer@vmware.com>
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 6558429b

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf, 
			  struct ttm_object_file *tfile,

			  struct ttm_buffer_object *bo,

			  SVGA3dCmdHeader *header);

void vmw_kms_write_svga(struct vmw_private *vmw_priv,

int vmw_kms_write_svga(struct vmw_private *vmw_priv,

		       unsigned width, unsigned height, unsigned pitch,

		       unsigned bpp, unsigned depth);

int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data,

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

+7 −3
Original line number Diff line number Diff line
@@ -158,10 +158,14 @@ static int vmw_fb_set_par(struct fb_info *info) 
{

	struct vmw_fb_par *par = info->par;

	struct vmw_private *vmw_priv = par->vmw_priv;

	int ret;



	vmw_kms_write_svga(vmw_priv, info->var.xres, info->var.yres,

	ret = vmw_kms_write_svga(vmw_priv, info->var.xres, info->var.yres,

				 info->fix.line_length,

				 par->bpp, par->depth);

	if (ret)

		return ret;



	if (vmw_priv->capabilities & SVGA_CAP_DISPLAY_TOPOLOGY) {

		/* TODO check if pitch and offset changes */

		vmw_write(vmw_priv, SVGA_REG_NUM_GUEST_DISPLAYS, 1);

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+9 −1
Original line number Diff line number Diff line
@@ -990,7 +990,7 @@ int vmw_kms_cursor_bypass_ioctl(struct drm_device *dev, void *data, 
	return ret;

}



void vmw_kms_write_svga(struct vmw_private *vmw_priv,

int vmw_kms_write_svga(struct vmw_private *vmw_priv,

			unsigned width, unsigned height, unsigned pitch,

			unsigned bpp, unsigned depth)

{
@@ -1001,6 +1001,14 @@ void vmw_kms_write_svga(struct vmw_private *vmw_priv, 
	vmw_write(vmw_priv, SVGA_REG_WIDTH, width);

	vmw_write(vmw_priv, SVGA_REG_HEIGHT, height);

	vmw_write(vmw_priv, SVGA_REG_BITS_PER_PIXEL, bpp);



	if (vmw_read(vmw_priv, SVGA_REG_DEPTH) != depth) {

		DRM_ERROR("Invalid depth %u for %u bpp, host expects %u\n",

			  depth, bpp, vmw_read(vmw_priv, SVGA_REG_DEPTH));

		return -EINVAL;

	}



	return 0;

}



int vmw_kms_save_vga(struct vmw_private *vmw_priv)

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

+4 −10
Original line number Diff line number Diff line
@@ -123,10 +123,8 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv) 
			return 0;

		fb = entry->base.crtc.fb;



		vmw_kms_write_svga(dev_priv, w, h, fb->pitch,

		return vmw_kms_write_svga(dev_priv, w, h, fb->pitch,

					  fb->bits_per_pixel, fb->depth);



		return 0;

	}



	if (!list_empty(&lds->active)) {
@@ -274,9 +272,7 @@ static int vmw_ldu_crtc_set_config(struct drm_mode_set *set) 


		vmw_ldu_del_active(dev_priv, ldu);



		vmw_ldu_commit_list(dev_priv);



		return 0;

		return vmw_ldu_commit_list(dev_priv);

	}
@@ -301,9 +297,7 @@ static int vmw_ldu_crtc_set_config(struct drm_mode_set *set) 


	vmw_ldu_add_active(dev_priv, ldu, vfb);



	vmw_ldu_commit_list(dev_priv);



	return 0;

	return vmw_ldu_commit_list(dev_priv);

}



static struct drm_crtc_funcs vmw_legacy_crtc_funcs = {