Merge drm/drm-next into drm-intel-next

Catching-up with drm-next and drm-intel-gt-next.
It will unblock a code refactor around the platform
definitions (names vs acronyms).

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index 7f8b2d7..2538202 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -47,6 +47,7 @@
 #include "i915_reg.h"
 #include "i915_utils.h"
 #include "i915_vgpu.h"
+#include "i915_vma.h"
 #include "intel_cdclk.h"
 #include "intel_de.h"
 #include "intel_display_trace.h"
@@ -94,8 +95,7 @@ struct intel_fbc {
        struct mutex lock;
        unsigned int busy_bits;
 
-       struct drm_mm_node compressed_fb;
-       struct drm_mm_node compressed_llb;
+       struct i915_stolen_fb compressed_fb, compressed_llb;
 
        enum intel_fbc_id id;
 
@@ -332,15 +332,16 @@ static void i8xx_fbc_program_cfb(struct intel_fbc *fbc)
 {
        struct drm_i915_private *i915 = fbc->i915;
 
-       GEM_BUG_ON(range_overflows_end_t(u64, i915->dsm.stolen.start,
-                                        fbc->compressed_fb.start, U32_MAX));
-       GEM_BUG_ON(range_overflows_end_t(u64, i915->dsm.stolen.start,
-                                        fbc->compressed_llb.start, U32_MAX));
-
+       GEM_BUG_ON(range_overflows_end_t(u64, i915_gem_stolen_area_address(i915),
+                                        i915_gem_stolen_node_offset(&fbc->compressed_fb),
+                                        U32_MAX));
+       GEM_BUG_ON(range_overflows_end_t(u64, i915_gem_stolen_area_address(i915),
+                                        i915_gem_stolen_node_offset(&fbc->compressed_llb),
+                                        U32_MAX));
        intel_de_write(i915, FBC_CFB_BASE,
-                      i915->dsm.stolen.start + fbc->compressed_fb.start);
+                      i915_gem_stolen_node_address(i915, &fbc->compressed_fb));
        intel_de_write(i915, FBC_LL_BASE,
-                      i915->dsm.stolen.start + fbc->compressed_llb.start);
+                      i915_gem_stolen_node_address(i915, &fbc->compressed_llb));
 }
 
 static const struct intel_fbc_funcs i8xx_fbc_funcs = {
@@ -447,7 +448,8 @@ static void g4x_fbc_program_cfb(struct intel_fbc *fbc)
 {
        struct drm_i915_private *i915 = fbc->i915;
 
-       intel_de_write(i915, DPFC_CB_BASE, fbc->compressed_fb.start);
+       intel_de_write(i915, DPFC_CB_BASE,
+                      i915_gem_stolen_node_offset(&fbc->compressed_fb));
 }
 
 static const struct intel_fbc_funcs g4x_fbc_funcs = {
@@ -498,7 +500,8 @@ static void ilk_fbc_program_cfb(struct intel_fbc *fbc)
 {
        struct drm_i915_private *i915 = fbc->i915;
 
-       intel_de_write(i915, ILK_DPFC_CB_BASE(fbc->id), fbc->compressed_fb.start);
+       intel_de_write(i915, ILK_DPFC_CB_BASE(fbc->id),
+                      i915_gem_stolen_node_offset(&fbc->compressed_fb));
 }
 
 static const struct intel_fbc_funcs ilk_fbc_funcs = {
@@ -605,7 +608,7 @@ static void ivb_fbc_activate(struct intel_fbc *fbc)
        else if (DISPLAY_VER(i915) == 9)
                skl_fbc_program_cfb_stride(fbc);
 
-       if (to_gt(i915)->ggtt->num_fences)
+       if (intel_gt_support_legacy_fencing(to_gt(i915)))
                snb_fbc_program_fence(fbc);
 
        intel_de_write(i915, ILK_DPFC_CONTROL(fbc->id),
@@ -713,7 +716,7 @@ static u64 intel_fbc_stolen_end(struct drm_i915_private *i915)
         * underruns, even if that range is not reserved by the BIOS. */
        if (IS_BROADWELL(i915) ||
            (DISPLAY_VER(i915) == 9 && !IS_BROXTON(i915)))
-               end = resource_size(&i915->dsm.stolen) - 8 * 1024 * 1024;
+               end = i915_gem_stolen_area_size(i915) - 8 * 1024 * 1024;
        else
                end = U64_MAX;
 
@@ -770,9 +773,9 @@ static int intel_fbc_alloc_cfb(struct intel_fbc *fbc,
        int ret;
 
        drm_WARN_ON(&i915->drm,
-                   drm_mm_node_allocated(&fbc->compressed_fb));
+                   i915_gem_stolen_node_allocated(&fbc->compressed_fb));
        drm_WARN_ON(&i915->drm,
-                   drm_mm_node_allocated(&fbc->compressed_llb));
+                   i915_gem_stolen_node_allocated(&fbc->compressed_llb));
 
        if (DISPLAY_VER(i915) < 5 && !IS_G4X(i915)) {
                ret = i915_gem_stolen_insert_node(i915, &fbc->compressed_llb,
@@ -792,15 +795,14 @@ static int intel_fbc_alloc_cfb(struct intel_fbc *fbc,
 
        drm_dbg_kms(&i915->drm,
                    "reserved %llu bytes of contiguous stolen space for FBC, limit: %d\n",
-                   fbc->compressed_fb.size, fbc->limit);
-
+                   i915_gem_stolen_node_size(&fbc->compressed_fb), fbc->limit);
        return 0;
 
 err_llb:
-       if (drm_mm_node_allocated(&fbc->compressed_llb))
+       if (i915_gem_stolen_node_allocated(&fbc->compressed_llb))
                i915_gem_stolen_remove_node(i915, &fbc->compressed_llb);
 err:
-       if (drm_mm_initialized(&i915->mm.stolen))
+       if (i915_gem_stolen_initialized(i915))
                drm_info_once(&i915->drm, "not enough stolen space for compressed buffer (need %d more bytes), disabling. Hint: you may be able to increase stolen memory size in the BIOS to avoid this.\n", size);
        return -ENOSPC;
 }
@@ -825,9 +827,9 @@ static void __intel_fbc_cleanup_cfb(struct intel_fbc *fbc)
        if (WARN_ON(intel_fbc_hw_is_active(fbc)))
                return;
 
-       if (drm_mm_node_allocated(&fbc->compressed_llb))
+       if (i915_gem_stolen_node_allocated(&fbc->compressed_llb))
                i915_gem_stolen_remove_node(i915, &fbc->compressed_llb);
-       if (drm_mm_node_allocated(&fbc->compressed_fb))
+       if (i915_gem_stolen_node_allocated(&fbc->compressed_fb))
                i915_gem_stolen_remove_node(i915, &fbc->compressed_fb);
 }
 
@@ -990,11 +992,10 @@ static void intel_fbc_update_state(struct intel_atomic_state *state,
        fbc_state->fence_y_offset = intel_plane_fence_y_offset(plane_state);
 
        drm_WARN_ON(&i915->drm, plane_state->flags & PLANE_HAS_FENCE &&
-                   !plane_state->ggtt_vma->fence);
+                   !intel_gt_support_legacy_fencing(to_gt(i915)));
 
-       if (plane_state->flags & PLANE_HAS_FENCE &&
-           plane_state->ggtt_vma->fence)
-               fbc_state->fence_id = plane_state->ggtt_vma->fence->id;
+       if (plane_state->flags & PLANE_HAS_FENCE)
+               fbc_state->fence_id =  i915_vma_fence_id(plane_state->ggtt_vma);
        else
                fbc_state->fence_id = -1;
 
@@ -1021,7 +1022,7 @@ static bool intel_fbc_is_fence_ok(const struct intel_plane_state *plane_state)
         */
        return DISPLAY_VER(i915) >= 9 ||
                (plane_state->flags & PLANE_HAS_FENCE &&
-                plane_state->ggtt_vma->fence);
+                i915_vma_fence_id(plane_state->ggtt_vma) != -1);
 }
 
 static bool intel_fbc_is_cfb_ok(const struct intel_plane_state *plane_state)
@@ -1030,7 +1031,8 @@ static bool intel_fbc_is_cfb_ok(const struct intel_plane_state *plane_state)
        struct intel_fbc *fbc = plane->fbc;
 
        return intel_fbc_min_limit(plane_state) <= fbc->limit &&
-               intel_fbc_cfb_size(plane_state) <= fbc->compressed_fb.size * fbc->limit;
+               intel_fbc_cfb_size(plane_state) <= fbc->limit *
+                       i915_gem_stolen_node_size(&fbc->compressed_fb);
 }
 
 static bool intel_fbc_is_ok(const struct intel_plane_state *plane_state)
