Commit 26033424 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2024-06-07' of... 

Merge tag 'drm-misc-fixes-2024-06-07' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

drm-misc-fixes for v6.10-rc3:
- Robustness fixes for vmwgfx.
- Error check for of_drm_get_panel_orientation failing in
  sitronix-st7789v.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d5645d00-a8cf-47d9-a2a0-4ff55842fc7d@linux.intel.com
parents 2d421831 5703fc05

drivers/gpu/drm/panel/panel-sitronix-st7789v.c

+3 −1
Original line number Diff line number Diff line
@@ -643,7 +643,9 @@ static int st7789v_probe(struct spi_device *spi) 
	if (ret)

		return dev_err_probe(dev, ret, "Failed to get backlight\n");



	of_drm_get_panel_orientation(spi->dev.of_node, &ctx->orientation);

	ret = of_drm_get_panel_orientation(spi->dev.of_node, &ctx->orientation);

	if (ret)

		return dev_err_probe(&spi->dev, ret, "Failed to get orientation\n");



	drm_panel_add(&ctx->panel);

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+6 −13
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ static int vmw_setup_pci_resources(struct vmw_private *dev, 
		dev->vram_size = pci_resource_len(pdev, 2);



		drm_info(&dev->drm,

			"Register MMIO at 0x%pa size is %llu kiB\n",

			"Register MMIO at 0x%pa size is %llu KiB\n",

			 &rmmio_start, (uint64_t)rmmio_size / 1024);

		dev->rmmio = devm_ioremap(dev->drm.dev,

					  rmmio_start,
@@ -765,7 +765,7 @@ static int vmw_setup_pci_resources(struct vmw_private *dev, 
		fifo_size = pci_resource_len(pdev, 2);



		drm_info(&dev->drm,

			 "FIFO at %pa size is %llu kiB\n",

			 "FIFO at %pa size is %llu KiB\n",

			 &fifo_start, (uint64_t)fifo_size / 1024);

		dev->fifo_mem = devm_memremap(dev->drm.dev,

					      fifo_start,
@@ -790,7 +790,7 @@ static int vmw_setup_pci_resources(struct vmw_private *dev, 
	 * SVGA_REG_VRAM_SIZE.

	 */

	drm_info(&dev->drm,

		 "VRAM at %pa size is %llu kiB\n",

		 "VRAM at %pa size is %llu KiB\n",

		 &dev->vram_start, (uint64_t)dev->vram_size / 1024);



	return 0;
@@ -960,13 +960,6 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id) 
				vmw_read(dev_priv,

					 SVGA_REG_SUGGESTED_GBOBJECT_MEM_SIZE_KB);



		/*

		 * Workaround for low memory 2D VMs to compensate for the

		 * allocation taken by fbdev

		 */

		if (!(dev_priv->capabilities & SVGA_CAP_3D))

			mem_size *= 3;



		dev_priv->max_mob_pages = mem_size * 1024 / PAGE_SIZE;

		dev_priv->max_primary_mem =

			vmw_read(dev_priv, SVGA_REG_MAX_PRIMARY_MEM);
@@ -991,13 +984,13 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id) 
		dev_priv->max_primary_mem = dev_priv->vram_size;

	}

	drm_info(&dev_priv->drm,

		 "Legacy memory limits: VRAM = %llu kB, FIFO = %llu kB, surface = %u kB\n",

		 "Legacy memory limits: VRAM = %llu KiB, FIFO = %llu KiB, surface = %u KiB\n",

		 (u64)dev_priv->vram_size / 1024,

		 (u64)dev_priv->fifo_mem_size / 1024,

		 dev_priv->memory_size / 1024);



	drm_info(&dev_priv->drm,

		 "MOB limits: max mob size = %u kB, max mob pages = %u\n",

		 "MOB limits: max mob size = %u KiB, max mob pages = %u\n",

		 dev_priv->max_mob_size / 1024, dev_priv->max_mob_pages);



	ret = vmw_dma_masks(dev_priv);
@@ -1015,7 +1008,7 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id) 
			 (unsigned)dev_priv->max_gmr_pages);

	}

	drm_info(&dev_priv->drm,

		 "Maximum display memory size is %llu kiB\n",

		 "Maximum display memory size is %llu KiB\n",

		 (uint64_t)dev_priv->max_primary_mem / 1024);



	/* Need mmio memory to check for fifo pitchlock cap. */

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+0 −3
Original line number Diff line number Diff line
@@ -1043,9 +1043,6 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf, 
int vmw_kms_write_svga(struct vmw_private *vmw_priv,

		       unsigned width, unsigned height, unsigned pitch,

		       unsigned bpp, unsigned depth);

