Merge tag 'drm-next-2019-05-16' of git://anongit.freedesktop.org/drm/drm

Pull drm fixes from Dave Airlie:
 "A bunch of fixes for the merge window closure, doesn't seem to be
  anything too major or serious in there.

  It does add TU117 turing modesetting to nouveau but it's just an
  enable for preexisting code.

  amdgpu:
   - gpu reset at load crash fix
   - ATPX hotplug fix for when dGPU is off
   - SR-IOV fixes

  radeon:
   - r5xx pll fixes

  i915:
   - GVT (MCHBAR, buffer alignment, misc warnings fixes)
   - Fixes for newly enabled semaphore code
   - Geminilake disable framebuffer compression
   - HSW edp fast modeset fix
   - IRQ vs RCU race fix

  nouveau:
   - Turing modesetting fixes
   - TU117 support

  msm:
   - SDM845 bringup fixes

  panfrost:
   - static checker fixes

  pl111:
   - spinlock init fix.

  bridge:
   - refresh rate register fix for adv7511"

* tag 'drm-next-2019-05-16' of git://anongit.freedesktop.org/drm/drm: (36 commits)
  drm/msm: Upgrade gxpd checks to IS_ERR_OR_NULL
  drm/msm/dpu: Remove duplicate header
  drm/pl111: Initialize clock spinlock early
  drm/msm: correct attempted NULL pointer dereference in debugfs
  drm/msm: remove resv fields from msm_gem_object struct
  drm/nouveau: fix duplication of nv50_head_atom struct
  drm/nouveau/disp/dp: respect sink limits when selecting failsafe link configuration
  drm/nouveau/core: initial support for boards with TU117 chipset
  drm/nouveau/core: allow detected chipset to be overridden
  drm/nouveau/kms/gf119-gp10x: push HeadSetControlOutputResource() mthd when encoders change
  drm/nouveau/kms/nv50-: fix bug preventing non-vsync'd page flips
  drm/nouveau/kms/gv100-: fix spurious window immediate interlocks
  drm/bridge: adv7511: Fix low refresh rate selection
  drm/panfrost: Add missing _fini() calls in panfrost_device_fini()
  drm/panfrost: Only put sync_out if non-NULL
  drm/i915: Seal races between async GPU cancellation, retirement and signaling
  drm/i915: Fix fastset vs. pfit on/off on HSW EDP transcoder
  drm/i915/fbc: disable framebuffer compression on GeminiLake
  drm/amdgpu/psp: move psp version specific function pointers to early_init
  drm/radeon: prefer lower reference dividers
  ...

6 files changed, 7 insertions, 15 deletions

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
index 9155dafae2a9..38e2cfa9cec7 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
@@ -747,7 +747,7 @@ int a6xx_gmu_resume(struct a6xx_gpu *a6xx_gpu)
          * will make sure that the refcounting is correct in case we need to
          * bring down the GX after a GMU failure
          */
-        if (!IS_ERR(gmu->gxpd))
+        if (!IS_ERR_OR_NULL(gmu->gxpd))
                 pm_runtime_get(gmu->gxpd);
 
 out:
@@ -863,7 +863,7 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu)
          * domain. Usually the GMU does this but only if the shutdown sequence
          * was successful
          */
-        if (!IS_ERR(gmu->gxpd))
+        if (!IS_ERR_OR_NULL(gmu->gxpd))
                 pm_runtime_put_sync(gmu->gxpd);
 
         clk_bulk_disable_unprepare(gmu->nr_clocks, gmu->clocks);
@@ -1234,7 +1234,7 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu)
 
         pm_runtime_disable(gmu->dev);
 
-        if (!IS_ERR(gmu->gxpd)) {
+        if (!IS_ERR_OR_NULL(gmu->gxpd)) {
                 pm_runtime_disable(gmu->gxpd);
                 dev_pm_domain_detach(gmu->gxpd, false);
         }
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
index 018df2c3b7ed..45a5bc6ede5d 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
@@ -15,7 +15,6 @@
 #include "dpu_hwio.h"
 #include "dpu_hw_lm.h"
 #include "dpu_hw_mdss.h"
-#include "dpu_kms.h"
 
 #define LM_OP_MODE                        0x00
 #define LM_OUT_SIZE                       0x04
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index da1f727d7495..ce1a555e1f31 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -780,7 +780,6 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane,
         struct dpu_plane_state *pstate = to_dpu_plane_state(new_state);
         struct dpu_hw_fmt_layout layout;
         struct drm_gem_object *obj;
-        struct msm_gem_object *msm_obj;
         struct dma_fence *fence;
         struct dpu_kms *kms = _dpu_plane_get_kms(&pdpu->base);
         int ret;
@@ -799,8 +798,7 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane,
          *       implicit fence and fb prepare by hand here.
          */
         obj = msm_framebuffer_bo(new_state->fb, 0);
-        msm_obj = to_msm_bo(obj);
-        fence = reservation_object_get_excl_rcu(msm_obj->resv);
+        fence = reservation_object_get_excl_rcu(obj->resv);
         if (fence)
                 drm_atomic_set_fence_for_plane(new_state, fence);
 
diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
index f5b1256e32b6..131c23a267ee 100644
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@ -49,15 +49,13 @@ int msm_atomic_prepare_fb(struct drm_plane *plane,
         struct msm_drm_private *priv = plane->dev->dev_private;
         struct msm_kms *kms = priv->kms;
         struct drm_gem_object *obj;
-        struct msm_gem_object *msm_obj;
         struct dma_fence *fence;
 
         if (!new_state->fb)
                 return 0;
 
         obj = msm_framebuffer_bo(new_state->fb, 0);
-        msm_obj = to_msm_bo(obj);
-        fence = reservation_object_get_excl_rcu(msm_obj->resv);
+        fence = reservation_object_get_excl_rcu(obj->resv);
 
         drm_atomic_set_fence_for_plane(new_state, fence);
 
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 31d5a744d84f..35f55dd25994 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -803,7 +803,8 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
                 seq_puts(m, "      vmas:");
 
                 list_for_each_entry(vma, &msm_obj->vmas, list)
-                        seq_printf(m, " [%s: %08llx,%s,inuse=%d]", vma->aspace->name,
+                        seq_printf(m, " [%s: %08llx,%s,inuse=%d]",
+                                vma->aspace != NULL ? vma->aspace->name : NULL,
                                 vma->iova, vma->mapped ? "mapped" : "unmapped",
                                 vma->inuse);
 
diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
index c5ac781dffee..812d1b1369a5 100644
--- a/drivers/gpu/drm/msm/msm_gem.h
+++ b/drivers/gpu/drm/msm/msm_gem.h
@@ -86,10 +86,6 @@ struct msm_gem_object {
 
         struct llist_node freed;
 
-        /* normally (resv == &_resv) except for imported bo's */
-        struct reservation_object *resv;
-        struct reservation_object _resv;
-
         /* For physically contiguous buffers.  Used when we don't have
          * an IOMMU.  Also used for stolen/splashscreen buffer.
          */