BackMerge tag 'v5.15-rc7' into drm-next

The msm next tree is based on rc3, so let's just backmerge rc7 before pulling it in.

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/configs/imx_v6_v7_defconfig
Simple merge

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge

diff --cc arch/arm/configs/shmobile_defconfig
Simple merge

diff --cc arch/arm64/configs/defconfig
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
index 12ebd9f8912fe375e194b0e7bffc3d35e0ce4919,0006bbac466c8092ce554322ceab9758471f487a..2b4459909648e681070513ddd3002b6a21c4bb84
--- 1/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
--- 2/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
@@@ -1372,13 -1281,15 +1372,19 @@@ static struct stream_encoder *dcn31_str
        vpg = dcn31_vpg_create(ctx, vpg_inst);
        afmt = dcn31_afmt_create(ctx, afmt_inst);
  
 -      if (!enc1 || !vpg || !afmt)
 +      if (!enc1 || !vpg || !afmt) {
 +              kfree(enc1);
 +              kfree(vpg);
 +              kfree(afmt);
                return NULL;
 +      }
  
+       if (ctx->asic_id.chip_family == FAMILY_YELLOW_CARP &&
+                       ctx->asic_id.hw_internal_rev == YELLOW_CARP_B0) {
+               if ((eng_id == ENGINE_ID_DIGC) || (eng_id == ENGINE_ID_DIGD))
+                       eng_id = eng_id + 3; // For B0 only. C->F, D->G.
+       }
+ 
        dcn30_dio_stream_encoder_construct(enc1, ctx, ctx->dc_bios,
                                        eng_id, vpg, afmt,
                                        &stream_enc_regs[eng_id],

diff --cc drivers/gpu/drm/amd/display/include/dal_asic_id.h
Simple merge

diff --cc drivers/gpu/drm/drm_edid.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_context.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/scheduler.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_pm.c
Simple merge

diff --cc drivers/gpu/drm/msm/Kconfig
Simple merge

diff --cc drivers/gpu/drm/msm/msm_gem_submit.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_bo.c
Simple merge

diff --cc drivers/gpu/drm/panel/Kconfig
Simple merge

diff --cc drivers/gpu/drm/r128/ati_pcigart.c
Simple merge

diff --cc drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
Simple merge