On Tue, Aug 09, 2016 at 11:45:08AM -0700, Carlos Santa wrote:
> As recommended by Ville Syrjala removing .is_mobile field from the
> platform struct definition for vlv and hsw+ GPUs as there's no need to
> make the distinction in later hardware anymore. Keep it for older GPUs
> as it is still needed for ilk-ivb.
good idea!
>
> Signed-off-by: Carlos Santa <carlos.santa@xxxxxxxxx>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> ---
> arch/x86/kernel/early-quirks.c | 9 +++------
> drivers/gpu/drm/i915/i915_pci.c | 45 ++++++++---------------------------------
> include/drm/i915_pciids.h | 38 +++++++++++++---------------------
> 3 files changed, 25 insertions(+), 67 deletions(-)
>
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index de7501e..e6bd329 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -512,8 +512,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
> INTEL_I915GM_IDS(&gen3_early_ops),
> INTEL_I945G_IDS(&gen3_early_ops),
> INTEL_I945GM_IDS(&gen3_early_ops),
> - INTEL_VLV_M_IDS(&gen6_early_ops),
> - INTEL_VLV_D_IDS(&gen6_early_ops),
> + INTEL_VLV_IDS(&gen6_early_ops),
> INTEL_PINEVIEW_IDS(&gen3_early_ops),
> INTEL_I965G_IDS(&gen3_early_ops),
> INTEL_G33_IDS(&gen3_early_ops),
> @@ -526,10 +525,8 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
> INTEL_SNB_M_IDS(&gen6_early_ops),
> INTEL_IVB_M_IDS(&gen6_early_ops),
> INTEL_IVB_D_IDS(&gen6_early_ops),
> - INTEL_HSW_D_IDS(&gen6_early_ops),
> - INTEL_HSW_M_IDS(&gen6_early_ops),
> - INTEL_BDW_M_IDS(&gen8_early_ops),
> - INTEL_BDW_D_IDS(&gen8_early_ops),
> + INTEL_HSW_IDS(&gen6_early_ops),
> + INTEL_BDW_IDS(&gen8_early_ops),
> INTEL_CHV_IDS(&chv_early_ops),
> INTEL_SKL_IDS(&gen9_early_ops),
> INTEL_BXT_IDS(&gen9_early_ops),
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index e1caa0b..b5ec8a7 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -250,13 +250,7 @@ static const struct intel_device_info intel_ivybridge_q_info = {
> GEN_DEFAULT_PIPEOFFSETS, \
> CURSOR_OFFSETS
>
> -static const struct intel_device_info intel_valleyview_m_info = {
> - VLV_FEATURES,
> - .is_valleyview = 1,
> - .is_mobile = 1,
> -};
> -
> -static const struct intel_device_info intel_valleyview_d_info = {
> +static const struct intel_device_info intel_valleyview_info = {
> VLV_FEATURES,
> .is_valleyview = 1,
> };
> @@ -268,47 +262,28 @@ static const struct intel_device_info intel_valleyview_d_info = {
> .has_fpga_dbg = 1, \
> .has_psr = 1
>
> -static const struct intel_device_info intel_haswell_d_info = {
> +static const struct intel_device_info intel_haswell_info = {
> HSW_FEATURES,
> .is_haswell = 1,
> };
>
> -static const struct intel_device_info intel_haswell_m_info = {
> - HSW_FEATURES,
> - .is_haswell = 1,
> - .is_mobile = 1,
> -};
> -
> #define BDW_FEATURES \
> HSW_FEATURES, \
> BDW_COLORS
>
> -static const struct intel_device_info intel_broadwell_d_info = {
> +static const struct intel_device_info intel_broadwell_info = {
> BDW_FEATURES,
> .gen = 8,
> .is_broadwell = 1,
> };
>
> -static const struct intel_device_info intel_broadwell_m_info = {
> - BDW_FEATURES,
> - .gen = 8, .is_mobile = 1,
> - .is_broadwell = 1,
> -};
> -
> -static const struct intel_device_info intel_broadwell_gt3d_info = {
> +static const struct intel_device_info intel_broadwell_gt3_info = {
> BDW_FEATURES,
> .gen = 8,
> .is_broadwell = 1,
> .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
> };
>
> -static const struct intel_device_info intel_broadwell_gt3m_info = {
> - BDW_FEATURES,
> - .gen = 8, .is_mobile = 1,
> - .is_broadwell = 1,
> - .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
> -};
> -
> static const struct intel_device_info intel_cherryview_info = {
> .gen = 8, .num_pipes = 3,
> .need_gfx_hws = 1, .has_hotplug = 1,
> @@ -390,14 +365,10 @@ static const struct pci_device_id pciidlist[] = {
> INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */
> INTEL_IVB_M_IDS(&intel_ivybridge_m_info),
> INTEL_IVB_D_IDS(&intel_ivybridge_d_info),
> - INTEL_HSW_D_IDS(&intel_haswell_d_info),
> - INTEL_HSW_M_IDS(&intel_haswell_m_info),
> - INTEL_VLV_M_IDS(&intel_valleyview_m_info),
> - INTEL_VLV_D_IDS(&intel_valleyview_d_info),
> - INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),
> - INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),
> - INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),
> - INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info),
> + INTEL_HSW_IDS(&intel_haswell_info),
> + INTEL_VLV_IDS(&intel_valleyview_info),
> + INTEL_BDW_GT12_IDS(&intel_broadwell_info),
> + INTEL_BDW_GT3_IDS(&intel_broadwell_gt3_info),
> INTEL_CHV_IDS(&intel_cherryview_info),
> INTEL_SKL_GT1_IDS(&intel_skylake_info),
> INTEL_SKL_GT2_IDS(&intel_skylake_info),
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index 33466bf..0d5f426 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -134,7 +134,7 @@
> #define INTEL_IVB_Q_IDS(info) \
> INTEL_QUANTA_VGA_DEVICE(info) /* Quanta transcode */
>
> -#define INTEL_HSW_D_IDS(info) \
> +#define INTEL_HSW_IDS(info) \
> INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
> INTEL_VGA_DEVICE(0x0412, info), /* GT2 desktop */ \
> INTEL_VGA_DEVICE(0x0422, info), /* GT3 desktop */ \
> @@ -179,9 +179,7 @@
> INTEL_VGA_DEVICE(0x0D2B, info), /* CRW GT3 reserved */ \
> INTEL_VGA_DEVICE(0x0D0E, info), /* CRW GT1 reserved */ \
> INTEL_VGA_DEVICE(0x0D1E, info), /* CRW GT2 reserved */ \
> - INTEL_VGA_DEVICE(0x0D2E, info) /* CRW GT3 reserved */ \
> -
> -#define INTEL_HSW_M_IDS(info) \
> + INTEL_VGA_DEVICE(0x0D2E, info), /* CRW GT3 reserved */ \
> INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \
> INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \
> INTEL_VGA_DEVICE(0x0426, info), /* GT2 mobile */ \
> @@ -198,17 +196,15 @@
> INTEL_VGA_DEVICE(0x0D16, info), /* CRW GT2 mobile */ \
> INTEL_VGA_DEVICE(0x0D26, info) /* CRW GT3 mobile */
>
> -#define INTEL_VLV_M_IDS(info) \
> +#define INTEL_VLV_IDS(info) \
> INTEL_VGA_DEVICE(0x0f30, info), \
> INTEL_VGA_DEVICE(0x0f31, info), \
> INTEL_VGA_DEVICE(0x0f32, info), \
> INTEL_VGA_DEVICE(0x0f33, info), \
> - INTEL_VGA_DEVICE(0x0157, info)
> -
> -#define INTEL_VLV_D_IDS(info) \
> + INTEL_VGA_DEVICE(0x0157, info), \
> INTEL_VGA_DEVICE(0x0155, info)
>
> -#define INTEL_BDW_GT12M_IDS(info) \
> +#define INTEL_BDW_GT12_IDS(info) \
> INTEL_VGA_DEVICE(0x1602, info), /* GT1 ULT */ \
> INTEL_VGA_DEVICE(0x1606, info), /* GT1 ULT */ \
> INTEL_VGA_DEVICE(0x160B, info), /* GT1 Iris */ \
> @@ -216,21 +212,17 @@
> INTEL_VGA_DEVICE(0x1612, info), /* GT2 Halo */ \
> INTEL_VGA_DEVICE(0x1616, info), /* GT2 ULT */ \
> INTEL_VGA_DEVICE(0x161B, info), /* GT2 ULT */ \
> - INTEL_VGA_DEVICE(0x161E, info) /* GT2 ULX */
> -
> -#define INTEL_BDW_GT12D_IDS(info) \
> + INTEL_VGA_DEVICE(0x161E, info), /* GT2 ULX */ \
> INTEL_VGA_DEVICE(0x160A, info), /* GT1 Server */ \
> INTEL_VGA_DEVICE(0x160D, info), /* GT1 Workstation */ \
> INTEL_VGA_DEVICE(0x161A, info), /* GT2 Server */ \
> INTEL_VGA_DEVICE(0x161D, info) /* GT2 Workstation */
>
> -#define INTEL_BDW_GT3M_IDS(info) \
> +#define INTEL_BDW_GT3_IDS(info) \
> INTEL_VGA_DEVICE(0x1622, info), /* ULT */ \
> INTEL_VGA_DEVICE(0x1626, info), /* ULT */ \
> INTEL_VGA_DEVICE(0x162B, info), /* Iris */ \
> - INTEL_VGA_DEVICE(0x162E, info) /* ULX */
> -
> -#define INTEL_BDW_GT3D_IDS(info) \
> + INTEL_VGA_DEVICE(0x162E, info), /* ULX */\
> INTEL_VGA_DEVICE(0x162A, info), /* Server */ \
> INTEL_VGA_DEVICE(0x162D, info) /* Workstation */
>
> @@ -244,14 +236,12 @@
> INTEL_VGA_DEVICE(0x163A, info), /* Server */ \
> INTEL_VGA_DEVICE(0x163D, info) /* Workstation */
>
> -#define INTEL_BDW_M_IDS(info) \
> - INTEL_BDW_GT12M_IDS(info), \
> - INTEL_BDW_GT3M_IDS(info), \
> - INTEL_BDW_RSVDM_IDS(info)
> -
> -#define INTEL_BDW_D_IDS(info) \
> - INTEL_BDW_GT12D_IDS(info), \
> - INTEL_BDW_GT3D_IDS(info), \
> +#define INTEL_BDW_IDS(info) \
> + INTEL_BDW_GT12_IDS(info), \
> + INTEL_BDW_GT3_IDS(info), \
> + INTEL_BDW_RSVDM_IDS(info), \
> + INTEL_BDW_GT12_IDS(info), \
> + INTEL_BDW_GT3_IDS(info), \
> INTEL_BDW_RSVDD_IDS(info)
>
> #define INTEL_CHV_IDS(info) \
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
