Commit 8ba371c7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2023-08-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Multiple fixes for nouveau around memory safety and DisplayPort, one fix
to reduce the log level of rockchip, a power state fix for the it6505
bridge, a timing fix for the lt9611 bridge, a cache maintenance fix for
ivpu and one to reset vma->vm_ops on mmap for shmem-helper.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fwed6gzdtkse5ocrgd37elhyw7qirfptsvfp5mqqverdzifhxj@4da3vesxcqp2
parents 52a93d39 07dd476f

drivers/accel/ivpu/ivpu_gem.c

+8 −0
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ static void internal_free_pages_locked(struct ivpu_bo *bo) 
{

	unsigned int i, npages = bo->base.size >> PAGE_SHIFT;



	if (ivpu_bo_cache_mode(bo) != DRM_IVPU_BO_CACHED)

		set_pages_array_wb(bo->pages, bo->base.size >> PAGE_SHIFT);



	for (i = 0; i < npages; i++)

		put_page(bo->pages[i]);
@@ -587,6 +590,11 @@ ivpu_bo_alloc_internal(struct ivpu_device *vdev, u64 vpu_addr, u64 size, u32 fla 
	if (ivpu_bo_cache_mode(bo) != DRM_IVPU_BO_CACHED)

		drm_clflush_pages(bo->pages, bo->base.size >> PAGE_SHIFT);



	if (bo->flags & DRM_IVPU_BO_WC)

		set_pages_array_wc(bo->pages, bo->base.size >> PAGE_SHIFT);

	else if (bo->flags & DRM_IVPU_BO_UNCACHED)

		set_pages_array_uc(bo->pages, bo->base.size >> PAGE_SHIFT);



	prot = ivpu_bo_pgprot(bo, PAGE_KERNEL);

	bo->kvaddr = vmap(bo->pages, bo->base.size >> PAGE_SHIFT, VM_MAP, prot);

	if (!bo->kvaddr) {

drivers/gpu/drm/bridge/ite-it6505.c

+3 −1
Original line number Diff line number Diff line
@@ -2517,9 +2517,11 @@ static irqreturn_t it6505_int_threaded_handler(int unused, void *data) 
	};

	int int_status[3], i;



	if (it6505->enable_drv_hold || pm_runtime_get_if_in_use(dev) <= 0)

	if (it6505->enable_drv_hold || !it6505->powered)

		return IRQ_HANDLED;



	pm_runtime_get_sync(dev);



	int_status[0] = it6505_read(it6505, INT_STATUS_01);

	int_status[1] = it6505_read(it6505, INT_STATUS_02);

	int_status[2] = it6505_read(it6505, INT_STATUS_03);

drivers/gpu/drm/bridge/lontium-lt9611.c

+1 −3
Original line number Diff line number Diff line
@@ -774,9 +774,7 @@ static struct mipi_dsi_device *lt9611_attach_dsi(struct lt9611 *lt9611, 
	dsi->lanes = 4;

	dsi->format = MIPI_DSI_FMT_RGB888;

	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE |

			  MIPI_DSI_MODE_VIDEO_HSE | MIPI_DSI_MODE_VIDEO_NO_HSA |

			  MIPI_DSI_MODE_VIDEO_NO_HFP | MIPI_DSI_MODE_VIDEO_NO_HBP |

			  MIPI_DSI_MODE_NO_EOT_PACKET;

			  MIPI_DSI_MODE_VIDEO_HSE;



	ret = devm_mipi_dsi_attach(dev, dsi);

	if (ret < 0) {

drivers/gpu/drm/drm_gem_shmem_helper.c

+6 −0
Original line number Diff line number Diff line
@@ -623,7 +623,13 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct 
	int ret;



	if (obj->import_attach) {

		/* Reset both vm_ops and vm_private_data, so we don't end up with

		 * vm_ops pointing to our implementation if the dma-buf backend

		 * doesn't set those fields.

		 */

		vma->vm_private_data = NULL;

		vma->vm_ops = NULL;



		ret = dma_buf_mmap(obj->dma_buf, vma, 0);



		/* Drop the reference drm_gem_mmap_obj() acquired.*/

drivers/gpu/drm/nouveau/nouveau_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -967,7 +967,7 @@ nouveau_connector_get_modes(struct drm_connector *connector) 
	/* Determine display colour depth for everything except LVDS now,

	 * DP requires this before mode_valid() is called.

	 */

	if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS && nv_connector->native_mode)

	if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS)

		nouveau_connector_detect_depth(connector);



	/* Find the native mode if this is a digital panel, if we didn't