@@ -1054,6 +1056,11 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state,
        if (!fbc)
                return 0;
 
+       if (!i915_gem_stolen_initialized(i915)) {
+               plane_state->no_fbc_reason = "stolen memory not initialised";
+               return 0;
+       }
+
        if (intel_vgpu_active(i915)) {
                plane_state->no_fbc_reason = "VGPU active";
                return 0;
@@ -1707,9 +1714,6 @@ void intel_fbc_init(struct drm_i915_private *i915)
 {
        enum intel_fbc_id fbc_id;
 
-       if (!drm_mm_initialized(&i915->mm.stolen))
-               DISPLAY_RUNTIME_INFO(i915)->fbc_mask = 0;
-
        if (need_fbc_vtd_wa(i915))
                DISPLAY_RUNTIME_INFO(i915)->fbc_mask = 0;
 

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 8298a86..7d25a64 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2097,7 +2097,7 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector)
                const struct edid *edid = drm_edid_raw(drm_edid);
 
                /* DDC bus is shared, match EDID to connector type */
-               if (edid->input & DRM_EDID_INPUT_DIGITAL)
+               if (edid && edid->input & DRM_EDID_INPUT_DIGITAL)
                        status = connector_status_connected;
                else
                        status = connector_status_disconnected;
@@ -2752,7 +2752,7 @@ static struct intel_sdvo_connector *intel_sdvo_connector_alloc(void)
        __drm_atomic_helper_connector_reset(&sdvo_connector->base.base,
                                            &conn_state->base.base);
 
-       INIT_LIST_HEAD(&sdvo_connector->base.panel.fixed_modes);
+       intel_panel_init_alloc(&sdvo_connector->base);
 
        return sdvo_connector;
 }

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
index 5b0a5cf..1a766d8 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
@@ -974,3 +974,39 @@ bool i915_gem_object_is_stolen(const struct drm_i915_gem_object *obj)
 {
        return obj->ops == &i915_gem_object_stolen_ops;
 }
