drm/i915: move fbc to display.fbc

Move display FBC related members under drm_i915_private display
sub-struct.

Pointers and arrays of pointers to structs that we defined are fine
without a sub-struct wrapping.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1151469ec13d392df86b72a375f490fd70a3257a.1661779055.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
index 592e5ad..ed24a4a 100644 (file)
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -126,7 +126,7 @@ static struct intel_fbc *i9xx_plane_fbc(struct drm_i915_private *dev_priv,
                                        enum i9xx_plane_id i9xx_plane)
 {
        if (i9xx_plane_has_fbc(dev_priv, i9xx_plane))
-               return dev_priv->fbc[INTEL_FBC_A];
+               return dev_priv->display.fbc[INTEL_FBC_A];
        else
                return NULL;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 4eeb6a8..be40d4a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -18,6 +18,7 @@
 #include "intel_display.h"
 #include "intel_dmc.h"
 #include "intel_dpll_mgr.h"
+#include "intel_fbc.h"
 #include "intel_global_state.h"
 #include "intel_gmbus.h"
 #include "intel_opregion.h"
@@ -345,6 +346,7 @@ struct intel_display {
        struct intel_audio audio;
        struct intel_dmc dmc;
        struct intel_dpll dpll;
+       struct intel_fbc *fbc[I915_MAX_FBCS];
        struct intel_hotplug hotplug;
        struct intel_opregion opregion;
        struct intel_overlay *overlay;

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index 0ece995..f381753 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -59,7 +59,7 @@
 
 #define for_each_intel_fbc(__dev_priv, __fbc, __fbc_id) \
        for_each_fbc_id((__dev_priv), (__fbc_id)) \
-               for_each_if((__fbc) = (__dev_priv)->fbc[(__fbc_id)])
+               for_each_if((__fbc) = (__dev_priv)->display.fbc[(__fbc_id)])
 
 struct intel_fbc_funcs {
        void (*activate)(struct intel_fbc *fbc);
@@ -1720,7 +1720,7 @@ void intel_fbc_init(struct drm_i915_private *i915)
                    i915->params.enable_fbc);
 
        for_each_fbc_id(i915, fbc_id)
-               i915->fbc[fbc_id] = intel_fbc_create(i915, fbc_id);
+               i915->display.fbc[fbc_id] = intel_fbc_create(i915, fbc_id);
 }
 
 /**
@@ -1840,7 +1840,7 @@ void intel_fbc_debugfs_register(struct drm_i915_private *i915)
        struct drm_minor *minor = i915->drm.primary;
        struct intel_fbc *fbc;
 
-       fbc = i915->fbc[INTEL_FBC_A];
+       fbc = i915->display.fbc[INTEL_FBC_A];
        if (fbc)
                intel_fbc_debugfs_add(fbc, minor->debugfs_root);
 }

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 906d2cc..e4c41d8 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -1941,7 +1941,7 @@ static struct intel_fbc *skl_plane_fbc(struct drm_i915_private *dev_priv,
        enum intel_fbc_id fbc_id = skl_fbc_id_for_pipe(pipe);
 
        if (skl_plane_has_fbc(dev_priv, fbc_id, plane_id))
-               return dev_priv->fbc[fbc_id];
+               return dev_priv->display.fbc[fbc_id];
        else
                return NULL;
 }

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index e3c7de2..43e73f6 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -40,7 +40,6 @@
 #include "display/intel_display_core.h"
 #include "display/intel_display_power.h"
 #include "display/intel_dsb.h"
-#include "display/intel_fbc.h"
 #include "display/intel_frontbuffer.h"
 
 #include "gem/i915_gem_context_types.h"
@@ -286,8 +285,6 @@ struct drm_i915_private {
        };
        u32 pipestat_irq_mask[I915_MAX_PIPES];
 
-       struct intel_fbc *fbc[I915_MAX_FBCS];
-
        bool preserve_bios_swizzle;
 
        unsigned int fsb_freq, mem_freq, is_ddr3;