drm/i915/display: group and sort the parent interface wrappers better

Aligning with the parent interface struct definitions, also group and
sort the parent interface wrappers to improve clarity on where to add
new stuff.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/b61af1d33d0448cd904cccccb2714f0d07d85b07.1765548786.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_parent.c b/drivers/gpu/drm/i915/display/intel_parent.c
index d1c2194767e7013fb59e6207fa0bce7eec646f70..9b1a84a439e953dd92cbedc31816afeba11c68fd 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_parent.c
+++ b/drivers/gpu/drm/i915/display/intel_parent.c
@@ -23,6 +23,7 @@
 #include "intel_display_core.h"
 #include "intel_parent.h"
 
+/* hdcp */
 ssize_t intel_parent_hdcp_gsc_msg_send(struct intel_display *display,
                                       struct intel_hdcp_gsc_context *gsc_context,
                                       void *msg_in, size_t msg_in_len,
@@ -47,31 +48,34 @@ void intel_parent_hdcp_gsc_context_free(struct intel_display *display,
        display->parent->hdcp->gsc_context_free(gsc_context);
 }
 
-struct intel_panic *intel_parent_panic_alloc(struct intel_display *display)
+/* irq */
+bool intel_parent_irq_enabled(struct intel_display *display)
 {
-       return display->parent->panic->alloc();
+       return display->parent->irq->enabled(display->drm);
 }
 
-int intel_parent_panic_setup(struct intel_display *display, struct intel_panic *panic, struct drm_scanout_buffer *sb)
+void intel_parent_irq_synchronize(struct intel_display *display)
 {
-       return display->parent->panic->setup(panic, sb);
+       display->parent->irq->synchronize(display->drm);
 }
 
-void intel_parent_panic_finish(struct intel_display *display, struct intel_panic *panic)
+/* panic */
+struct intel_panic *intel_parent_panic_alloc(struct intel_display *display)
 {
-       display->parent->panic->finish(panic);
+       return display->parent->panic->alloc();
 }
 
-bool intel_parent_irq_enabled(struct intel_display *display)
+int intel_parent_panic_setup(struct intel_display *display, struct intel_panic *panic, struct drm_scanout_buffer *sb)
 {
-       return display->parent->irq->enabled(display->drm);
+       return display->parent->panic->setup(panic, sb);
 }
 
-void intel_parent_irq_synchronize(struct intel_display *display)
+void intel_parent_panic_finish(struct intel_display *display, struct intel_panic *panic)
 {
-       display->parent->irq->synchronize(display->drm);
+       display->parent->panic->finish(panic);
 }
 
+/* rps */
 bool intel_parent_rps_available(struct intel_display *display)
 {
        return display->parent->rps;
@@ -95,6 +99,7 @@ void intel_parent_rps_ilk_irq_handler(struct intel_display *display)
                display->parent->rps->ilk_irq_handler(display->drm);
 }
 
+/* stolen */
 int intel_parent_stolen_insert_node_in_range(struct intel_display *display,
                                             struct intel_stolen_node *node, u64 size,
                                             unsigned int align, u64 start, u64 end)
@@ -169,24 +174,24 @@ void intel_parent_stolen_node_free(struct intel_display *display, const struct i
        display->parent->stolen->node_free(node);
 }
 
-
-bool intel_parent_vgpu_active(struct intel_display *display)
+/* generic */
+void intel_parent_fence_priority_display(struct intel_display *display, struct dma_fence *fence)
 {
-       return display->parent->vgpu_active && display->parent->vgpu_active(display->drm);
+       if (display->parent->fence_priority_display)
+               display->parent->fence_priority_display(fence);
 }
 
-bool intel_parent_has_fenced_regions(struct intel_display *display)
+bool intel_parent_has_auxccs(struct intel_display *display)
 {
-       return display->parent->has_fenced_regions && display->parent->has_fenced_regions(display->drm);
+       return display->parent->has_auxccs && display->parent->has_auxccs(display->drm);
 }
 
-void intel_parent_fence_priority_display(struct intel_display *display, struct dma_fence *fence)
+bool intel_parent_has_fenced_regions(struct intel_display *display)
 {
-       if (display->parent->fence_priority_display)
-               display->parent->fence_priority_display(fence);
+       return display->parent->has_fenced_regions && display->parent->has_fenced_regions(display->drm);
 }
 
-bool intel_parent_has_auxccs(struct intel_display *display)
+bool intel_parent_vgpu_active(struct intel_display *display)
 {
-       return display->parent->has_auxccs && display->parent->has_auxccs(display->drm);
+       return display->parent->vgpu_active && display->parent->vgpu_active(display->drm);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_parent.h b/drivers/gpu/drm/i915/display/intel_parent.h
index 8cd811d14fb10dfde23e6e722150174fde4ce110..a2a631fba1189c3c413f25332737c11f0f4b768d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_parent.h
+++ b/drivers/gpu/drm/i915/display/intel_parent.h
@@ -13,6 +13,7 @@ struct intel_hdcp_gsc_context;
 struct intel_panic;
 struct intel_stolen_node;
 
+/* hdcp */
 ssize_t intel_parent_hdcp_gsc_msg_send(struct intel_display *display,
                                       struct intel_hdcp_gsc_context *gsc_context,
                                       void *msg_in, size_t msg_in_len,
@@ -22,18 +23,22 @@ struct intel_hdcp_gsc_context *intel_parent_hdcp_gsc_context_alloc(struct intel_
 void intel_parent_hdcp_gsc_context_free(struct intel_display *display,
                                        struct intel_hdcp_gsc_context *gsc_context);
 
+/* irq */
 bool intel_parent_irq_enabled(struct intel_display *display);
 void intel_parent_irq_synchronize(struct intel_display *display);
 
+/* panic */
 struct intel_panic *intel_parent_panic_alloc(struct intel_display *display);
 int intel_parent_panic_setup(struct intel_display *display, struct intel_panic *panic, struct drm_scanout_buffer *sb);
 void intel_parent_panic_finish(struct intel_display *display, struct intel_panic *panic);
 
+/* rps */
 bool intel_parent_rps_available(struct intel_display *display);
 void intel_parent_rps_boost_if_not_started(struct intel_display *display, struct dma_fence *fence);
 void intel_parent_rps_mark_interactive(struct intel_display *display, bool interactive);
 void intel_parent_rps_ilk_irq_handler(struct intel_display *display);
 
+/* stolen */
 int intel_parent_stolen_insert_node_in_range(struct intel_display *display,
                                             struct intel_stolen_node *node, u64 size,
                                             unsigned int align, u64 start, u64 end);
@@ -52,12 +57,10 @@ u64 intel_parent_stolen_node_size(struct intel_display *display, const struct in
 struct intel_stolen_node *intel_parent_stolen_node_alloc(struct intel_display *display);
 void intel_parent_stolen_node_free(struct intel_display *display, const struct intel_stolen_node *node);
 
-bool intel_parent_vgpu_active(struct intel_display *display);
-
+/* generic */
+bool intel_parent_has_auxccs(struct intel_display *display);
 bool intel_parent_has_fenced_regions(struct intel_display *display);
-
+bool intel_parent_vgpu_active(struct intel_display *display);
 void intel_parent_fence_priority_display(struct intel_display *display, struct dma_fence *fence);
 
-bool intel_parent_has_auxccs(struct intel_display *display);
-
 #endif /* __INTEL_PARENT_H__ */