bool vmw_kms_validate_mode_vram(struct vmw_private *dev_priv,

				uint32_t pitch,

				uint32_t height);

int vmw_kms_present(struct vmw_private *dev_priv,

		    struct drm_file *file_priv,

		    struct vmw_framebuffer *vfb,

drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c

+2 −2
Original line number Diff line number Diff line
@@ -94,14 +94,14 @@ static int vmw_gmrid_man_get_node(struct ttm_resource_manager *man, 
			} else

				new_max_pages = gman->max_gmr_pages * 2;

			if (new_max_pages > gman->max_gmr_pages && new_max_pages >= gman->used_gmr_pages) {

				DRM_WARN("vmwgfx: increasing guest mob limits to %u kB.\n",

				DRM_WARN("vmwgfx: increasing guest mob limits to %u KiB.\n",

					 ((new_max_pages) << (PAGE_SHIFT - 10)));



				gman->max_gmr_pages = new_max_pages;

			} else {

				char buf[256];

				snprintf(buf, sizeof(buf),

					 "vmwgfx, error: guest graphics is out of memory (mob limit at: %ukB).\n",

					 "vmwgfx, error: guest graphics is out of memory (mob limit at: %u KiB).\n",

					 ((gman->max_gmr_pages) << (PAGE_SHIFT - 10)));

				vmw_host_printf(buf);

				DRM_WARN("%s", buf);

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+10 −18
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static bool vmw_du_cursor_plane_has_changed(struct vmw_plane_state *old_vps, 
	new_image = vmw_du_cursor_plane_acquire_image(new_vps);



	changed = false;

	if (old_image && new_image)

	if (old_image && new_image && old_image != new_image)

		changed = memcmp(old_image, new_image, size) != 0;



	return changed;
@@ -2171,13 +2171,12 @@ int vmw_kms_write_svga(struct vmw_private *vmw_priv, 
	return 0;

}



static

bool vmw_kms_validate_mode_vram(struct vmw_private *dev_priv,

				uint32_t pitch,

				uint32_t height)

				u64 pitch,

				u64 height)

{

	return ((u64) pitch * (u64) height) < (u64)

		((dev_priv->active_display_unit == vmw_du_screen_target) ?

		 dev_priv->max_primary_mem : dev_priv->vram_size);

	return (pitch * height) < (u64)dev_priv->vram_size;

}



/**
@@ -2873,25 +2872,18 @@ int vmw_du_helper_plane_update(struct vmw_du_update_plane *update) 
enum drm_mode_status vmw_connector_mode_valid(struct drm_connector *connector,

					      struct drm_display_mode *mode)

{

	enum drm_mode_status ret;

	struct drm_device *dev = connector->dev;

	struct vmw_private *dev_priv = vmw_priv(dev);

	u32 max_width = dev_priv->texture_max_width;

	u32 max_height = dev_priv->texture_max_height;

	u32 assumed_cpp = 4;



	if (dev_priv->assume_16bpp)

		assumed_cpp = 2;



	if (dev_priv->active_display_unit == vmw_du_screen_target) {

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

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

	}



	if (max_width < mode->hdisplay)

		return MODE_BAD_HVALUE;



	if (max_height < mode->vdisplay)

		return MODE_BAD_VVALUE;

	ret = drm_mode_validate_size(mode, dev_priv->texture_max_width,

				     dev_priv->texture_max_height);

	if (ret != MODE_OK)

		return ret;



	if (!vmw_kms_validate_mode_vram(dev_priv,

					mode->hdisplay * assumed_cpp,