mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "drm/i915: mark all device info struct with __initconst"

Browse source 
This reverts commit 5b54eddd39.

 Conflicts:
	drivers/gpu/drm/i915/i915_pci.c

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104805
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Fixes: 5b54eddd39 ("drm/i915: mark all device info struct with __initconst")
Link: https://patchwork.freedesktop.org/patch/msgid/20180129083346.29173-1-lionel.g.landwerlin@intel.com
This commit is contained in:
Lionel Landwerlin 2018-01-29 08:33:46 +00:00
parent 1d2a19c256
commit 5db47e37b3
1 changed files with 48 additions and 48 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

96
drivers/gpu/drm/i915/i915_pci.c
View file

@ -74,19 +74,19 @@
GEN_DEFAULT_PAGE_SIZES, \ GEN_DEFAULT_PAGE_SIZES, \
CURSOR_OFFSETS CURSOR_OFFSETS
static const struct intel_device_info intel_i830_info __initconst = { static const struct intel_device_info intel_i830_info = {
GEN2_FEATURES, GEN2_FEATURES,
.platform = INTEL_I830, .platform = INTEL_I830,
.is_mobile = 1, .cursor_needs_physical = 1, .is_mobile = 1, .cursor_needs_physical = 1,
.num_pipes = 2, /* legal, last one wins */ .num_pipes = 2, /* legal, last one wins */
}; };
static const struct intel_device_info intel_i845g_info __initconst = { static const struct intel_device_info intel_i845g_info = {
GEN2_FEATURES, GEN2_FEATURES,
.platform = INTEL_I845G, .platform = INTEL_I845G,
}; };
static const struct intel_device_info intel_i85x_info __initconst = { static const struct intel_device_info intel_i85x_info = {
GEN2_FEATURES, GEN2_FEATURES,
.platform = INTEL_I85X, .is_mobile = 1, .platform = INTEL_I85X, .is_mobile = 1,
.num_pipes = 2, /* legal, last one wins */ .num_pipes = 2, /* legal, last one wins */
@ -94,7 +94,7 @@ static const struct intel_device_info intel_i85x_info __initconst = {
.has_fbc = 1, .has_fbc = 1,
}; };
static const struct intel_device_info intel_i865g_info __initconst = { static const struct intel_device_info intel_i865g_info = {
GEN2_FEATURES, GEN2_FEATURES,
.platform = INTEL_I865G, .platform = INTEL_I865G,
}; };
@ -108,7 +108,7 @@ static const struct intel_device_info intel_i865g_info __initconst = {
GEN_DEFAULT_PAGE_SIZES, \ GEN_DEFAULT_PAGE_SIZES, \
CURSOR_OFFSETS CURSOR_OFFSETS
static const struct intel_device_info intel_i915g_info __initconst = { static const struct intel_device_info intel_i915g_info = {
GEN3_FEATURES, GEN3_FEATURES,
.platform = INTEL_I915G, .cursor_needs_physical = 1, .platform = INTEL_I915G, .cursor_needs_physical = 1,
.has_overlay = 1, .overlay_needs_physical = 1, .has_overlay = 1, .overlay_needs_physical = 1,
@ -116,7 +116,7 @@ static const struct intel_device_info intel_i915g_info __initconst = {
.unfenced_needs_alignment = 1, .unfenced_needs_alignment = 1,
}; };
static const struct intel_device_info intel_i915gm_info __initconst = { static const struct intel_device_info intel_i915gm_info = {
GEN3_FEATURES, GEN3_FEATURES,
.platform = INTEL_I915GM, .platform = INTEL_I915GM,
.is_mobile = 1, .is_mobile = 1,
@ -128,7 +128,7 @@ static const struct intel_device_info intel_i915gm_info __initconst = {
.unfenced_needs_alignment = 1, .unfenced_needs_alignment = 1,
}; };
static const struct intel_device_info intel_i945g_info __initconst = { static const struct intel_device_info intel_i945g_info = {
GEN3_FEATURES, GEN3_FEATURES,
.platform = INTEL_I945G, .platform = INTEL_I945G,
.has_hotplug = 1, .cursor_needs_physical = 1, .has_hotplug = 1, .cursor_needs_physical = 1,
@ -137,7 +137,7 @@ static const struct intel_device_info intel_i945g_info __initconst = {
.unfenced_needs_alignment = 1, .unfenced_needs_alignment = 1,
}; };
static const struct intel_device_info intel_i945gm_info __initconst = { static const struct intel_device_info intel_i945gm_info = {
GEN3_FEATURES, GEN3_FEATURES,
.platform = INTEL_I945GM, .is_mobile = 1, .platform = INTEL_I945GM, .is_mobile = 1,
.has_hotplug = 1, .cursor_needs_physical = 1, .has_hotplug = 1, .cursor_needs_physical = 1,
@ -148,14 +148,14 @@ static const struct intel_device_info intel_i945gm_info __initconst = {
.unfenced_needs_alignment = 1, .unfenced_needs_alignment = 1,
}; };
static const struct intel_device_info intel_g33_info __initconst = { static const struct intel_device_info intel_g33_info = {
GEN3_FEATURES, GEN3_FEATURES,
.platform = INTEL_G33, .platform = INTEL_G33,
.has_hotplug = 1, .has_hotplug = 1,
.has_overlay = 1, .has_overlay = 1,
}; };
static const struct intel_device_info intel_pineview_info __initconst = { static const struct intel_device_info intel_pineview_info = {
GEN3_FEATURES, GEN3_FEATURES,
.platform = INTEL_PINEVIEW, .is_mobile = 1, .platform = INTEL_PINEVIEW, .is_mobile = 1,
.has_hotplug = 1, .has_hotplug = 1,
@ -172,7 +172,7 @@ static const struct intel_device_info intel_pineview_info __initconst = {
GEN_DEFAULT_PAGE_SIZES, \ GEN_DEFAULT_PAGE_SIZES, \
CURSOR_OFFSETS CURSOR_OFFSETS
static const struct intel_device_info intel_i965g_info __initconst = { static const struct intel_device_info intel_i965g_info = {
GEN4_FEATURES, GEN4_FEATURES,
.platform = INTEL_I965G, .platform = INTEL_I965G,
.has_overlay = 1, .has_overlay = 1,
@ -180,7 +180,7 @@ static const struct intel_device_info intel_i965g_info __initconst = {
.has_snoop = false, .has_snoop = false,
}; };
static const struct intel_device_info intel_i965gm_info __initconst = { static const struct intel_device_info intel_i965gm_info = {
GEN4_FEATURES, GEN4_FEATURES,
.platform = INTEL_I965GM, .platform = INTEL_I965GM,
.is_mobile = 1, .has_fbc = 1, .is_mobile = 1, .has_fbc = 1,
@ -190,13 +190,13 @@ static const struct intel_device_info intel_i965gm_info __initconst = {
.has_snoop = false, .has_snoop = false,
}; };
static const struct intel_device_info intel_g45_info __initconst = { static const struct intel_device_info intel_g45_info = {
GEN4_FEATURES, GEN4_FEATURES,
.platform = INTEL_G45, .platform = INTEL_G45,
.ring_mask = RENDER_RING | BSD_RING, .ring_mask = RENDER_RING | BSD_RING,
}; };
static const struct intel_device_info intel_gm45_info __initconst = { static const struct intel_device_info intel_gm45_info = {
GEN4_FEATURES, GEN4_FEATURES,
.platform = INTEL_GM45, .platform = INTEL_GM45,
.is_mobile = 1, .has_fbc = 1, .is_mobile = 1, .has_fbc = 1,
@ -215,12 +215,12 @@ static const struct intel_device_info intel_gm45_info __initconst = {
GEN_DEFAULT_PAGE_SIZES, \ GEN_DEFAULT_PAGE_SIZES, \
CURSOR_OFFSETS CURSOR_OFFSETS
static const struct intel_device_info intel_ironlake_d_info __initconst = { static const struct intel_device_info intel_ironlake_d_info = {
GEN5_FEATURES, GEN5_FEATURES,
.platform = INTEL_IRONLAKE, .platform = INTEL_IRONLAKE,
}; };
static const struct intel_device_info intel_ironlake_m_info __initconst = { static const struct intel_device_info intel_ironlake_m_info = {
GEN5_FEATURES, GEN5_FEATURES,
.platform = INTEL_IRONLAKE, .platform = INTEL_IRONLAKE,
.is_mobile = 1, .has_fbc = 1, .is_mobile = 1, .has_fbc = 1,
@ -243,12 +243,12 @@ static const struct intel_device_info intel_ironlake_m_info __initconst = {
GEN6_FEATURES, \ GEN6_FEATURES, \
.platform = INTEL_SANDYBRIDGE .platform = INTEL_SANDYBRIDGE
static const struct intel_device_info intel_sandybridge_d_gt1_info __initconst = { static const struct intel_device_info intel_sandybridge_d_gt1_info = {
SNB_D_PLATFORM, SNB_D_PLATFORM,
.gt = 1, .gt = 1,
}; };
static const struct intel_device_info intel_sandybridge_d_gt2_info __initconst = { static const struct intel_device_info intel_sandybridge_d_gt2_info = {
SNB_D_PLATFORM, SNB_D_PLATFORM,
.gt = 2, .gt = 2,
}; };
@ -259,12 +259,12 @@ static const struct intel_device_info intel_sandybridge_d_gt2_info __initconst =
.is_mobile = 1 .is_mobile = 1
static const struct intel_device_info intel_sandybridge_m_gt1_info __initconst = { static const struct intel_device_info intel_sandybridge_m_gt1_info = {
SNB_M_PLATFORM, SNB_M_PLATFORM,
.gt = 1, .gt = 1,
}; };
static const struct intel_device_info intel_sandybridge_m_gt2_info __initconst = { static const struct intel_device_info intel_sandybridge_m_gt2_info = {
SNB_M_PLATFORM, SNB_M_PLATFORM,
.gt = 2, .gt = 2,
}; };
@ -288,12 +288,12 @@ static const struct intel_device_info intel_sandybridge_m_gt2_info __initconst =
.platform = INTEL_IVYBRIDGE, \ .platform = INTEL_IVYBRIDGE, \
.has_l3_dpf = 1 .has_l3_dpf = 1
static const struct intel_device_info intel_ivybridge_d_gt1_info __initconst = { static const struct intel_device_info intel_ivybridge_d_gt1_info = {
IVB_D_PLATFORM, IVB_D_PLATFORM,
.gt = 1, .gt = 1,
}; };
static const struct intel_device_info intel_ivybridge_d_gt2_info __initconst = { static const struct intel_device_info intel_ivybridge_d_gt2_info = {
IVB_D_PLATFORM, IVB_D_PLATFORM,
.gt = 2, .gt = 2,
}; };
@ -304,17 +304,17 @@ static const struct intel_device_info intel_ivybridge_d_gt2_info __initconst = {
.is_mobile = 1, \ .is_mobile = 1, \
.has_l3_dpf = 1 .has_l3_dpf = 1
static const struct intel_device_info intel_ivybridge_m_gt1_info __initconst = { static const struct intel_device_info intel_ivybridge_m_gt1_info = {
IVB_M_PLATFORM, IVB_M_PLATFORM,
.gt = 1, .gt = 1,
}; };
static const struct intel_device_info intel_ivybridge_m_gt2_info __initconst = { static const struct intel_device_info intel_ivybridge_m_gt2_info = {
IVB_M_PLATFORM, IVB_M_PLATFORM,
.gt = 2, .gt = 2,
}; };
static const struct intel_device_info intel_ivybridge_q_info __initconst = { static const struct intel_device_info intel_ivybridge_q_info = {
GEN7_FEATURES, GEN7_FEATURES,
.platform = INTEL_IVYBRIDGE, .platform = INTEL_IVYBRIDGE,
.gt = 2, .gt = 2,
@ -322,7 +322,7 @@ static const struct intel_device_info intel_ivybridge_q_info __initconst = {
.has_l3_dpf = 1, .has_l3_dpf = 1,
}; };
static const struct intel_device_info intel_valleyview_info __initconst = { static const struct intel_device_info intel_valleyview_info = {
.platform = INTEL_VALLEYVIEW, .platform = INTEL_VALLEYVIEW,
.gen = 7, .gen = 7,
.is_lp = 1, .is_lp = 1,
@ -358,17 +358,17 @@ static const struct intel_device_info intel_valleyview_info __initconst = {
.platform = INTEL_HASWELL, \ .platform = INTEL_HASWELL, \
.has_l3_dpf = 1 .has_l3_dpf = 1
static const struct intel_device_info intel_haswell_gt1_info __initconst = { static const struct intel_device_info intel_haswell_gt1_info = {
HSW_PLATFORM, HSW_PLATFORM,
.gt = 1, .gt = 1,
}; };
static const struct intel_device_info intel_haswell_gt2_info __initconst = { static const struct intel_device_info intel_haswell_gt2_info = {
HSW_PLATFORM, HSW_PLATFORM,
.gt = 2, .gt = 2,
}; };
static const struct intel_device_info intel_haswell_gt3_info __initconst = { static const struct intel_device_info intel_haswell_gt3_info = {
HSW_PLATFORM, HSW_PLATFORM,
.gt = 3, .gt = 3,
}; };
@ -388,17 +388,17 @@ static const struct intel_device_info intel_haswell_gt3_info __initconst = {
.gen = 8, \ .gen = 8, \
.platform = INTEL_BROADWELL .platform = INTEL_BROADWELL
static const struct intel_device_info intel_broadwell_gt1_info __initconst = { static const struct intel_device_info intel_broadwell_gt1_info = {
BDW_PLATFORM, BDW_PLATFORM,
.gt = 1, .gt = 1,
}; };
static const struct intel_device_info intel_broadwell_gt2_info __initconst = { static const struct intel_device_info intel_broadwell_gt2_info = {
BDW_PLATFORM, BDW_PLATFORM,
.gt = 2, .gt = 2,
}; };
static const struct intel_device_info intel_broadwell_rsvd_info __initconst = { static const struct intel_device_info intel_broadwell_rsvd_info = {
BDW_PLATFORM, BDW_PLATFORM,
.gt = 3, .gt = 3,
/* According to the device ID those devices are GT3, they were /* According to the device ID those devices are GT3, they were
@ -406,13 +406,13 @@ static const struct intel_device_info intel_broadwell_rsvd_info __initconst = {
*/ */
}; };
static const struct intel_device_info intel_broadwell_gt3_info __initconst = { static const struct intel_device_info intel_broadwell_gt3_info = {
BDW_PLATFORM, BDW_PLATFORM,
.gt = 3, .gt = 3,
.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING, .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
}; };
static const struct intel_device_info intel_cherryview_info __initconst = { static const struct intel_device_info intel_cherryview_info = {
.gen = 8, .num_pipes = 3, .gen = 8, .num_pipes = 3,
.has_hotplug = 1, .has_hotplug = 1,
.is_lp = 1, .is_lp = 1,
@ -455,12 +455,12 @@ static const struct intel_device_info intel_cherryview_info __initconst = {
.gen = 9, \ .gen = 9, \
.platform = INTEL_SKYLAKE .platform = INTEL_SKYLAKE
static const struct intel_device_info intel_skylake_gt1_info __initconst = { static const struct intel_device_info intel_skylake_gt1_info = {
SKL_PLATFORM, SKL_PLATFORM,
.gt = 1, .gt = 1,
}; };
static const struct intel_device_info intel_skylake_gt2_info __initconst = { static const struct intel_device_info intel_skylake_gt2_info = {
SKL_PLATFORM, SKL_PLATFORM,
.gt = 2, .gt = 2,
}; };
@ -470,12 +470,12 @@ static const struct intel_device_info intel_skylake_gt2_info __initconst = {
.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING
static const struct intel_device_info intel_skylake_gt3_info __initconst = { static const struct intel_device_info intel_skylake_gt3_info = {
SKL_GT3_PLUS_PLATFORM, SKL_GT3_PLUS_PLATFORM,
.gt = 3, .gt = 3,
}; };
static const struct intel_device_info intel_skylake_gt4_info __initconst = { static const struct intel_device_info intel_skylake_gt4_info = {
SKL_GT3_PLUS_PLATFORM, SKL_GT3_PLUS_PLATFORM,
.gt = 4, .gt = 4,
}; };
@ -511,13 +511,13 @@ static const struct intel_device_info intel_skylake_gt4_info __initconst = {
IVB_CURSOR_OFFSETS, \ IVB_CURSOR_OFFSETS, \
BDW_COLORS BDW_COLORS
static const struct intel_device_info intel_broxton_info __initconst = { static const struct intel_device_info intel_broxton_info = {
GEN9_LP_FEATURES, GEN9_LP_FEATURES,
.platform = INTEL_BROXTON, .platform = INTEL_BROXTON,
.ddb_size = 512, .ddb_size = 512,
}; };
static const struct intel_device_info intel_geminilake_info __initconst = { static const struct intel_device_info intel_geminilake_info = {
GEN9_LP_FEATURES, GEN9_LP_FEATURES,
.platform = INTEL_GEMINILAKE, .platform = INTEL_GEMINILAKE,
.ddb_size = 1024, .ddb_size = 1024,
@ -529,17 +529,17 @@ static const struct intel_device_info intel_geminilake_info __initconst = {
.gen = 9, \ .gen = 9, \
.platform = INTEL_KABYLAKE .platform = INTEL_KABYLAKE
static const struct intel_device_info intel_kabylake_gt1_info __initconst = { static const struct intel_device_info intel_kabylake_gt1_info = {
KBL_PLATFORM, KBL_PLATFORM,
.gt = 1, .gt = 1,
}; };
static const struct intel_device_info intel_kabylake_gt2_info __initconst = { static const struct intel_device_info intel_kabylake_gt2_info = {
KBL_PLATFORM, KBL_PLATFORM,
.gt = 2, .gt = 2,
}; };
static const struct intel_device_info intel_kabylake_gt3_info __initconst = { static const struct intel_device_info intel_kabylake_gt3_info = {
KBL_PLATFORM, KBL_PLATFORM,
.gt = 3, .gt = 3,
.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING, .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
@ -550,17 +550,17 @@ static const struct intel_device_info intel_kabylake_gt3_info __initconst = {
.gen = 9, \ .gen = 9, \
.platform = INTEL_COFFEELAKE .platform = INTEL_COFFEELAKE
static const struct intel_device_info intel_coffeelake_gt1_info __initconst = { static const struct intel_device_info intel_coffeelake_gt1_info = {
CFL_PLATFORM, CFL_PLATFORM,
.gt = 1, .gt = 1,
}; };
static const struct intel_device_info intel_coffeelake_gt2_info __initconst = { static const struct intel_device_info intel_coffeelake_gt2_info = {
CFL_PLATFORM, CFL_PLATFORM,
.gt = 2, .gt = 2,
}; };
static const struct intel_device_info intel_coffeelake_gt3_info __initconst = { static const struct intel_device_info intel_coffeelake_gt3_info = {
CFL_PLATFORM, CFL_PLATFORM,
.gt = 3, .gt = 3,
.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING, .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
@ -571,7 +571,7 @@ static const struct intel_device_info intel_coffeelake_gt3_info __initconst = {
.ddb_size = 1024, \ .ddb_size = 1024, \
GLK_COLORS GLK_COLORS
static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { static const struct intel_device_info intel_cannonlake_gt2_info = {
GEN10_FEATURES, GEN10_FEATURES,
.is_alpha_support = 1, .is_alpha_support = 1,
.platform = INTEL_CANNONLAKE, .platform = INTEL_CANNONLAKE,
@ -585,7 +585,7 @@ static const struct intel_device_info intel_cannonlake_gt2_info __initconst = {
.ddb_size = 2048, \ .ddb_size = 2048, \
.has_csr = 0 .has_csr = 0
static const struct intel_device_info intel_icelake_11_info __initconst = { static const struct intel_device_info intel_icelake_11_info = {
GEN11_FEATURES, GEN11_FEATURES,
.platform = INTEL_ICELAKE, .platform = INTEL_ICELAKE,
.is_alpha_support = 1, .is_alpha_support = 1,