On Fri, Sep 26, 2025 at 06:11:41PM +0300, Jani Nikula wrote:
On Fri, 26 Sep 2025, Lucas De Marchi <[email protected]> wrote:
On Fri, Sep 26, 2025 at 02:10:32PM +0300, Jani Nikula wrote:
diff --git a/drivers/gpu/drm/i915/display/intel_display_conversion.c
b/drivers/gpu/drm/i915/display/intel_display_conversion.c
index d56065f22655..9a47aa38cf82 100644
--- a/drivers/gpu/drm/i915/display/intel_display_conversion.c
+++ b/drivers/gpu/drm/i915/display/intel_display_conversion.c
@@ -1,15 +1,21 @@
// SPDX-License-Identifier: MIT
/* Copyright © 2024 Intel Corporation */
-#include "i915_drv.h"
-#include "intel_display_conversion.h"
+#include <drm/intel/display_member.h>
-static struct intel_display *__i915_to_display(struct drm_i915_private *i915)
-{
- return i915->display;
-}
+#include "intel_display_conversion.h"
struct intel_display *__drm_to_display(struct drm_device *drm)
it seems like this could be inline in drm/intel/display_member.h
Although it doesn't seem we have many calls to convert from drm to
intel_display, so lgtm as is.
We actually do, lots and lots, via to_intel_display().
I thought about inlining, but decided to leave that for follow-up.
I actually went to check that before commenting... with some false
positives:
$ git grep "to_intel_display(.*drm"
drivers/gpu/drm/i915/display/intel_ddi.c: struct intel_display *display =
to_intel_display(aux->drm_dev);
drivers/gpu/drm/i915/display/intel_display.c: struct intel_display *display =
to_intel_display(drm);
drivers/gpu/drm/i915/display/intel_display_debugfs.c:static struct
intel_display *node_to_intel_display(struct drm_info_node *node)
drivers/gpu/drm/i915/display/intel_dp_link_training.c:
drm_dbg_kms(to_intel_display(_intel_dp)->drm, \
drivers/gpu/drm/i915/display/intel_dp_link_training.c:
drm_err(to_intel_display(_intel_dp)->drm, \
drivers/gpu/drm/i915/display/vlv_clock.c: struct intel_display *display =
to_intel_display(drm);
drivers/gpu/drm/i915/display/vlv_clock.c: struct intel_display *display =
to_intel_display(drm);
drivers/gpu/drm/i915/display/vlv_sideband.c: struct intel_display *display =
to_intel_display(drm);
drivers/gpu/drm/i915/display/vlv_sideband.c: struct intel_display *display =
to_intel_display(drm);
I missed the fact that all the other type conversions also use
the drm -> display. So yes, inlining that would be good.
Lucas De Marchi
Reviewed-by: Lucas De Marchi <[email protected]>
Thanks,
Jani.
--
Jani Nikula, Intel
