Commit 2e41a669 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2021-07-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Short summary of fixes pull:

 * Return -ENOTTY for non-DRM ioctls
 * amdgpu: Fix COW checks
 * nouveau: init BO GME fields
 * panel: Avoid double free
 * ttm: Fix refcounting in ttm_global_init(); NULL checks
 * vc4: Fix interrupt handling

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YPlbkmH6S4VAHP9j@linux-uq9g.fritz.box
parents 36ebaeb4 7bbcb919

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+9 −0
Original line number Diff line number Diff line
@@ -255,6 +255,15 @@ static int amdgpu_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_str 
	if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)

		return -EPERM;



	/* Workaround for Thunk bug creating PROT_NONE,MAP_PRIVATE mappings

	 * for debugger access to invisible VRAM. Should have used MAP_SHARED

	 * instead. Clearing VM_MAYWRITE prevents the mapping from ever

	 * becoming writable and makes is_cow_mapping(vm_flags) false.

	 */

	if (is_cow_mapping(vma->vm_flags) &&

	    !(vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)))

		vma->vm_flags &= ~VM_MAYWRITE;



	return drm_gem_ttm_mmap(obj, vma);

}

drivers/gpu/drm/drm_ioctl.c

+3 −0
Original line number Diff line number Diff line
@@ -834,6 +834,9 @@ long drm_ioctl(struct file *filp, 
	if (drm_dev_is_unplugged(dev))

		return -ENODEV;



       if (DRM_IOCTL_TYPE(cmd) != DRM_IOCTL_BASE)

               return -ENOTTY;



	is_driver_ioctl = nr >= DRM_COMMAND_BASE && nr < DRM_COMMAND_END;



	if (is_driver_ioctl) {

drivers/gpu/drm/nouveau/nouveau_bo.c

+6 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ nouveau_bo_del_ttm(struct ttm_buffer_object *bo) 
	 */

	if (bo->base.dev)

		drm_gem_object_release(&bo->base);

	else

		dma_resv_fini(&bo->base._resv);



	kfree(nvbo);

}
@@ -330,6 +332,10 @@ nouveau_bo_new(struct nouveau_cli *cli, u64 size, int align, 
	if (IS_ERR(nvbo))

		return PTR_ERR(nvbo);



	nvbo->bo.base.size = size;

	dma_resv_init(&nvbo->bo.base._resv);

	drm_vma_node_reset(&nvbo->bo.base.vma_node);



	ret = nouveau_bo_init(nvbo, size, align, domain, sg, robj);

	if (ret)

		return ret;

drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c

+0 −1
Original line number Diff line number Diff line
@@ -447,7 +447,6 @@ static int rpi_touchscreen_remove(struct i2c_client *i2c) 
	drm_panel_remove(&ts->base);



	mipi_dsi_device_unregister(ts->dsi);

	kfree(ts->dsi);



	return 0;

}

drivers/gpu/drm/ttm/ttm_bo.c

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ void ttm_bo_move_to_lru_tail(struct ttm_buffer_object *bo, 
		return;

	}



	if (!mem)

		return;



	man = ttm_manager_type(bdev, mem->mem_type);

	list_move_tail(&bo->lru, &man->lru[bo->priority]);