Merge tag 'msm-next-5.19-fixes-06-01' of https://gitlab.freedesktop.org/abhinavk...

5.19 fixes for msm-next

- Fix to add minimum ICC vote in the msm_mdss pm_resume path to address
   bootup splats
- Fix to avoid dereferencing without checking in WB encoder
- Fix to avoid crash during suspend in DP driver by ensuring interrupt
   mask bits are updated
- Remove unused code from dpu_encoder_virt_atomic_check()
- Fix to remove redundant init of dsc variable

Signed-off-by: Dave Airlie <[email protected]>
From: Abhinav Kumar <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --combined drivers/gpu/drm/msm/dp/dp_ctrl.c
index d21971baa24ce302f2d78c9f8c5fe12b1fc6941c,f3e333eff32dbad4164dccc15b84bf6d0f0c33e4..b7f5b8d3bbd6138bed6903bc3d3ae9974ee0911f
--- 1/drivers/gpu/drm/msm/dp/dp_ctrl.c
--- 2/drivers/gpu/drm/msm/dp/dp_ctrl.c
+++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c
@@@ -11,9 -11,8 +11,9 @@@
  #include <linux/phy/phy.h>
  #include <linux/phy/phy-dp.h>
  #include <linux/pm_opp.h>
 +
 +#include <drm/display/drm_dp_helper.h>
  #include <drm/drm_fixed.h>
 -#include <drm/dp/drm_dp_helper.h>
  #include <drm/drm_print.h>
  
  #include "dp_reg.h"
@@@ -1390,8 -1389,13 +1390,13 @@@ void dp_ctrl_reset_irq_ctrl(struct dp_c
  
        dp_catalog_ctrl_reset(ctrl->catalog);
  
-       if (enable)
-               dp_catalog_ctrl_enable_irq(ctrl->catalog, enable);
+       /*
+        * all dp controller programmable registers will not
+        * be reset to default value after DP_SW_RESET
+        * therefore interrupt mask bits have to be updated
+        * to enable/disable interrupts
+        */
+       dp_catalog_ctrl_enable_irq(ctrl->catalog, enable);
  }
  
  void dp_ctrl_phy_init(struct dp_ctrl *dp_ctrl)