On Fri, 31 May 2024, Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> wrote: > On Wed, May 29, 2024 at 08:48:09PM +0300, Jani Nikula wrote: >> Include what you use. With this, we can drop the include along with >> xe_step.h from xe compat i915_drv.h. > > it was hard to see this one... > > 'intel_display_step' inside the intel_step component is not the right way. > > we should probably move intel_display_step_name to intel_dmc.c which is the > only user. It's a bit of a bummer. Looks like we'll need to have this duplicated in i915, xe, and display. :/ > > But this can be a follow up since for that we will still need the intel_step.h > include in here. > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > >> >> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> >> --- >> drivers/gpu/drm/i915/display/intel_dmc.c | 1 + >> drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 2 -- >> 2 files changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c >> index b5ebb0f5b269..852c11aa3205 100644 >> --- a/drivers/gpu/drm/i915/display/intel_dmc.c >> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c >> @@ -31,6 +31,7 @@ >> #include "intel_de.h" >> #include "intel_dmc.h" >> #include "intel_dmc_regs.h" >> +#include "intel_step.h" >> >> /** >> * DOC: DMC Firmware Support >> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h >> index e5966f07a924..3e930ce25c90 100644 >> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h >> +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h >> @@ -18,10 +18,8 @@ >> #include "xe_device.h" >> #include "xe_bo.h" >> #include "xe_pm.h" >> -#include "xe_step.h" >> #include "i915_reg_defs.h" >> #include "i915_utils.h" >> -#include "intel_step.h" >> #include "intel_runtime_pm.h" >> #include <linux/pm_runtime.h> >> >> -- >> 2.39.2 >> -- Jani Nikula, Intel
