On Fri, 30 Jan 2026, Uma Shankar <[email protected]> wrote: > There are certain register definitions which are commonly shared > by i915, xe and display. Extract the same to a common header to > avoid duplication. > > Move GEN6_PCODE_MAILBOX to common pcode header to make intel_cdclk.c > free from including i915_reg.h. > > v2: Make the header granular and per feature (Jani) > > Signed-off-by: Uma Shankar <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- > drivers/gpu/drm/i915/i915_reg.h | 101 +------------------ > include/drm/intel/intel_pcode.h | 108 +++++++++++++++++++++ > 3 files changed, 110 insertions(+), 101 deletions(-) > create mode 100644 include/drm/intel/intel_pcode.h > > diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c > b/drivers/gpu/drm/i915/display/intel_cdclk.c > index 9217050a76e0..606256027264 100644 > --- a/drivers/gpu/drm/i915/display/intel_cdclk.c > +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c > @@ -27,9 +27,9 @@ > > #include <drm/drm_fixed.h> > #include <drm/drm_print.h> > +#include <drm/intel/intel_pcode.h> > > #include "hsw_ips.h" > -#include "i915_reg.h" > #include "intel_atomic.h" > #include "intel_audio.h" > #include "intel_cdclk.h" > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 26e5504dbc67..c7361e82a0c6 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -25,6 +25,7 @@ > #ifndef _I915_REG_H_ > #define _I915_REG_H_ > > +#include <drm/intel/intel_pcode.h>
I was thinking it would be better to include this only where needed, not from i915_reg.h. It also improves granularity. > diff --git a/include/drm/intel/intel_pcode.h b/include/drm/intel/intel_pcode.h > new file mode 100644 > index 000000000000..8e9a574c87d9 > --- /dev/null > +++ b/include/drm/intel/intel_pcode.h Maybe call it intel_pcode_regs.h to emphasize it's only about registers? > @@ -0,0 +1,108 @@ > +/* SPDX-License-Identifier: MIT */ > +/* Copyright © 2026 Intel Corporation */ > + > +#ifndef _INTEL_GMD_COMMON_REG_H_ > +#define _INTEL_GMD_COMMON_REG_H_ Please adjust this too. BR, Jani. -- Jani Nikula, Intel
