Skip to content

Commit 3c7bbd4

Browse files
jnikulajnikula
committed
drm/i915: stop redefining INTEL_VGA_DEVICE
Now that the PCI ID macros allow us to pass in the macro to use, stop redefining INTEL_VGA_DEVICE. Cc: Lucas De Marchi <[email protected]> Cc: Rodrigo Vivi <[email protected]> Reviewed-by: Rodrigo Vivi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Jani Nikula <[email protected]>
1 parent cfa7772 commit 3c7bbd4

File tree

2 files changed

+88
-90
lines changed

2 files changed

+88
-90
lines changed

‎drivers/gpu/drm/i915/display/intel_display_device.c

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -795,55 +795,54 @@ static bool has_no_display(struct pci_dev *pdev)
795795
return pci_match_id(ids, pdev);
796796
}
797797

798-
#undef INTEL_VGA_DEVICE
799-
#define INTEL_VGA_DEVICE(id, info) { id, info }
798+
#define INTEL_DISPLAY_DEVICE(_id, _info) { .devid = (_id), .info = (_info) }
800799

801800
static const struct {
802801
u32 devid;
803802
const struct intel_display_device_info *info;
804803
} intel_display_ids[] = {
805-
INTEL_I830_IDS(INTEL_VGA_DEVICE, &i830_display),
806-
INTEL_I845G_IDS(INTEL_VGA_DEVICE, &i845_display),
807-
INTEL_I85X_IDS(INTEL_VGA_DEVICE, &i85x_display),
808-
INTEL_I865G_IDS(INTEL_VGA_DEVICE, &i865g_display),
809-
INTEL_I915G_IDS(INTEL_VGA_DEVICE, &i915g_display),
810-
INTEL_I915GM_IDS(INTEL_VGA_DEVICE, &i915gm_display),
811-
INTEL_I945G_IDS(INTEL_VGA_DEVICE, &i945g_display),
812-
INTEL_I945GM_IDS(INTEL_VGA_DEVICE, &i945gm_display),
813-
INTEL_I965G_IDS(INTEL_VGA_DEVICE, &i965g_display),
814-
INTEL_G33_IDS(INTEL_VGA_DEVICE, &g33_display),
815-
INTEL_I965GM_IDS(INTEL_VGA_DEVICE, &i965gm_display),
816-
INTEL_GM45_IDS(INTEL_VGA_DEVICE, &gm45_display),
817-
INTEL_G45_IDS(INTEL_VGA_DEVICE, &g45_display),
818-
INTEL_PNV_IDS(INTEL_VGA_DEVICE, &pnv_display),
819-
INTEL_ILK_D_IDS(INTEL_VGA_DEVICE, &ilk_d_display),
820-
INTEL_ILK_M_IDS(INTEL_VGA_DEVICE, &ilk_m_display),
821-
INTEL_SNB_IDS(INTEL_VGA_DEVICE, &snb_display),
822-
INTEL_IVB_IDS(INTEL_VGA_DEVICE, &ivb_display),
823-
INTEL_HSW_IDS(INTEL_VGA_DEVICE, &hsw_display),
824-
INTEL_VLV_IDS(INTEL_VGA_DEVICE, &vlv_display),
825-
INTEL_BDW_IDS(INTEL_VGA_DEVICE, &bdw_display),
826-
INTEL_CHV_IDS(INTEL_VGA_DEVICE, &chv_display),
827-
INTEL_SKL_IDS(INTEL_VGA_DEVICE, &skl_display),
828-
INTEL_BXT_IDS(INTEL_VGA_DEVICE, &bxt_display),
829-
INTEL_GLK_IDS(INTEL_VGA_DEVICE, &glk_display),
830-
INTEL_KBL_IDS(INTEL_VGA_DEVICE, &skl_display),
831-
INTEL_CFL_IDS(INTEL_VGA_DEVICE, &skl_display),
832-
INTEL_WHL_IDS(INTEL_VGA_DEVICE, &skl_display),
833-
INTEL_CML_IDS(INTEL_VGA_DEVICE, &skl_display),
834-
INTEL_ICL_IDS(INTEL_VGA_DEVICE, &icl_display),
835-
INTEL_EHL_IDS(INTEL_VGA_DEVICE, &jsl_ehl_display),
836-
INTEL_JSL_IDS(INTEL_VGA_DEVICE, &jsl_ehl_display),
837-
INTEL_TGL_IDS(INTEL_VGA_DEVICE, &tgl_display),
838-
INTEL_DG1_IDS(INTEL_VGA_DEVICE, &dg1_display),
839-
INTEL_RKL_IDS(INTEL_VGA_DEVICE, &rkl_display),
840-
INTEL_ADLS_IDS(INTEL_VGA_DEVICE, &adl_s_display),
841-
INTEL_RPLS_IDS(INTEL_VGA_DEVICE, &adl_s_display),
842-
INTEL_ADLP_IDS(INTEL_VGA_DEVICE, &xe_lpd_display),
843-
INTEL_ADLN_IDS(INTEL_VGA_DEVICE, &xe_lpd_display),
844-
INTEL_RPLU_IDS(INTEL_VGA_DEVICE, &xe_lpd_display),
845-
INTEL_RPLP_IDS(INTEL_VGA_DEVICE, &xe_lpd_display),
846-
INTEL_DG2_IDS(INTEL_VGA_DEVICE, &xe_hpd_display),
804+
INTEL_I830_IDS(INTEL_DISPLAY_DEVICE, &i830_display),
805+
INTEL_I845G_IDS(INTEL_DISPLAY_DEVICE, &i845_display),
806+
INTEL_I85X_IDS(INTEL_DISPLAY_DEVICE, &i85x_display),
807+
INTEL_I865G_IDS(INTEL_DISPLAY_DEVICE, &i865g_display),
808+
INTEL_I915G_IDS(INTEL_DISPLAY_DEVICE, &i915g_display),
809+
INTEL_I915GM_IDS(INTEL_DISPLAY_DEVICE, &i915gm_display),
810+
INTEL_I945G_IDS(INTEL_DISPLAY_DEVICE, &i945g_display),
811+
INTEL_I945GM_IDS(INTEL_DISPLAY_DEVICE, &i945gm_display),
812+
INTEL_I965G_IDS(INTEL_DISPLAY_DEVICE, &i965g_display),
813+
INTEL_G33_IDS(INTEL_DISPLAY_DEVICE, &g33_display),
814+
INTEL_I965GM_IDS(INTEL_DISPLAY_DEVICE, &i965gm_display),
815+
INTEL_GM45_IDS(INTEL_DISPLAY_DEVICE, &gm45_display),
816+
INTEL_G45_IDS(INTEL_DISPLAY_DEVICE, &g45_display),
817+
INTEL_PNV_IDS(INTEL_DISPLAY_DEVICE, &pnv_display),
818+
INTEL_ILK_D_IDS(INTEL_DISPLAY_DEVICE, &ilk_d_display),
819+
INTEL_ILK_M_IDS(INTEL_DISPLAY_DEVICE, &ilk_m_display),
820+
INTEL_SNB_IDS(INTEL_DISPLAY_DEVICE, &snb_display),
821+
INTEL_IVB_IDS(INTEL_DISPLAY_DEVICE, &ivb_display),
822+
INTEL_HSW_IDS(INTEL_DISPLAY_DEVICE, &hsw_display),
823+
INTEL_VLV_IDS(INTEL_DISPLAY_DEVICE, &vlv_display),
824+
INTEL_BDW_IDS(INTEL_DISPLAY_DEVICE, &bdw_display),
825+
INTEL_CHV_IDS(INTEL_DISPLAY_DEVICE, &chv_display),
826+
INTEL_SKL_IDS(INTEL_DISPLAY_DEVICE, &skl_display),
827+
INTEL_BXT_IDS(INTEL_DISPLAY_DEVICE, &bxt_display),
828+
INTEL_GLK_IDS(INTEL_DISPLAY_DEVICE, &glk_display),
829+
INTEL_KBL_IDS(INTEL_DISPLAY_DEVICE, &skl_display),
830+
INTEL_CFL_IDS(INTEL_DISPLAY_DEVICE, &skl_display),
831+
INTEL_WHL_IDS(INTEL_DISPLAY_DEVICE, &skl_display),
832+
INTEL_CML_IDS(INTEL_DISPLAY_DEVICE, &skl_display),
833+
INTEL_ICL_IDS(INTEL_DISPLAY_DEVICE, &icl_display),
834+
INTEL_EHL_IDS(INTEL_DISPLAY_DEVICE, &jsl_ehl_display),
835+
INTEL_JSL_IDS(INTEL_DISPLAY_DEVICE, &jsl_ehl_display),
836+
INTEL_TGL_IDS(INTEL_DISPLAY_DEVICE, &tgl_display),
837+
INTEL_DG1_IDS(INTEL_DISPLAY_DEVICE, &dg1_display),
838+
INTEL_RKL_IDS(INTEL_DISPLAY_DEVICE, &rkl_display),
839+
INTEL_ADLS_IDS(INTEL_DISPLAY_DEVICE, &adl_s_display),
840+
INTEL_RPLS_IDS(INTEL_DISPLAY_DEVICE, &adl_s_display),
841+
INTEL_ADLP_IDS(INTEL_DISPLAY_DEVICE, &xe_lpd_display),
842+
INTEL_ADLN_IDS(INTEL_DISPLAY_DEVICE, &xe_lpd_display),
843+
INTEL_RPLU_IDS(INTEL_DISPLAY_DEVICE, &xe_lpd_display),
844+
INTEL_RPLP_IDS(INTEL_DISPLAY_DEVICE, &xe_lpd_display),
845+
INTEL_DG2_IDS(INTEL_DISPLAY_DEVICE, &xe_hpd_display),
847846

848847
/*
849848
* Do not add any GMD_ID-based platforms to this list. They will

‎drivers/gpu/drm/i915/intel_device_info.c

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -127,81 +127,80 @@ void intel_device_info_print(const struct intel_device_info *info,
127127
drm_printf(p, "rawclk rate: %u kHz\n", runtime->rawclk_freq);
128128
}
129129

130-
#undef INTEL_VGA_DEVICE
131-
#define INTEL_VGA_DEVICE(id, info) (id)
130+
#define ID(id) (id)
132131

133132
static const u16 subplatform_ult_ids[] = {
134-
INTEL_HSW_ULT_GT1_IDS(INTEL_VGA_DEVICE, 0),
135-
INTEL_HSW_ULT_GT2_IDS(INTEL_VGA_DEVICE, 0),
136-
INTEL_HSW_ULT_GT3_IDS(INTEL_VGA_DEVICE, 0),
137-
INTEL_BDW_ULT_GT1_IDS(INTEL_VGA_DEVICE, 0),
138-
INTEL_BDW_ULT_GT2_IDS(INTEL_VGA_DEVICE, 0),
139-
INTEL_BDW_ULT_GT3_IDS(INTEL_VGA_DEVICE, 0),
140-
INTEL_BDW_ULT_RSVD_IDS(INTEL_VGA_DEVICE, 0),
141-
INTEL_SKL_ULT_GT1_IDS(INTEL_VGA_DEVICE, 0),
142-
INTEL_SKL_ULT_GT2_IDS(INTEL_VGA_DEVICE, 0),
143-
INTEL_SKL_ULT_GT3_IDS(INTEL_VGA_DEVICE, 0),
144-
INTEL_KBL_ULT_GT1_IDS(INTEL_VGA_DEVICE, 0),
145-
INTEL_KBL_ULT_GT2_IDS(INTEL_VGA_DEVICE, 0),
146-
INTEL_KBL_ULT_GT3_IDS(INTEL_VGA_DEVICE, 0),
147-
INTEL_CFL_U_GT2_IDS(INTEL_VGA_DEVICE, 0),
148-
INTEL_CFL_U_GT3_IDS(INTEL_VGA_DEVICE, 0),
149-
INTEL_WHL_U_GT1_IDS(INTEL_VGA_DEVICE, 0),
150-
INTEL_WHL_U_GT2_IDS(INTEL_VGA_DEVICE, 0),
151-
INTEL_WHL_U_GT3_IDS(INTEL_VGA_DEVICE, 0),
152-
INTEL_CML_U_GT1_IDS(INTEL_VGA_DEVICE, 0),
153-
INTEL_CML_U_GT2_IDS(INTEL_VGA_DEVICE, 0),
133+
INTEL_HSW_ULT_GT1_IDS(ID),
134+
INTEL_HSW_ULT_GT2_IDS(ID),
135+
INTEL_HSW_ULT_GT3_IDS(ID),
136+
INTEL_BDW_ULT_GT1_IDS(ID),
137+
INTEL_BDW_ULT_GT2_IDS(ID),
138+
INTEL_BDW_ULT_GT3_IDS(ID),
139+
INTEL_BDW_ULT_RSVD_IDS(ID),
140+
INTEL_SKL_ULT_GT1_IDS(ID),
141+
INTEL_SKL_ULT_GT2_IDS(ID),
142+
INTEL_SKL_ULT_GT3_IDS(ID),
143+
INTEL_KBL_ULT_GT1_IDS(ID),
144+
INTEL_KBL_ULT_GT2_IDS(ID),
145+
INTEL_KBL_ULT_GT3_IDS(ID),
146+
INTEL_CFL_U_GT2_IDS(ID),
147+
INTEL_CFL_U_GT3_IDS(ID),
148+
INTEL_WHL_U_GT1_IDS(ID),
149+
INTEL_WHL_U_GT2_IDS(ID),
150+
INTEL_WHL_U_GT3_IDS(ID),
151+
INTEL_CML_U_GT1_IDS(ID),
152+
INTEL_CML_U_GT2_IDS(ID),
154153
};
155154

156155
static const u16 subplatform_ulx_ids[] = {
157-
INTEL_HSW_ULX_GT1_IDS(INTEL_VGA_DEVICE, 0),
158-
INTEL_HSW_ULX_GT2_IDS(INTEL_VGA_DEVICE, 0),
159-
INTEL_BDW_ULX_GT1_IDS(INTEL_VGA_DEVICE, 0),
160-
INTEL_BDW_ULX_GT2_IDS(INTEL_VGA_DEVICE, 0),
161-
INTEL_BDW_ULX_GT3_IDS(INTEL_VGA_DEVICE, 0),
162-
INTEL_BDW_ULX_RSVD_IDS(INTEL_VGA_DEVICE, 0),
163-
INTEL_SKL_ULX_GT1_IDS(INTEL_VGA_DEVICE, 0),
164-
INTEL_SKL_ULX_GT2_IDS(INTEL_VGA_DEVICE, 0),
165-
INTEL_KBL_ULX_GT1_IDS(INTEL_VGA_DEVICE, 0),
166-
INTEL_KBL_ULX_GT2_IDS(INTEL_VGA_DEVICE, 0),
167-
INTEL_AML_KBL_GT2_IDS(INTEL_VGA_DEVICE, 0),
168-
INTEL_AML_CFL_GT2_IDS(INTEL_VGA_DEVICE, 0),
156+
INTEL_HSW_ULX_GT1_IDS(ID),
157+
INTEL_HSW_ULX_GT2_IDS(ID),
158+
INTEL_BDW_ULX_GT1_IDS(ID),
159+
INTEL_BDW_ULX_GT2_IDS(ID),
160+
INTEL_BDW_ULX_GT3_IDS(ID),
161+
INTEL_BDW_ULX_RSVD_IDS(ID),
162+
INTEL_SKL_ULX_GT1_IDS(ID),
163+
INTEL_SKL_ULX_GT2_IDS(ID),
164+
INTEL_KBL_ULX_GT1_IDS(ID),
165+
INTEL_KBL_ULX_GT2_IDS(ID),
166+
INTEL_AML_KBL_GT2_IDS(ID),
167+
INTEL_AML_CFL_GT2_IDS(ID),
169168
};
170169

171170
static const u16 subplatform_portf_ids[] = {
172-
INTEL_ICL_PORT_F_IDS(INTEL_VGA_DEVICE, 0),
171+
INTEL_ICL_PORT_F_IDS(ID),
173172
};
174173

175174
static const u16 subplatform_uy_ids[] = {
176-
INTEL_TGL_GT2_IDS(INTEL_VGA_DEVICE, 0),
175+
INTEL_TGL_GT2_IDS(ID),
177176
};
178177

179178
static const u16 subplatform_n_ids[] = {
180-
INTEL_ADLN_IDS(INTEL_VGA_DEVICE, 0),
179+
INTEL_ADLN_IDS(ID),
181180
};
182181

183182
static const u16 subplatform_rpl_ids[] = {
184-
INTEL_RPLS_IDS(INTEL_VGA_DEVICE, 0),
185-
INTEL_RPLU_IDS(INTEL_VGA_DEVICE, 0),
186-
INTEL_RPLP_IDS(INTEL_VGA_DEVICE, 0),
183+
INTEL_RPLS_IDS(ID),
184+
INTEL_RPLU_IDS(ID),
185+
INTEL_RPLP_IDS(ID),
187186
};
188187

189188
static const u16 subplatform_rplu_ids[] = {
190-
INTEL_RPLU_IDS(INTEL_VGA_DEVICE, 0),
189+
INTEL_RPLU_IDS(ID),
191190
};
192191

193192
static const u16 subplatform_g10_ids[] = {
194-
INTEL_DG2_G10_IDS(INTEL_VGA_DEVICE, 0),
195-
INTEL_ATS_M150_IDS(INTEL_VGA_DEVICE, 0),
193+
INTEL_DG2_G10_IDS(ID),
194+
INTEL_ATS_M150_IDS(ID),
196195
};
197196

198197
static const u16 subplatform_g11_ids[] = {
199-
INTEL_DG2_G11_IDS(INTEL_VGA_DEVICE, 0),
200-
INTEL_ATS_M75_IDS(INTEL_VGA_DEVICE, 0),
198+
INTEL_DG2_G11_IDS(ID),
199+
INTEL_ATS_M75_IDS(ID),
201200
};
202201

203202
static const u16 subplatform_g12_ids[] = {
204-
INTEL_DG2_G12_IDS(INTEL_VGA_DEVICE, 0),
203+
INTEL_DG2_G12_IDS(ID),
205204
};
206205

207206
static bool find_devid(u16 id, const u16 *p, unsigned int num)

0 commit comments

Comments
 (0)