drm/i915/display: make struct __intel_global_objs_state opaque

With struct __intel_global_objs_state only being accessed in
intel_global_state.c, we can make it opaque. The double underscore to
indicate internal becomes redundant, drop it.

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/06cc4d1c506e3a5b1cc50e01c4bd1135bbf0f7bd.1753953530.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 4d9df803ad477aecb2ca43790f7b4604e001a085..35596f3921e88c2e28eac208ec5a3d771796aa2e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -54,10 +54,10 @@
 
 struct cec_notifier;
 struct drm_printer;
-struct __intel_global_objs_state;
 struct intel_connector;
 struct intel_ddi_buf_trans;
 struct intel_fbc;
+struct intel_global_objs_state;
 struct intel_hdcp_shim;
 struct intel_tc_port;
 
@@ -593,7 +593,7 @@ struct intel_atomic_state {
 
        struct ref_tracker *wakeref;
 
-       struct __intel_global_objs_state *global_objs;
+       struct intel_global_objs_state *global_objs;
        int num_global_objs;
 
        /* Internal commit, as opposed to userspace/client initiated one */

diff --git a/drivers/gpu/drm/i915/display/intel_global_state.c b/drivers/gpu/drm/i915/display/intel_global_state.c
index 3df55ab353f2f9ecbcea0ccef95e56bbbc15d178..30eff6009e87fe8d0bb1eefb5c2cb7bacc319d82 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_global_state.c
+++ b/drivers/gpu/drm/i915/display/intel_global_state.c
@@ -38,6 +38,11 @@
             (__i)++) \
                for_each_if(obj)
 
+struct intel_global_objs_state {
+       struct intel_global_obj *ptr;
+       struct intel_global_state *state, *old_state, *new_state;
+};
+
 struct intel_global_commit {
        struct kref ref;
        struct completion done;
@@ -173,7 +178,7 @@ intel_atomic_get_global_obj_state(struct intel_atomic_state *state,
        struct intel_display *display = to_intel_display(state);
        int index, num_objs, i;
        size_t size;
-       struct __intel_global_objs_state *arr;
+       struct intel_global_objs_state *arr;
        struct intel_global_state *obj_state;
 
        for (i = 0; i < state->num_global_objs; i++)

diff --git a/drivers/gpu/drm/i915/display/intel_global_state.h b/drivers/gpu/drm/i915/display/intel_global_state.h
index e24fea1c9dbc78fa098442f97cb12aa0ba66acbb..4f304e2c47e07a20320a7a21ed6445c79b5915e5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_global_state.h
+++ b/drivers/gpu/drm/i915/display/intel_global_state.h
@@ -36,11 +36,6 @@ struct intel_global_state {
        bool changed, serialized;
 };
 
-struct __intel_global_objs_state {
-       struct intel_global_obj *ptr;
-       struct intel_global_state *state, *old_state, *new_state;
-};
-
 void intel_atomic_global_obj_init(struct intel_display *display,
                                  struct intel_global_obj *obj,
                                  struct intel_global_state *state,