drm/i915: move overlay to display.overlay

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

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e019fb538536d36bab28feaafe049e0b1726f2d9.1661346845.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 0dcf50f..8126310 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -31,6 +31,7 @@ struct intel_fbdev;
 struct intel_fdi_funcs;
 struct intel_hotplug_funcs;
 struct intel_initial_plane_config;
+struct intel_overlay;
 
 struct intel_display_funcs {
        /*
@@ -242,6 +243,7 @@ struct intel_display {
        struct intel_dmc dmc;
        struct intel_dpll dpll;
        struct intel_hotplug hotplug;
+       struct intel_overlay *overlay;
        struct intel_wm wm;
 };
 

diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
index 79ed8bd..6f26f7f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_overlay.c
+++ b/drivers/gpu/drm/i915/display/intel_overlay.c
@@ -487,7 +487,7 @@ static int intel_overlay_release_old_vid(struct intel_overlay *overlay)
 
 void intel_overlay_reset(struct drm_i915_private *dev_priv)
 {
-       struct intel_overlay *overlay = dev_priv->overlay;
+       struct intel_overlay *overlay = dev_priv->display.overlay;
 
        if (!overlay)
                return;
@@ -1113,7 +1113,7 @@ int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data,
        struct drm_i915_gem_object *new_bo;
        int ret;
 
-       overlay = dev_priv->overlay;
+       overlay = dev_priv->display.overlay;
        if (!overlay) {
                drm_dbg(&dev_priv->drm, "userspace bug: no overlay\n");
                return -ENODEV;
@@ -1273,7 +1273,7 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,
        struct intel_overlay *overlay;
        int ret;
 
-       overlay = dev_priv->overlay;
+       overlay = dev_priv->display.overlay;
        if (!overlay) {
                drm_dbg(&dev_priv->drm, "userspace bug: no overlay\n");
                return -ENODEV;
@@ -1416,7 +1416,7 @@ void intel_overlay_setup(struct drm_i915_private *dev_priv)
        update_polyphase_filter(overlay->regs);
        update_reg_attrs(overlay, overlay->regs);
 
-       dev_priv->overlay = overlay;
+       dev_priv->display.overlay = overlay;
        drm_info(&dev_priv->drm, "Initialized overlay support.\n");
        return;
 
@@ -1428,7 +1428,7 @@ void intel_overlay_cleanup(struct drm_i915_private *dev_priv)
 {
        struct intel_overlay *overlay;
 
-       overlay = fetch_and_zero(&dev_priv->overlay);
+       overlay = fetch_and_zero(&dev_priv->display.overlay);
        if (!overlay)
                return;
 
@@ -1457,7 +1457,7 @@ struct intel_overlay_error_state {
 struct intel_overlay_error_state *
 intel_overlay_capture_error_state(struct drm_i915_private *dev_priv)
 {
-       struct intel_overlay *overlay = dev_priv->overlay;
+       struct intel_overlay *overlay = dev_priv->display.overlay;
        struct intel_overlay_error_state *error;
 
        if (!overlay || !overlay->active)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 6bb3f93..b747455 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -83,7 +83,6 @@ struct intel_connector;
 struct intel_dp;
 struct intel_encoder;
 struct intel_limit;
-struct intel_overlay;
 struct intel_overlay_error_state;
 struct vlv_s0ix_state;
 
@@ -343,9 +342,6 @@ struct drm_i915_private {
 
        bool preserve_bios_swizzle;
 
-       /* overlay */
-       struct intel_overlay *overlay;
-
        /* backlight registers and fields in struct intel_panel */
        struct mutex backlight_lock;
 

diff --git a/drivers/gpu/drm/i915/i915_getparam.c b/drivers/gpu/drm/i915/i915_getparam.c
index 6fd15b3..342c8ca 100644 (file)
--- a/drivers/gpu/drm/i915/i915_getparam.c
+++ b/drivers/gpu/drm/i915/i915_getparam.c
@@ -36,7 +36,7 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data,
                value = to_gt(i915)->ggtt->num_fences;
                break;
        case I915_PARAM_HAS_OVERLAY:
-               value = !!i915->overlay;
+               value = !!i915->display.overlay;
                break;
        case I915_PARAM_HAS_BSD:
                value = !!intel_engine_lookup_user(i915,