From: Dave Airlie <airlied@redhat.com>
Date: Thu, 24 Nov 2022 01:05:43 +0000 (+1000)
Subject: Backmerge tag 'v6.1-rc6' into drm-next
X-Git-Tag: v6.6.17~5843^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d47f9580839eb6fe568e38b2084d94887fbf5ce0;p=platform%2Fkernel%2Flinux-rpi.git

Backmerge tag 'v6.1-rc6' into drm-next

Linux 6.1-rc6

This is needed for drm-misc-next and tegra.

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

d47f9580839eb6fe568e38b2084d94887fbf5ce0
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 4591504,d038b25..8516c81
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@@ -1247,11 -1243,14 +1247,14 @@@ static int amdgpu_cs_submit(struct amdg
  	for (i = 0; i < p->gang_size; ++i)
  		drm_sched_job_arm(&p->jobs[i]->base);
  
- 	for (i = 0; i < (p->gang_size - 1); ++i) {
+ 	for (i = 0; i < p->gang_size; ++i) {
  		struct dma_fence *fence;
  
+ 		if (p->jobs[i] == leader)
+ 			continue;
+ 
  		fence = &p->jobs[i]->base.s_fence->scheduled;
 -		r = amdgpu_sync_fence(&leader->sync, fence);
 +		r = drm_sched_job_add_dependency(&leader->base, fence);
  		if (r)
  			goto error_cleanup;
  	}
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index 7cf99f7,500a1dc..53ff91f
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@@ -498,8 -498,10 +498,10 @@@ static int amdgpu_vkms_sw_init(void *ha
  	adev_to_drm(adev)->mode_config.preferred_depth = 24;
  	adev_to_drm(adev)->mode_config.prefer_shadow = 1;
  
 -	adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base;
 +	adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
  
+ 	adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
+ 
  	r = amdgpu_display_modeset_create_props(adev);
  	if (r)
  		return r;
diff --cc drivers/gpu/drm/rcar-du/Kconfig
index f146865,fd2c2ea..1065dca
--- a/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@@ -41,22 -41,21 +41,27 @@@ config DRM_RCAR_LVD
  	depends on DRM_RCAR_USE_LVDS
  	select DRM_KMS_HELPER
  	select DRM_PANEL
 -	select OF_FLATTREE
 -	select OF_OVERLAY
  
- config DRM_RCAR_MIPI_DSI
- 	tristate "R-Car DU MIPI DSI Encoder Support"
- 	depends on DRM && DRM_BRIDGE && OF
- 	select DRM_MIPI_DSI
+ config DRM_RCAR_USE_MIPI_DSI
+ 	bool "R-Car DU MIPI DSI Encoder Support"
+ 	depends on DRM_BRIDGE && OF
+ 	default DRM_RCAR_DU
  	help
  	  Enable support for the R-Car Display Unit embedded MIPI DSI encoders.
  
+ config DRM_RCAR_MIPI_DSI
+ 	def_tristate DRM_RCAR_DU
+ 	depends on DRM_RCAR_USE_MIPI_DSI
+ 	select DRM_MIPI_DSI
+ 
 +config DRM_RZG2L_MIPI_DSI
 +	tristate "RZ/G2L MIPI DSI Encoder Support"
 +	depends on DRM_BRIDGE && OF
 +	depends on ARCH_RENESAS || COMPILE_TEST
 +	select DRM_MIPI_DSI
 +	help
 +	  Enable support for the RZ/G2L Display Unit embedded MIPI DSI encoders.
 +
  config DRM_RCAR_VSP
  	bool "R-Car DU VSP Compositor Support" if ARM
  	default y if ARM64
diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index 6b223a5,470432c..12a00d6
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@@ -348,9 -349,12 +348,13 @@@ static int vc4_hdmi_reset_link(struct d
  	if (!crtc_state->active)
  		return 0;
  
 +	vc4_hdmi = connector_to_vc4_hdmi(connector);
- 	if (!vc4_hdmi_supports_scrambling(vc4_hdmi))
+ 	mutex_lock(&vc4_hdmi->mutex);
+ 
 -	if (!vc4_hdmi_supports_scrambling(encoder)) {
++	if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) {
+ 		mutex_unlock(&vc4_hdmi->mutex);
  		return 0;
+ 	}
  
  	scrambling_needed = vc4_hdmi_mode_needs_scrambling(&vc4_hdmi->saved_adjusted_mode,
  							   vc4_hdmi->output_bpc,