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

Commit 618cc151 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'vmwgfx-fixes-4.19' of git://people.freedesktop.org/~thomash/linux into drm-fixes 



A couple of modesetting fixes and a fix for a long-standing buffer-eviction
problem cc'd stable.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Thomas Hellstrom <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180920063935.35492-1-thellstrom@vmware.com
parents 8ca4fff9 e71cf591

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

+1 −1
Original line number Diff line number Diff line
@@ -3729,7 +3729,7 @@ int vmw_validate_single_buffer(struct vmw_private *dev_priv, 
{

	struct vmw_buffer_object *vbo =

		container_of(bo, struct vmw_buffer_object, base);

	struct ttm_operation_ctx ctx = { interruptible, true };

	struct ttm_operation_ctx ctx = { interruptible, false };

	int ret;



	if (vbo->pin_count > 0)

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+30 −12
Original line number Diff line number Diff line
@@ -1512,21 +1512,19 @@ static int vmw_kms_check_display_memory(struct drm_device *dev, 
					struct drm_rect *rects)

{

	struct vmw_private *dev_priv = vmw_priv(dev);

	struct drm_mode_config *mode_config = &dev->mode_config;

	struct drm_rect bounding_box = {0};

	u64 total_pixels = 0, pixel_mem, bb_mem;

	int i;



	for (i = 0; i < num_rects; i++) {

		/*

		 * Currently this check is limiting the topology within max

		 * texture/screentarget size. This should change in future when

		 * user-space support multiple fb with topology.

		 * For STDU only individual screen (screen target) is limited by

		 * SCREENTARGET_MAX_WIDTH/HEIGHT registers.

		 */

		if (rects[i].x1 < 0 ||  rects[i].y1 < 0 ||

		    rects[i].x2 > mode_config->max_width ||

		    rects[i].y2 > mode_config->max_height) {

			DRM_ERROR("Invalid GUI layout.\n");

		if (dev_priv->active_display_unit == vmw_du_screen_target &&

		    (drm_rect_width(&rects[i]) > dev_priv->stdu_max_width ||

		     drm_rect_height(&rects[i]) > dev_priv->stdu_max_height)) {

			DRM_ERROR("Screen size not supported.\n");

			return -EINVAL;

		}
@@ -1615,7 +1613,7 @@ static int vmw_kms_check_topology(struct drm_device *dev, 
		struct drm_connector_state *conn_state;

		struct vmw_connector_state *vmw_conn_state;



		if (!new_crtc_state->enable && old_crtc_state->enable) {

		if (!new_crtc_state->enable) {

			rects[i].x1 = 0;

			rects[i].y1 = 0;

			rects[i].x2 = 0;
@@ -2216,12 +2214,16 @@ int vmw_du_connector_fill_modes(struct drm_connector *connector, 
	if (dev_priv->assume_16bpp)

		assumed_bpp = 2;



	if (dev_priv->active_display_unit == vmw_du_screen_target) {

		max_width  = min(max_width,  dev_priv->stdu_max_width);

	max_width  = min(max_width,  dev_priv->texture_max_width);

	max_height = min(max_height, dev_priv->texture_max_height);



	/*

	 * For STDU extra limit for a mode on SVGA_REG_SCREENTARGET_MAX_WIDTH/

	 * HEIGHT registers.

	 */

	if (dev_priv->active_display_unit == vmw_du_screen_target) {

		max_width  = min(max_width,  dev_priv->stdu_max_width);

		max_height = min(max_height, dev_priv->stdu_max_height);

		max_height = min(max_height, dev_priv->texture_max_height);

	}



	/* Add preferred mode */
@@ -2376,6 +2378,7 @@ int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data, 
				struct drm_file *file_priv)

{

	struct vmw_private *dev_priv = vmw_priv(dev);

	struct drm_mode_config *mode_config = &dev->mode_config;

	struct drm_vmw_update_layout_arg *arg =

		(struct drm_vmw_update_layout_arg *)data;

	void __user *user_rects;
@@ -2421,6 +2424,21 @@ int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data, 
		drm_rects[i].y1 = curr_rect.y;

		drm_rects[i].x2 = curr_rect.x + curr_rect.w;

		drm_rects[i].y2 = curr_rect.y + curr_rect.h;



		/*

		 * Currently this check is limiting the topology within

		 * mode_config->max (which actually is max texture size

		 * supported by virtual device). This limit is here to address

		 * window managers that create a big framebuffer for whole

		 * topology.

		 */

		if (drm_rects[i].x1 < 0 ||  drm_rects[i].y1 < 0 ||

		    drm_rects[i].x2 > mode_config->max_width ||

		    drm_rects[i].y2 > mode_config->max_height) {

			DRM_ERROR("Invalid GUI layout.\n");

			ret = -EINVAL;

			goto out_free;

		}

	}



	ret = vmw_kms_check_display_memory(dev, arg->num_outputs, drm_rects);

drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c

+0 −25
Original line number Diff line number Diff line
@@ -1600,31 +1600,6 @@ int vmw_kms_stdu_init_display(struct vmw_private *dev_priv) 


	dev_priv->active_display_unit = vmw_du_screen_target;



	if (dev_priv->capabilities & SVGA_CAP_3D) {

		/*

		 * For 3D VMs, display (scanout) buffer size is the smaller of

		 * max texture and max STDU

		 */

		uint32_t max_width, max_height;



		max_width = min(dev_priv->texture_max_width,

				dev_priv->stdu_max_width);

		max_height = min(dev_priv->texture_max_height,

				 dev_priv->stdu_max_height);



		dev->mode_config.max_width = max_width;

		dev->mode_config.max_height = max_height;

	} else {

		/*

		 * Given various display aspect ratios, there's no way to

		 * estimate these using prim_bb_mem.  So just set these to

		 * something arbitrarily large and we will reject any layout

		 * that doesn't fit prim_bb_mem later

		 */

		dev->mode_config.max_width = 8192;

		dev->mode_config.max_height = 8192;

	}



	vmw_kms_create_implicit_placement_property(dev_priv, false);



	for (i = 0; i < VMWGFX_NUM_DISPLAY_UNITS; ++i) {

drivers/gpu/drm/vmwgfx/vmwgfx_surface.c

+14 −10
Original line number Diff line number Diff line
@@ -1404,22 +1404,17 @@ int vmw_surface_gb_priv_define(struct drm_device *dev, 
	*srf_out = NULL;



	if (for_scanout) {

		uint32_t max_width, max_height;



		if (!svga3dsurface_is_screen_target_format(format)) {

			DRM_ERROR("Invalid Screen Target surface format.");

			return -EINVAL;

		}



		max_width = min(dev_priv->texture_max_width,

				dev_priv->stdu_max_width);

		max_height = min(dev_priv->texture_max_height,

				 dev_priv->stdu_max_height);



		if (size.width > max_width || size.height > max_height) {

		if (size.width > dev_priv->texture_max_width ||

		    size.height > dev_priv->texture_max_height) {

			DRM_ERROR("%ux%u\n, exceeds max surface size %ux%u",

				  size.width, size.height,

				  max_width, max_height);

				  dev_priv->texture_max_width,

				  dev_priv->texture_max_height);

			return -EINVAL;

		}

	} else {
@@ -1495,8 +1490,17 @@ int vmw_surface_gb_priv_define(struct drm_device *dev, 
	if (srf->flags & SVGA3D_SURFACE_BIND_STREAM_OUTPUT)

		srf->res.backup_size += sizeof(SVGA3dDXSOState);



	/*

	 * Don't set SVGA3D_SURFACE_SCREENTARGET flag for a scanout surface with

	 * size greater than STDU max width/height. This is really a workaround

	 * to support creation of big framebuffer requested by some user-space

	 * for whole topology. That big framebuffer won't really be used for

	 * binding with screen target as during prepare_fb a separate surface is

	 * created so it's safe to ignore SVGA3D_SURFACE_SCREENTARGET flag.

	 */

	if (dev_priv->active_display_unit == vmw_du_screen_target &&

	    for_scanout)

	    for_scanout && size.width <= dev_priv->stdu_max_width &&

	    size.height <= dev_priv->stdu_max_height)

		srf->flags |= SVGA3D_SURFACE_SCREENTARGET;



	/*