Merge tag 'drm-msm-next-2019-11-05' of https://gitlab.freedesktop.org/drm/msm into...

+ OCMEM support to enable the couple generations that had shared OCMEM
  rather than GMEM exclusively for the GPU (late a3xx and I think basically
  all of a4xx).  Bjorn and Brian decided to land this through the drm
  tree to avoid having to coordinate merge requests.
+ a510 support, and various associated display support
+ the usual misc cleanups and fixes

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

diff --combined drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
index 959d03e007fa76480f09869ad535ce0a4a0a74e4,6ceba33a179ea83d9a398fdb401eda60f3486b51..c6169e7df19de562818eae30c20977cea9de9a34
--- 1/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
--- 2/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
@@@ -31,7 -31,7 +31,7 @@@
   */
  #define DPU_DEBUG(fmt, ...)                                                \
        do {                                                               \
 -              if (unlikely(drm_debug & DRM_UT_KMS))                      \
 +              if (drm_debug_enabled(DRM_UT_KMS))                         \
                        DRM_DEBUG(fmt, ##__VA_ARGS__); \
                else                                                       \
                        pr_debug(fmt, ##__VA_ARGS__);                      \
@@@ -43,7 -43,7 +43,7 @@@
   */
  #define DPU_DEBUG_DRIVER(fmt, ...)                                         \
        do {                                                               \
 -              if (unlikely(drm_debug & DRM_UT_DRIVER))                   \
 +              if (drm_debug_enabled(DRM_UT_DRIVER))                      \
                        DRM_ERROR(fmt, ##__VA_ARGS__); \
                else                                                       \
                        pr_debug(fmt, ##__VA_ARGS__);                      \
@@@ -139,10 -139,6 +139,6 @@@ struct vsync_info 
  
  #define to_dpu_kms(x) container_of(x, struct dpu_kms, base)
  
- /* get struct msm_kms * from drm_device * */
- #define ddev_to_msm_kms(D) ((D) && (D)->dev_private ? \
-               ((struct msm_drm_private *)((D)->dev_private))->kms : NULL)
- 
  /**
   * Debugfs functions - extra helper functions for debugfs support
   *

diff --combined drivers/gpu/drm/msm/dsi/dsi_host.c
index 1e7b1be25bb07a1d6ac2b7134dded4fdac23c68a,4851188f11baec4c4541610653e0bdbb309bf867..458cec82ae13fbe2d45ff39577ff17aa49d46b41
--- 1/drivers/gpu/drm/msm/dsi/dsi_host.c
--- 2/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@@ -26,8 -26,6 +26,8 @@@
  #include "dsi_cfg.h"
  #include "msm_kms.h"
  
 +#define DSI_RESET_TOGGLE_DELAY_MS 20
 +
  static int dsi_get_version(const void __iomem *base, u32 *major, u32 *minor)
  {
        u32 ver;
@@@ -988,7 -986,7 +988,7 @@@ static void dsi_sw_reset(struct msm_dsi
        wmb(); /* clocks need to be enabled before reset */
  
        dsi_write(msm_host, REG_DSI_RESET, 1);
 -      wmb(); /* make sure reset happen */
 +      msleep(DSI_RESET_TOGGLE_DELAY_MS); /* make sure reset happen */
        dsi_write(msm_host, REG_DSI_RESET, 0);
  }
  
@@@ -1293,14 -1291,13 +1293,13 @@@ static int dsi_cmd_dma_tx(struct msm_ds
  static int dsi_cmd_dma_rx(struct msm_dsi_host *msm_host,
                        u8 *buf, int rx_byte, int pkt_size)
  {
-       u32 *lp, *temp, data;
+       u32 *temp, data;
        int i, j = 0, cnt;
        u32 read_cnt;
        u8 reg[16];
        int repeated_bytes = 0;
        int buf_offset = buf - msm_host->rx_buf;
  
-       lp = (u32 *)buf;
        temp = (u32 *)reg;
        cnt = (rx_byte + 3) >> 2;
        if (cnt > 4)
@@@ -1398,7 -1395,7 +1397,7 @@@ static void dsi_sw_reset_restore(struc
  
        /* dsi controller can only be reset while clocks are running */
        dsi_write(msm_host, REG_DSI_RESET, 1);
 -      wmb();  /* make sure reset happen */
 +      msleep(DSI_RESET_TOGGLE_DELAY_MS); /* make sure reset happen */
        dsi_write(msm_host, REG_DSI_RESET, 0);
        wmb();  /* controller out of reset */
        dsi_write(msm_host, REG_DSI_CTRL, data0);