From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 17 Jul 2023 13:37:56 +0000 (+0200)
Subject: Merge tag 'drm-misc-next-2023-07-13' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: v6.6.7~1918^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c7f27441d6af776a89147027c6f4a11c0162c64;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'drm-misc-next-2023-07-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for v6.6:

UAPI Changes:

 * fbdev:
   * Make fbdev userspace interfaces optional; only leaves the
     framebuffer console active

 * prime:
   * Support dma-buf self-import for all drivers automatically: improves
     support for many userspace compositors

Cross-subsystem Changes:

 * backlight:
   * Fix interaction with fbdev in several drivers

 * base: Convert struct platform.remove to return void; part of a larger,
   tree-wide effort

 * dma-buf: Acquire reservation lock for mmap() in exporters; part
   of an on-going effort to simplify locking around dma-bufs

 * fbdev:
   * Use Linux device instead of fbdev device in many places
   * Use deferred-I/O helper macros in various drivers

 * i2c: Convert struct i2c from .probe_new to .probe; part of a larger,
   tree-wide effort

 * video:
   * Avoid including <linux/screen_info.h>

Core Changes:

 * atomic:
   * Improve logging

 * prime:
   * Remove struct drm_driver.gem_prime_mmap plus driver updates: all
     drivers now implement this callback with drm_gem_prime_mmap()

 * gem:
   * Support execution contexts: provides locking over multiple GEM
     objects

 * ttm:
   * Support init_on_free
   * Swapout fixes

Driver Changes:

 * accel:
   * ivpu: MMU updates; Support debugfs

 * ast:
   * Improve device-model detection
   * Cleanups

 * bridge:
   * dw-hdmi: Improve support for YUV420 bus format
   * dw-mipi-dsi: Fix enable/disable of DSI controller
   * lt9611uxc: Use MODULE_FIRMWARE()
   * ps8640: Remove broken EDID code
   * samsung-dsim: Fix command transfer
   * tc358764: Handle HS/VS polarity; Use BIT() macro; Various cleanups
   * Cleanups

 * ingenic:
   * Kconfig REGMAP fixes

 * loongson:
   * Support display controller

 * mgag200:
   * Minor fixes

 * mxsfb:
   * Support disabling overlay planes

 * nouveau:
   * Improve VRAM detection
   * Various fixes and cleanups

 * panel:
   * panel-edp: Support AUO B116XAB01.4
   * Support Visionox R66451 plus DT bindings
   * Cleanups

 * ssd130x:
   * Support per-controller default resolution plus DT bindings
   * Reduce memory-allocation overhead
   * Cleanups

 * tidss:
   * Support TI AM625 plus DT bindings
   * Implement new connector model plus driver updates

 * vkms
   * Improve write-back support
   * Documentation fixes

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230713090830.GA23281@linux-uq9g
---

6c7f27441d6af776a89147027c6f4a11c0162c64
diff --cc drivers/gpu/drm/i915/i915_driver.c
index 0ad0c58,171f4db..222d0a1
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@@ -1816,10 -1816,8 +1816,8 @@@ static const struct drm_driver i915_drm
  	.open = i915_driver_open,
  	.lastclose = i915_driver_lastclose,
  	.postclose = i915_driver_postclose,
 -	.show_fdinfo = i915_drm_client_fdinfo,
 +	.show_fdinfo = PTR_IF(IS_ENABLED(CONFIG_PROC_FS), i915_drm_client_fdinfo),
  
- 	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
- 	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
  	.gem_prime_import = i915_gem_prime_import,
  
  	.dumb_create = i915_gem_dumb_create,
diff --cc drivers/gpu/drm/ttm/ttm_bo.c
index 7139a52,758f980..aa8ab1a
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@@ -1170,10 -1164,9 +1170,10 @@@ int ttm_bo_swapout(struct ttm_buffer_ob
  		if (unlikely(ret))
  			goto out;
  
- 		ret = ttm_bo_handle_move_mem(bo, evict_mem, true, &ctx, &hop);
+ 		ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop);
  		if (unlikely(ret != 0)) {
  			WARN(ret == -EMULTIHOP, "Unexpected multihop in swaput - likely driver bug.\n");
 +			ttm_resource_free(bo, &evict_mem);
  			goto out;
  		}
  	}