> Subject: [PATCH 1/4] drm/i915/display: move enum aux_ch to > intel_display_limits.h > > Move enum aux_ch from intel_display.h to intel_display_limits.h to avoid > having to include the former from gvt. This currently happens via > intel_display_types.h, which we can also drop in favour of > intel_display_limits.h > in intel_gvt_mmio_table.c. > > Cc: Ankit Nautiyal <[email protected]> > Signed-off-by: Jani Nikula <[email protected]>
LGTM, Reviewed-by: Suraj Kandpal <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_display.h | 26 ------------------- > .../drm/i915/display/intel_display_limits.h | 26 +++++++++++++++++++ > drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 2 +- > 3 files changed, 27 insertions(+), 27 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.h > b/drivers/gpu/drm/i915/display/intel_display.h > index f8e6e4e82722..4cced16af8ce 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -135,32 +135,6 @@ enum tc_port { > I915_MAX_TC_PORTS > }; > > -enum aux_ch { > - AUX_CH_NONE = -1, > - > - AUX_CH_A, > - AUX_CH_B, > - AUX_CH_C, > - AUX_CH_D, > - AUX_CH_E, /* ICL+ */ > - AUX_CH_F, > - AUX_CH_G, > - AUX_CH_H, > - AUX_CH_I, > - > - /* tgl+ */ > - AUX_CH_USBC1 = AUX_CH_D, > - AUX_CH_USBC2, > - AUX_CH_USBC3, > - AUX_CH_USBC4, > - AUX_CH_USBC5, > - AUX_CH_USBC6, > - > - /* XE_LPD repositions D/E offsets and bitfields */ > - AUX_CH_D_XELPD = AUX_CH_USBC5, > - AUX_CH_E_XELPD, > -}; > - > enum phy { > PHY_NONE = -1, > > diff --git a/drivers/gpu/drm/i915/display/intel_display_limits.h > b/drivers/gpu/drm/i915/display/intel_display_limits.h > index cb3c9c665c44..453f7b720815 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_limits.h > +++ b/drivers/gpu/drm/i915/display/intel_display_limits.h > @@ -138,6 +138,32 @@ enum hpd_pin { > HPD_NUM_PINS > }; > > +enum aux_ch { > + AUX_CH_NONE = -1, > + > + AUX_CH_A, > + AUX_CH_B, > + AUX_CH_C, > + AUX_CH_D, > + AUX_CH_E, /* ICL+ */ > + AUX_CH_F, > + AUX_CH_G, > + AUX_CH_H, > + AUX_CH_I, > + > + /* tgl+ */ > + AUX_CH_USBC1 = AUX_CH_D, > + AUX_CH_USBC2, > + AUX_CH_USBC3, > + AUX_CH_USBC4, > + AUX_CH_USBC5, > + AUX_CH_USBC6, > + > + /* XE_LPD repositions D/E offsets and bitfields */ > + AUX_CH_D_XELPD = AUX_CH_USBC5, > + AUX_CH_E_XELPD, > +}; > + > enum intel_color_block { > INTEL_PLANE_CB_PRE_CSC_LUT, > INTEL_PLANE_CB_CSC, > diff --git a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c > b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c > index 052596ac83a0..c0154fd77fc9 100644 > --- a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c > +++ b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c > @@ -11,8 +11,8 @@ > #include "display/intel_color_regs.h" > #include "display/intel_crt_regs.h" > #include "display/intel_cursor_regs.h" > +#include "display/intel_display_limits.h" > #include "display/intel_display_regs.h" > -#include "display/intel_display_types.h" > #include "display/intel_dmc_regs.h" > #include "display/intel_dp_aux_regs.h" > #include "display/intel_dpio_phy.h" > -- > 2.47.3
