drm/i915/display: move global_obj_list under display sub-struct

Move display global state member under drm_i915_private display
sub-struct.

Prefer adding anonymous sub-structs even for single members that aren't
our own structs.

Remove a nearby stale comment while at it.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221109144209.3624739-3-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 41706ce126f5b5acbe3990ccaa76a8afa0adc6db..a087b40a898099399c85f23bd23a913f1a25bf84 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -8572,7 +8572,7 @@ static void intel_mode_config_init(struct drm_i915_private *i915)
        struct drm_mode_config *mode_config = &i915->drm.mode_config;
 
        drm_mode_config_init(&i915->drm);
-       INIT_LIST_HEAD(&i915->global_obj_list);
+       INIT_LIST_HEAD(&i915->display.global.obj_list);
 
        mode_config->min_width = 0;
        mode_config->min_height = 0;

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index d851d401211fd2ef9580f4ef96a9f19e8f5b33a3..7eb705a0fa196b0f52862f5b7c20a05281acaee9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -344,6 +344,10 @@ struct intel_display {
                u32 rx_config;
        } fdi;
 
+       struct {
+               struct list_head obj_list;
+       } global;
+
        struct {
                /*
                 * Base address of where the gmbus and gpio blocks are located

diff --git a/drivers/gpu/drm/i915/display/intel_global_state.c b/drivers/gpu/drm/i915/display/intel_global_state.c
index 7a19215ad8441c481e38e10addcd34039cd309cd..02b593b1e2ea15d65209566b149aea83b7c5e90c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_global_state.c
+++ b/drivers/gpu/drm/i915/display/intel_global_state.c
@@ -45,14 +45,14 @@ void intel_atomic_global_obj_init(struct drm_i915_private *dev_priv,
 
        obj->state = state;
        obj->funcs = funcs;
-       list_add_tail(&obj->head, &dev_priv->global_obj_list);
+       list_add_tail(&obj->head, &dev_priv->display.global.obj_list);
 }
 
 void intel_atomic_global_obj_cleanup(struct drm_i915_private *dev_priv)
 {
        struct intel_global_obj *obj, *next;
 
-       list_for_each_entry_safe(obj, next, &dev_priv->global_obj_list, head) {
+       list_for_each_entry_safe(obj, next, &dev_priv->display.global.obj_list, head) {
                list_del(&obj->head);
 
                drm_WARN_ON(&dev_priv->drm, kref_read(&obj->state->ref) != 1);

diff --git a/drivers/gpu/drm/i915/display/intel_global_state.h b/drivers/gpu/drm/i915/display/intel_global_state.h
index 1f16fa3073c9fcead38d38122697f83209ae7bf1..f01ee0bb3e5a34917dc3dcfa72df3e7ad48bf123 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_global_state.h
+++ b/drivers/gpu/drm/i915/display/intel_global_state.h
@@ -27,7 +27,7 @@ struct intel_global_obj {
 };
 
 #define intel_for_each_global_obj(obj, dev_priv) \
-       list_for_each_entry(obj, &(dev_priv)->global_obj_list, head)
+       list_for_each_entry(obj, &(dev_priv)->display.global.obj_list, head)
 
 #define for_each_new_global_obj_in_state(__state, obj, new_obj_state, __i) \
        for ((__i) = 0; \

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index bb88aee2af2577bdc31252c6dc5ff17e9cc4de20..fdf330a29ec0577fbe64eaf83c67cb9d28bee816 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -292,10 +292,6 @@ struct drm_i915_private {
 
        struct i915_gem_mm mm;
 
-       /* Kernel Modesetting */
-
-       struct list_head global_obj_list;
-
        bool mchbar_need_disable;
 
        struct intel_l3_parity l3_parity;