Re: [Intel-gfx] [PATCH 3/3] drm/i915/bios: make the aux channel macros private to the vbt parser
On Thu, 15 Nov 2018, Jani Nikula wrote: > On Thu, 15 Nov 2018, Imre Deak wrote: >> On Thu, Nov 15, 2018 at 12:52:37PM +0200, Jani Nikula wrote: >>> Hide the aux channel macros in intel_vbt_defs.h now that their use has >>> been abstracted in intel_bios_port_aux_ch(). >>> >>> Cc: Imre Deak >>> Signed-off-by: Jani Nikula >>> --- >>> drivers/gpu/drm/i915/i915_drv.h | 7 --- >>> drivers/gpu/drm/i915/intel_vbt_defs.h | 7 +++ >>> 2 files changed, 7 insertions(+), 7 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/i915/i915_drv.h >>> b/drivers/gpu/drm/i915/i915_drv.h >>> index d100c38697ff..d69b71d368d3 100644 >>> --- a/drivers/gpu/drm/i915/i915_drv.h >>> +++ b/drivers/gpu/drm/i915/i915_drv.h >>> @@ -1053,13 +1053,6 @@ struct i915_gem_mm { >>> >>> #define I915_ENGINE_WEDGED_TIMEOUT (60 * HZ) /* Reset but no recovery? */ >>> >>> -#define DP_AUX_A 0x40 >>> -#define DP_AUX_B 0x10 >>> -#define DP_AUX_C 0x20 >>> -#define DP_AUX_D 0x30 >>> -#define DP_AUX_E 0x50 >>> -#define DP_AUX_F 0x60 >>> - >>> struct ddi_vbt_port_info { >>> int max_tmds_clock; >>> >>> diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h >>> b/drivers/gpu/drm/i915/intel_vbt_defs.h >>> index bba98cf83cbd..bf3662ad5fed 100644 >>> --- a/drivers/gpu/drm/i915/intel_vbt_defs.h >>> +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h >> >> Unrelated, but this has: >> "This information is private to VBT parsing in intel_bios.c." >> while it's also included from gvt/opregion.c > > Yeah, they wanted to use it for their VBT stuff as well, but should be > isolated. > >> On patches 1-3: >> Reviewed-by: Imre Deak > > Thanks, +pushed > Jani. > >> >> >>> @@ -326,6 +326,13 @@ enum vbt_gmbus_ddi { >>> ICL_DDC_BUS_PORT_4, >>> }; >>> >>> +#define DP_AUX_A 0x40 >>> +#define DP_AUX_B 0x10 >>> +#define DP_AUX_C 0x20 >>> +#define DP_AUX_D 0x30 >>> +#define DP_AUX_E 0x50 >>> +#define DP_AUX_F 0x60 >>> + >>> #define VBT_DP_MAX_LINK_RATE_HBR3 0 >>> #define VBT_DP_MAX_LINK_RATE_HBR2 1 >>> #define VBT_DP_MAX_LINK_RATE_HBR 2 >>> -- >>> 2.11.0 >>> -- Jani Nikula, Intel Open Source Graphics Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 3/3] drm/i915/bios: make the aux channel macros private to the vbt parser
On Thu, 15 Nov 2018, Imre Deak wrote: > On Thu, Nov 15, 2018 at 12:52:37PM +0200, Jani Nikula wrote: >> Hide the aux channel macros in intel_vbt_defs.h now that their use has >> been abstracted in intel_bios_port_aux_ch(). >> >> Cc: Imre Deak >> Signed-off-by: Jani Nikula >> --- >> drivers/gpu/drm/i915/i915_drv.h | 7 --- >> drivers/gpu/drm/i915/intel_vbt_defs.h | 7 +++ >> 2 files changed, 7 insertions(+), 7 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.h >> b/drivers/gpu/drm/i915/i915_drv.h >> index d100c38697ff..d69b71d368d3 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.h >> +++ b/drivers/gpu/drm/i915/i915_drv.h >> @@ -1053,13 +1053,6 @@ struct i915_gem_mm { >> >> #define I915_ENGINE_WEDGED_TIMEOUT (60 * HZ) /* Reset but no recovery? */ >> >> -#define DP_AUX_A 0x40 >> -#define DP_AUX_B 0x10 >> -#define DP_AUX_C 0x20 >> -#define DP_AUX_D 0x30 >> -#define DP_AUX_E 0x50 >> -#define DP_AUX_F 0x60 >> - >> struct ddi_vbt_port_info { >> int max_tmds_clock; >> >> diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h >> b/drivers/gpu/drm/i915/intel_vbt_defs.h >> index bba98cf83cbd..bf3662ad5fed 100644 >> --- a/drivers/gpu/drm/i915/intel_vbt_defs.h >> +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h > > Unrelated, but this has: > "This information is private to VBT parsing in intel_bios.c." > while it's also included from gvt/opregion.c Yeah, they wanted to use it for their VBT stuff as well, but should be isolated. > On patches 1-3: > Reviewed-by: Imre Deak Thanks, Jani. > > >> @@ -326,6 +326,13 @@ enum vbt_gmbus_ddi { >> ICL_DDC_BUS_PORT_4, >> }; >> >> +#define DP_AUX_A 0x40 >> +#define DP_AUX_B 0x10 >> +#define DP_AUX_C 0x20 >> +#define DP_AUX_D 0x30 >> +#define DP_AUX_E 0x50 >> +#define DP_AUX_F 0x60 >> + >> #define VBT_DP_MAX_LINK_RATE_HBR3 0 >> #define VBT_DP_MAX_LINK_RATE_HBR2 1 >> #define VBT_DP_MAX_LINK_RATE_HBR2 >> -- >> 2.11.0 >> -- Jani Nikula, Intel Open Source Graphics Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 3/3] drm/i915/bios: make the aux channel macros private to the vbt parser
On Thu, Nov 15, 2018 at 12:52:37PM +0200, Jani Nikula wrote: > Hide the aux channel macros in intel_vbt_defs.h now that their use has > been abstracted in intel_bios_port_aux_ch(). > > Cc: Imre Deak > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/i915_drv.h | 7 --- > drivers/gpu/drm/i915/intel_vbt_defs.h | 7 +++ > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index d100c38697ff..d69b71d368d3 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1053,13 +1053,6 @@ struct i915_gem_mm { > > #define I915_ENGINE_WEDGED_TIMEOUT (60 * HZ) /* Reset but no recovery? */ > > -#define DP_AUX_A 0x40 > -#define DP_AUX_B 0x10 > -#define DP_AUX_C 0x20 > -#define DP_AUX_D 0x30 > -#define DP_AUX_E 0x50 > -#define DP_AUX_F 0x60 > - > struct ddi_vbt_port_info { > int max_tmds_clock; > > diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h > b/drivers/gpu/drm/i915/intel_vbt_defs.h > index bba98cf83cbd..bf3662ad5fed 100644 > --- a/drivers/gpu/drm/i915/intel_vbt_defs.h > +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h Unrelated, but this has: "This information is private to VBT parsing in intel_bios.c." while it's also included from gvt/opregion.c On patches 1-3: Reviewed-by: Imre Deak > @@ -326,6 +326,13 @@ enum vbt_gmbus_ddi { > ICL_DDC_BUS_PORT_4, > }; > > +#define DP_AUX_A 0x40 > +#define DP_AUX_B 0x10 > +#define DP_AUX_C 0x20 > +#define DP_AUX_D 0x30 > +#define DP_AUX_E 0x50 > +#define DP_AUX_F 0x60 > + > #define VBT_DP_MAX_LINK_RATE_HBR30 > #define VBT_DP_MAX_LINK_RATE_HBR21 > #define VBT_DP_MAX_LINK_RATE_HBR 2 > -- > 2.11.0 > ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx