Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y

diff --cc Makefile
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/ingenic/ingenic-drm-drv.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_drm_crtc.c
Simple merge

diff --cc drivers/gpu/drm/tegra/dc.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_drv.h
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index 70414b0,c58b884..87c7817
--- 1/drivers/gpu/drm/vc4/vc4_hdmi.c
--- 2/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@@ -905,23 -620,16 +905,23 @@@ static void vc4_hdmi_recenter_fifo(stru
                  "VC4_HDMI_FIFO_CTL_RECENTER_DONE");
  }
  
 -static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder)
 +static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
 +                                              struct drm_atomic_state *state)
  {
 -      struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
        struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
 -      unsigned long pixel_rate, hsm_rate;
 +      struct drm_connector *connector = &vc4_hdmi->connector;
 +      struct drm_connector_state *conn_state =
 +              drm_atomic_get_new_connector_state(state, connector);
 +      struct vc4_hdmi_connector_state *vc4_conn_state =
 +              conn_state_to_vc4_hdmi_conn_state(conn_state);
 +      struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
 +      unsigned long bvb_rate, pixel_rate, hsm_rate;
        int ret;
  
-       ret = pm_runtime_get_sync(&vc4_hdmi->pdev->dev);
+       ret = pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev);
        if (ret < 0) {
                DRM_ERROR("Failed to retain power domain: %d\n", ret);
 +              pm_runtime_put(&vc4_hdmi->pdev->dev);
                return;
        }
  

diff --cc drivers/mmc/core/core.c
Simple merge

diff --cc drivers/mmc/host/sdhci.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/genet/bcmmii.c
Simple merge

diff --cc drivers/power/reset/gpio-poweroff.c
Simple merge

diff --cc drivers/power/supply/Kconfig
Simple merge

diff --cc drivers/usb/gadget/function/f_hid.c
Simple merge

diff --cc drivers/video/fbdev/core/fbmem.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge