drm/i915: move and group properties under display.properties

Move display property 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>
Link: https://patchwork.freedesktop.org/patch/msgid/14b14f871e322419b10166c1bd8a5a956f5430c8.1661779055.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index 40da791..3f555b3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -63,9 +63,9 @@ int intel_digital_connector_atomic_get_property(struct drm_connector *connector,
        struct intel_digital_connector_state *intel_conn_state =
                to_intel_digital_connector_state(state);
 
-       if (property == dev_priv->force_audio_property)
+       if (property == dev_priv->display.properties.force_audio)
                *val = intel_conn_state->force_audio;
-       else if (property == dev_priv->broadcast_rgb_property)
+       else if (property == dev_priv->display.properties.broadcast_rgb)
                *val = intel_conn_state->broadcast_rgb;
        else {
                drm_dbg_atomic(&dev_priv->drm,
@@ -96,12 +96,12 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
        struct intel_digital_connector_state *intel_conn_state =
                to_intel_digital_connector_state(state);
 
-       if (property == dev_priv->force_audio_property) {
+       if (property == dev_priv->display.properties.force_audio) {
                intel_conn_state->force_audio = val;
                return 0;
        }
 
-       if (property == dev_priv->broadcast_rgb_property) {
+       if (property == dev_priv->display.properties.broadcast_rgb) {
                intel_conn_state->broadcast_rgb = val;
                return 0;
        }

diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
index 1dcc268..6d5cbeb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_connector.c
+++ b/drivers/gpu/drm/i915/display/intel_connector.c
@@ -229,7 +229,7 @@ intel_attach_force_audio_property(struct drm_connector *connector)
        struct drm_i915_private *dev_priv = to_i915(dev);
        struct drm_property *prop;
 
-       prop = dev_priv->force_audio_property;
+       prop = dev_priv->display.properties.force_audio;
        if (prop == NULL) {
                prop = drm_property_create_enum(dev, 0,
                                           "audio",
@@ -238,7 +238,7 @@ intel_attach_force_audio_property(struct drm_connector *connector)
                if (prop == NULL)
                        return;
 
-               dev_priv->force_audio_property = prop;
+               dev_priv->display.properties.force_audio = prop;
        }
        drm_object_attach_property(&connector->base, prop, 0);
 }
@@ -256,7 +256,7 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector)
        struct drm_i915_private *dev_priv = to_i915(dev);
        struct drm_property *prop;
 
-       prop = dev_priv->broadcast_rgb_property;
+       prop = dev_priv->display.properties.broadcast_rgb;
        if (prop == NULL) {
                prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
                                           "Broadcast RGB",
@@ -265,7 +265,7 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector)
                if (prop == NULL)
                        return;
 
-               dev_priv->broadcast_rgb_property = prop;
+               dev_priv->display.properties.broadcast_rgb = prop;
        }
 
        drm_object_attach_property(&connector->base, prop, 0);

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index bf78b0f..9086a61 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -27,6 +27,7 @@
 #include "intel_pm_types.h"
 
 struct drm_i915_private;
+struct drm_property;
 struct i915_audio_component;
 struct i915_hdcp_comp_master;
 struct intel_atomic_state;
@@ -372,6 +373,11 @@ struct intel_display {
        } pps;
 
        struct {
+               struct drm_property *broadcast_rgb;
+               struct drm_property *force_audio;
+       } properties;
+
+       struct {
                unsigned long mask;
        } quirks;
 

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 9dc1f2b..5eb6a5c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -321,9 +321,6 @@ struct drm_i915_private {
 
        struct i915_gpu_error gpu_error;
 
-       struct drm_property *broadcast_rgb_property;
-       struct drm_property *force_audio_property;
-
        /*
         * Shadows for CHV DPLL_MD regs to keep the state
         * checker somewhat working in the presence hardware