On Fri, Dec 20, 2019 at 10:01:19AM -0800, Lucas De Marchi wrote:
> On Fri, Dec 20, 2019 at 07:45:38PM +0200, Ville Syrjälä wrote:
> >On Fri, Dec 20, 2019 at 09:27:45AM -0800, Lucas De Marchi wrote:
> >> Drop the intel prefix since all these structs are static and prefer
> >> using the 3-letter prefix for each platform.
> >>
> >> Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
> >> ---
> >> drivers/gpu/drm/i915/i915_pci.c | 230 ++++++++++++++++----------------
> >> 1 file changed, 115 insertions(+), 115 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> >> index 9571611b4b16..4cd25a83e6f1 100644
> >> --- a/drivers/gpu/drm/i915/i915_pci.c
> >> +++ b/drivers/gpu/drm/i915/i915_pci.c
> >> @@ -193,23 +193,23 @@
> >> GEN_DEFAULT_PAGE_SIZES, \
> >> GEN_DEFAULT_REGIONS
> >>
> >> -static const struct intel_device_info intel_i830_info = {
> >> +static const struct intel_device_info i830_info = {
> >> I830_FEATURES,
> >> PLATFORM(INTEL_I830),
> >> };
> >>
> >> -static const struct intel_device_info intel_i845g_info = {
> >> +static const struct intel_device_info i845g_info = {
> >> I845_FEATURES,
> >> PLATFORM(INTEL_I845G),
> >> };
> >>
> >> -static const struct intel_device_info intel_i85x_info = {
> >> +static const struct intel_device_info i85x_info = {
> >> I830_FEATURES,
> >> PLATFORM(INTEL_I85X),
> >> .display.has_fbc = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_i865g_info = {
> >> +static const struct intel_device_info i865g_info = {
> >> I845_FEATURES,
> >> PLATFORM(INTEL_I865G),
> >> };
> >> @@ -228,7 +228,7 @@ static const struct intel_device_info intel_i865g_info = {
> >> GEN_DEFAULT_PAGE_SIZES, \
> >> GEN_DEFAULT_REGIONS
> >>
> >> -static const struct intel_device_info intel_i915g_info = {
> >> +static const struct intel_device_info i915g_info = {
> >> GEN3_FEATURES,
> >> PLATFORM(INTEL_I915G),
> >> .has_coherent_ggtt = false,
> >> @@ -239,7 +239,7 @@ static const struct intel_device_info intel_i915g_info = {
> >> .unfenced_needs_alignment = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_i915gm_info = {
> >> +static const struct intel_device_info i915gm_info = {
> >> GEN3_FEATURES,
> >> PLATFORM(INTEL_I915GM),
> >> .is_mobile = 1,
> >> @@ -252,7 +252,7 @@ static const struct intel_device_info intel_i915gm_info = {
> >> .unfenced_needs_alignment = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_i945g_info = {
> >> +static const struct intel_device_info i945g_info = {
> >> GEN3_FEATURES,
> >> PLATFORM(INTEL_I945G),
> >> .display.has_hotplug = 1,
> >> @@ -263,7 +263,7 @@ static const struct intel_device_info intel_i945g_info = {
> >> .unfenced_needs_alignment = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_i945gm_info = {
> >> +static const struct intel_device_info i945gm_info = {
> >> GEN3_FEATURES,
> >> PLATFORM(INTEL_I945GM),
> >> .is_mobile = 1,
> >> @@ -277,21 +277,21 @@ static const struct intel_device_info intel_i945gm_info = {
> >> .unfenced_needs_alignment = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_g33_info = {
> >> +static const struct intel_device_info g33_info = {
> >> GEN3_FEATURES,
> >> PLATFORM(INTEL_G33),
> >> .display.has_hotplug = 1,
> >> .display.has_overlay = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_pineview_g_info = {
> >> +static const struct intel_device_info pnv_g_info = {
> >> GEN3_FEATURES,
> >> PLATFORM(INTEL_PINEVIEW),
> >> .display.has_hotplug = 1,
> >> .display.has_overlay = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_pineview_m_info = {
> >> +static const struct intel_device_info pnv_m_info = {
> >> GEN3_FEATURES,
> >> PLATFORM(INTEL_PINEVIEW),
> >> .is_mobile = 1,
> >> @@ -314,7 +314,7 @@ static const struct intel_device_info intel_pineview_m_info = {
> >> GEN_DEFAULT_PAGE_SIZES, \
> >> GEN_DEFAULT_REGIONS
> >>
> >> -static const struct intel_device_info intel_i965g_info = {
> >> +static const struct intel_device_info i965g_info = {
> >> GEN4_FEATURES,
> >> PLATFORM(INTEL_I965G),
> >> .display.has_overlay = 1,
> >> @@ -322,7 +322,7 @@ static const struct intel_device_info intel_i965g_info = {
> >> .has_snoop = false,
> >> };
> >>
> >> -static const struct intel_device_info intel_i965gm_info = {
> >> +static const struct intel_device_info i965gm_info = {
> >> GEN4_FEATURES,
> >> PLATFORM(INTEL_I965GM),
> >> .is_mobile = 1,
> >> @@ -333,14 +333,14 @@ static const struct intel_device_info intel_i965gm_info = {
> >> .has_snoop = false,
> >> };
> >>
> >> -static const struct intel_device_info intel_g45_info = {
> >> +static const struct intel_device_info g45_info = {
> >> GEN4_FEATURES,
> >> PLATFORM(INTEL_G45),
> >> .engine_mask = BIT(RCS0) | BIT(VCS0),
> >> .gpu_reset_clobbers_display = false,
> >> };
> >>
> >> -static const struct intel_device_info intel_gm45_info = {
> >> +static const struct intel_device_info gm45_info = {
> >> GEN4_FEATURES,
> >> PLATFORM(INTEL_GM45),
> >> .is_mobile = 1,
> >> @@ -365,12 +365,12 @@ static const struct intel_device_info intel_gm45_info = {
> >> GEN_DEFAULT_PAGE_SIZES, \
> >> GEN_DEFAULT_REGIONS
> >>
> >> -static const struct intel_device_info intel_ironlake_d_info = {
> >> +static const struct intel_device_info ilk_d_info = {
> >> GEN5_FEATURES,
> >> PLATFORM(INTEL_IRONLAKE),
> >> };
> >>
> >> -static const struct intel_device_info intel_ironlake_m_info = {
> >> +static const struct intel_device_info ilk_m_info = {
> >> GEN5_FEATURES,
> >> PLATFORM(INTEL_IRONLAKE),
> >> .is_mobile = 1,
> >> @@ -400,12 +400,12 @@ static const struct intel_device_info intel_ironlake_m_info = {
> >> GEN6_FEATURES, \
> >> PLATFORM(INTEL_SANDYBRIDGE)
> >>
> >> -static const struct intel_device_info intel_sandybridge_d_gt1_info = {
> >> +static const struct intel_device_info snb_d_gt1_info = {
> >> SNB_D_PLATFORM,
> >> .gt = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_sandybridge_d_gt2_info = {
> >> +static const struct intel_device_info snb_d_gt2_info = {
> >> SNB_D_PLATFORM,
> >> .gt = 2,
> >> };
> >> @@ -416,12 +416,12 @@ static const struct intel_device_info intel_sandybridge_d_gt2_info = {
> >> .is_mobile = 1
> >>
> >>
> >> -static const struct intel_device_info intel_sandybridge_m_gt1_info = {
> >> +static const struct intel_device_info snb_m_gt1_info = {
> >> SNB_M_PLATFORM,
> >> .gt = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_sandybridge_m_gt2_info = {
> >> +static const struct intel_device_info snb_m_gt2_info = {
> >> SNB_M_PLATFORM,
> >> .gt = 2,
> >> };
> >> @@ -450,12 +450,12 @@ static const struct intel_device_info intel_sandybridge_m_gt2_info = {
> >> PLATFORM(INTEL_IVYBRIDGE), \
> >> .has_l3_dpf = 1
> >>
> >> -static const struct intel_device_info intel_ivybridge_d_gt1_info = {
> >> +static const struct intel_device_info ivb_d_gt1_info = {
> >> IVB_D_PLATFORM,
> >> .gt = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_ivybridge_d_gt2_info = {
> >> +static const struct intel_device_info ivb_d_gt2_info = {
> >> IVB_D_PLATFORM,
> >> .gt = 2,
> >> };
> >> @@ -466,17 +466,17 @@ static const struct intel_device_info intel_ivybridge_d_gt2_info = {
> >> .is_mobile = 1, \
> >> .has_l3_dpf = 1
> >>
> >> -static const struct intel_device_info intel_ivybridge_m_gt1_info = {
> >> +static const struct intel_device_info ivb_m_gt1_info = {
> >> IVB_M_PLATFORM,
> >> .gt = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_ivybridge_m_gt2_info = {
> >> +static const struct intel_device_info ivb_m_gt2_info = {
> >> IVB_M_PLATFORM,
> >> .gt = 2,
> >> };
> >>
> >> -static const struct intel_device_info intel_ivybridge_q_info = {
> >> +static const struct intel_device_info ivb_q_info = {
> >> GEN7_FEATURES,
> >> PLATFORM(INTEL_IVYBRIDGE),
> >> .gt = 2,
> >> @@ -484,7 +484,7 @@ static const struct intel_device_info intel_ivybridge_q_info = {
> >> .has_l3_dpf = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_valleyview_info = {
> >> +static const struct intel_device_info vlv_info = {
> >> PLATFORM(INTEL_VALLEYVIEW),
> >> GEN(7),
> >> .is_lp = 1,
> >> @@ -523,17 +523,17 @@ static const struct intel_device_info intel_valleyview_info = {
> >> PLATFORM(INTEL_HASWELL), \
> >> .has_l3_dpf = 1
> >>
> >> -static const struct intel_device_info intel_haswell_gt1_info = {
> >> +static const struct intel_device_info hsw_gt1_info = {
> >> HSW_PLATFORM,
> >> .gt = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_haswell_gt2_info = {
> >> +static const struct intel_device_info hsw_gt2_info = {
> >> HSW_PLATFORM,
> >> .gt = 2,
> >> };
> >>
> >> -static const struct intel_device_info intel_haswell_gt3_info = {
> >> +static const struct intel_device_info hsw_gt3_info = {
> >> HSW_PLATFORM,
> >> .gt = 3,
> >> };
> >> @@ -551,17 +551,17 @@ static const struct intel_device_info intel_haswell_gt3_info = {
> >> GEN8_FEATURES, \
> >> PLATFORM(INTEL_BROADWELL)
> >>
> >> -static const struct intel_device_info intel_broadwell_gt1_info = {
> >> +static const struct intel_device_info bdw_gt1_info = {
> >> BDW_PLATFORM,
> >> .gt = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_broadwell_gt2_info = {
> >> +static const struct intel_device_info bdw_gt2_info = {
> >> BDW_PLATFORM,
> >> .gt = 2,
> >> };
> >>
> >> -static const struct intel_device_info intel_broadwell_rsvd_info = {
> >> +static const struct intel_device_info bdw_rsvd_info = {
> >> BDW_PLATFORM,
> >> .gt = 3,
> >> /* According to the device ID those devices are GT3, they were
> >> @@ -569,14 +569,14 @@ static const struct intel_device_info intel_broadwell_rsvd_info = {
> >> */
> >> };
> >>
> >> -static const struct intel_device_info intel_broadwell_gt3_info = {
> >> +static const struct intel_device_info bdw_gt3_info = {
> >> BDW_PLATFORM,
> >> .gt = 3,
> >> .engine_mask =
> >> BIT(RCS0) | BIT(VCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS1),
> >> };
> >>
> >> -static const struct intel_device_info intel_cherryview_info = {
> >> +static const struct intel_device_info chv_info = {
> >> PLATFORM(INTEL_CHERRYVIEW),
> >> GEN(8),
> >> .pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C),
> >> @@ -621,12 +621,12 @@ static const struct intel_device_info intel_cherryview_info = {
> >> GEN9_FEATURES, \
> >> PLATFORM(INTEL_SKYLAKE)
> >>
> >> -static const struct intel_device_info intel_skylake_gt1_info = {
> >> +static const struct intel_device_info skl_gt1_info = {
> >> SKL_PLATFORM,
> >> .gt = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_skylake_gt2_info = {
> >> +static const struct intel_device_info skl_gt2_info = {
> >> SKL_PLATFORM,
> >> .gt = 2,
> >> };
> >> @@ -637,12 +637,12 @@ static const struct intel_device_info intel_skylake_gt2_info = {
> >> BIT(RCS0) | BIT(VCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS1)
> >>
> >>
> >> -static const struct intel_device_info intel_skylake_gt3_info = {
> >> +static const struct intel_device_info skl_gt3_info = {
> >> SKL_GT3_PLUS_PLATFORM,
> >> .gt = 3,
> >> };
> >>
> >> -static const struct intel_device_info intel_skylake_gt4_info = {
> >> +static const struct intel_device_info skl_gt4_info = {
> >> SKL_GT3_PLUS_PLATFORM,
> >> .gt = 4,
> >> };
> >> @@ -679,13 +679,13 @@ static const struct intel_device_info intel_skylake_gt4_info = {
> >> GEN9_DEFAULT_PAGE_SIZES, \
> >> GEN_DEFAULT_REGIONS
> >>
> >> -static const struct intel_device_info intel_broxton_info = {
> >> +static const struct intel_device_info bxt_info = {
> >> GEN9_LP_FEATURES,
> >> PLATFORM(INTEL_BROXTON),
> >> .ddb_size = 512,
> >> };
> >>
> >> -static const struct intel_device_info intel_geminilake_info = {
> >> +static const struct intel_device_info glk_info = {
> >> GEN9_LP_FEATURES,
> >> PLATFORM(INTEL_GEMINILAKE),
> >> .ddb_size = 1024,
> >> @@ -696,17 +696,17 @@ static const struct intel_device_info intel_geminilake_info = {
> >> GEN9_FEATURES, \
> >> PLATFORM(INTEL_KABYLAKE)
> >>
> >> -static const struct intel_device_info intel_kabylake_gt1_info = {
> >> +static const struct intel_device_info kbl_gt1_info = {
> >> KBL_PLATFORM,
> >> .gt = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_kabylake_gt2_info = {
> >> +static const struct intel_device_info kbl_gt2_info = {
> >> KBL_PLATFORM,
> >> .gt = 2,
> >> };
> >>
> >> -static const struct intel_device_info intel_kabylake_gt3_info = {
> >> +static const struct intel_device_info kbl_gt3_info = {
> >> KBL_PLATFORM,
> >> .gt = 3,
> >> .engine_mask =
> >> @@ -717,17 +717,17 @@ static const struct intel_device_info intel_kabylake_gt3_info = {
> >> GEN9_FEATURES, \
> >> PLATFORM(INTEL_COFFEELAKE)
> >>
> >> -static const struct intel_device_info intel_coffeelake_gt1_info = {
> >> +static const struct intel_device_info cfl_gt1_info = {
> >> CFL_PLATFORM,
> >> .gt = 1,
> >> };
> >>
> >> -static const struct intel_device_info intel_coffeelake_gt2_info = {
> >> +static const struct intel_device_info cfl_gt2_info = {
> >> CFL_PLATFORM,
> >> .gt = 2,
> >> };
> >>
> >> -static const struct intel_device_info intel_coffeelake_gt3_info = {
> >> +static const struct intel_device_info cfl_gt3_info = {
> >> CFL_PLATFORM,
> >> .gt = 3,
> >> .engine_mask =
> >> @@ -742,7 +742,7 @@ static const struct intel_device_info intel_coffeelake_gt3_info = {
> >> .has_coherent_ggtt = false, \
> >> GLK_COLORS
> >>
> >> -static const struct intel_device_info intel_cannonlake_info = {
> >> +static const struct intel_device_info cnl_info = {
> >> GEN10_FEATURES,
> >> PLATFORM(INTEL_CANNONLAKE),
> >> .gt = 2,
> >> @@ -777,14 +777,14 @@ static const struct intel_device_info intel_cannonlake_info = {
> >> .has_logical_ring_elsq = 1, \
> >> .color = { .degamma_lut_size = 33, .gamma_lut_size = 262145 }
> >>
> >> -static const struct intel_device_info intel_icelake_11_info = {
> >> +static const struct intel_device_info icl_11_info = {
> >
> >Why isn't that just icl_info ?
>
> it should be, yes... I had a separate commit to remove the gen from the
> device_info, I guess I dropped it instead of squashing.
You also seem to have dropped Jani's acks.
Anyways, cursory scan seemed good so ack for the seris from me as well.
Acked-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
