From: Dave Airlie <airlied@redhat.com>
Date: Fri, 22 Sep 2023 06:28:29 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2023-09-11-1' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f107ff76a8c242b298413ef52db9978dc3fe0153;p=linux.git

Merge tag 'drm-misc-next-2023-09-11-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for v6.7-rc1:

UAPI Changes:
- Nouveau changed to not set NO_PREFETCH flag explicitly.

Cross-subsystem Changes:
- Update documentation of dma-buf intro and uapi.
- fbdev/sbus fixes.
- Use initializer macros in a lot of fbdev drivers.
- Add Boris Brezillon as Panfrost driver maintainer.
- Add Jessica Zhang as drm/panel reviewer.
- Make more fbdev drivers use fb_ops helpers for deferred io.
- Small hid trailing whitespace fix.
- Use fb_ops in hid/picolcd

Core Changes:
- Assorted small fixes to ttm tests, drm/mst.
- Documentation updates to bridge.
- Add kunit tests for some drm_fb functions.
- Rework drm_debugfs implementation.
- Update xe documentation to mark todos as completed.

Driver Changes:
- Add support to rockchip for rv1126 mipi-dsi and vop.
- Assorted small fixes to nouveau, bridge/samsung-dsim,
  bridge/lvds-codec, loongson, rockchip, panfrost, gma500, repaper,
  komeda, virtio, ssd130x.
- Add support for simple panels Mitsubishi AA084XE01,
  JDI LPM102A188A,
- Documentation updates to accel/ivpu.
- Some nouveau scheduling/fence fixes.
- Power management related fixes and other fixes to ivpu.
- Assorted bridge/it66121 fixes.
- Make platform drivers return void in remove() callback.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/3da6554b-3b47-fe7d-c4ea-21f4f819dbb6@linux.intel.com
---

f107ff76a8c242b298413ef52db9978dc3fe0153
diff --cc drivers/gpu/drm/msm/msm_mdss.c
index 2e87dd6cb17bf,268fb3d490de1..a429b704059ee
--- a/drivers/gpu/drm/msm/msm_mdss.c
+++ b/drivers/gpu/drm/msm/msm_mdss.c
@@@ -504,26 -499,12 +504,24 @@@ static void mdss_remove(struct platform
  	of_platform_depopulate(&pdev->dev);
  
  	msm_mdss_destroy(mdss);
- 
- 	return 0;
  }
  
 +static const struct msm_mdss_data msm8998_data = {
 +	.ubwc_enc_version = UBWC_1_0,
 +	.ubwc_dec_version = UBWC_1_0,
 +	.highest_bank_bit = 1,
 +};
 +
 +static const struct msm_mdss_data qcm2290_data = {
 +	/* no UBWC */
 +	.highest_bank_bit = 0x2,
 +};
 +
  static const struct msm_mdss_data sc7180_data = {
 -	.ubwc_version = UBWC_2_0,
 +	.ubwc_enc_version = UBWC_2_0,
  	.ubwc_dec_version = UBWC_2_0,
  	.ubwc_static = 0x1e,
 +	.highest_bank_bit = 0x3,
  };
  
  static const struct msm_mdss_data sc7280_data = {