+
+bool i915_gem_stolen_initialized(const struct drm_i915_private *i915)
+{
+       return drm_mm_initialized(&i915->mm.stolen);
+}
+
+u64 i915_gem_stolen_area_address(const struct drm_i915_private *i915)
+{
+       return i915->dsm.stolen.start;
+}
+
+u64 i915_gem_stolen_area_size(const struct drm_i915_private *i915)
+{
+       return resource_size(&i915->dsm.stolen);
+}
+
+u64 i915_gem_stolen_node_address(const struct drm_i915_private *i915,
+                                const struct drm_mm_node *node)
+{
+       return i915->dsm.stolen.start + i915_gem_stolen_node_offset(node);
+}
+
+bool i915_gem_stolen_node_allocated(const struct drm_mm_node *node)
+{
+       return drm_mm_node_allocated(node);
+}
+
+u64 i915_gem_stolen_node_offset(const struct drm_mm_node *node)
+{
+       return node->start;
+}
+
+u64 i915_gem_stolen_node_size(const struct drm_mm_node *node)
+{
+       return node->size;
+}

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.h b/drivers/gpu/drm/i915/gem/i915_gem_stolen.h
index d5005a3..258381d 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.h
@@ -12,6 +12,8 @@ struct drm_i915_private;
 struct drm_mm_node;
 struct drm_i915_gem_object;
 
+#define i915_stolen_fb drm_mm_node
+
 int i915_gem_stolen_insert_node(struct drm_i915_private *dev_priv,
                                struct drm_mm_node *node, u64 size,
                                unsigned alignment);
@@ -36,4 +38,15 @@ bool i915_gem_object_is_stolen(const struct drm_i915_gem_object *obj);
 
 #define I915_GEM_STOLEN_BIAS SZ_128K
 
+bool i915_gem_stolen_initialized(const struct drm_i915_private *i915);
+u64 i915_gem_stolen_area_address(const struct drm_i915_private *i915);
+u64 i915_gem_stolen_area_size(const struct drm_i915_private *i915);
+
+u64 i915_gem_stolen_node_address(const struct drm_i915_private *i915,
+                                const struct drm_mm_node *node);
+
+bool i915_gem_stolen_node_allocated(const struct drm_mm_node *node);
+u64 i915_gem_stolen_node_offset(const struct drm_mm_node *node);
+u64 i915_gem_stolen_node_size(const struct drm_mm_node *node);
+
 #endif /* __I915_GEM_STOLEN_H__ */

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h
index 1b22d7a..def7dd0 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h
@@ -309,4 +309,6 @@ enum intel_gt_scratch_field {
        INTEL_GT_SCRATCH_FIELD_COHERENTL3_WA = 256,
 };
 
+#define intel_gt_support_legacy_fencing(gt) ((gt)->ggtt->num_fences > 0)
+
 #endif /* __INTEL_GT_TYPES_H__ */

diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
index eaa3108..e356dfb 100644 (file)
--- a/drivers/gpu/drm/i915/i915_vma.h
+++ b/drivers/gpu/drm/i915/i915_vma.h
@@ -418,6 +418,11 @@ i915_vma_unpin_fence(struct i915_vma *vma)
                __i915_vma_unpin_fence(vma);
 }
 
+static inline int i915_vma_fence_id(const struct i915_vma *vma)
+{
+       return vma->fence ? vma->fence->id : -1;
+}
+
 void i915_vma_parked(struct intel_gt *gt);
 
 static inline bool i915_vma_is_scanout(const struct i915_vma *vma)