Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b54eddd authored by Lionel Landwerlin's avatar Lionel Landwerlin
Browse files

drm/i915: mark all device info struct with __initconst 



As recommended by Chris.

v2: Switch from __initdata to __initconst.

Signed-off-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20170830161208.29221-3-lionel.g.landwerlin@intel.com
parent 0890540e

drivers/gpu/drm/i915/i915_pci.c

+47 −47
Original line number Diff line number Diff line
@@ -66,19 +66,19 @@ 
	GEN_DEFAULT_PIPEOFFSETS, \

	CURSOR_OFFSETS



static const struct intel_device_info intel_i830_info = {

static const struct intel_device_info intel_i830_info __initconst = {

	GEN2_FEATURES,

	.platform = INTEL_I830,

	.is_mobile = 1, .cursor_needs_physical = 1,

	.num_pipes = 2, /* legal, last one wins */

};



static const struct intel_device_info intel_i845g_info = {

static const struct intel_device_info intel_i845g_info __initconst = {

	GEN2_FEATURES,

	.platform = INTEL_I845G,

};



static const struct intel_device_info intel_i85x_info = {

static const struct intel_device_info intel_i85x_info __initconst = {

	GEN2_FEATURES,

	.platform = INTEL_I85X, .is_mobile = 1,

	.num_pipes = 2, /* legal, last one wins */
@@ -86,7 +86,7 @@ static const struct intel_device_info intel_i85x_info = { 
	.has_fbc = 1,

};



static const struct intel_device_info intel_i865g_info = {

static const struct intel_device_info intel_i865g_info __initconst = {

	GEN2_FEATURES,

	.platform = INTEL_I865G,

};
@@ -98,7 +98,7 @@ static const struct intel_device_info intel_i865g_info = { 
	GEN_DEFAULT_PIPEOFFSETS, \

	CURSOR_OFFSETS



static const struct intel_device_info intel_i915g_info = {

static const struct intel_device_info intel_i915g_info __initconst = {

	GEN3_FEATURES,

	.platform = INTEL_I915G, .cursor_needs_physical = 1,

	.has_overlay = 1, .overlay_needs_physical = 1,
@@ -106,7 +106,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 intel_i915gm_info __initconst = {

	GEN3_FEATURES,

	.platform = INTEL_I915GM,

	.is_mobile = 1,
@@ -118,7 +118,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 intel_i945g_info __initconst = {

	GEN3_FEATURES,

	.platform = INTEL_I945G,

	.has_hotplug = 1, .cursor_needs_physical = 1,
@@ -127,7 +127,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 intel_i945gm_info __initconst = {

	GEN3_FEATURES,

	.platform = INTEL_I945GM, .is_mobile = 1,

	.has_hotplug = 1, .cursor_needs_physical = 1,
@@ -138,14 +138,14 @@ 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 intel_g33_info __initconst = {

	GEN3_FEATURES,

	.platform = INTEL_G33,

	.has_hotplug = 1,

	.has_overlay = 1,

};



static const struct intel_device_info intel_pineview_info = {

static const struct intel_device_info intel_pineview_info __initconst = {

	GEN3_FEATURES,

	.platform = INTEL_PINEVIEW, .is_mobile = 1,

	.has_hotplug = 1,
@@ -160,14 +160,14 @@ static const struct intel_device_info intel_pineview_info = { 
	GEN_DEFAULT_PIPEOFFSETS, \

	CURSOR_OFFSETS



static const struct intel_device_info intel_i965g_info = {

static const struct intel_device_info intel_i965g_info __initconst = {

	GEN4_FEATURES,

	.platform = INTEL_I965G,

	.has_overlay = 1,

	.hws_needs_physical = 1,

};



static const struct intel_device_info intel_i965gm_info = {

static const struct intel_device_info intel_i965gm_info __initconst = {

	GEN4_FEATURES,

	.platform = INTEL_I965GM,

	.is_mobile = 1, .has_fbc = 1,
@@ -176,14 +176,14 @@ static const struct intel_device_info intel_i965gm_info = { 
	.hws_needs_physical = 1,

};



static const struct intel_device_info intel_g45_info = {

static const struct intel_device_info intel_g45_info __initconst = {

	GEN4_FEATURES,

	.platform = INTEL_G45,

	.has_pipe_cxsr = 1,

	.ring_mask = RENDER_RING | BSD_RING,

};



static const struct intel_device_info intel_gm45_info = {

static const struct intel_device_info intel_gm45_info __initconst = {

	GEN4_FEATURES,

	.platform = INTEL_GM45,

	.is_mobile = 1, .has_fbc = 1,
@@ -200,12 +200,12 @@ static const struct intel_device_info intel_gm45_info = { 
	GEN_DEFAULT_PIPEOFFSETS, \

	CURSOR_OFFSETS



static const struct intel_device_info intel_ironlake_d_info = {

static const struct intel_device_info intel_ironlake_d_info __initconst = {

	GEN5_FEATURES,

	.platform = INTEL_IRONLAKE,

};



static const struct intel_device_info intel_ironlake_m_info = {

static const struct intel_device_info intel_ironlake_m_info __initconst = {

	GEN5_FEATURES,

	.platform = INTEL_IRONLAKE,

	.is_mobile = 1, .has_fbc = 1,
@@ -228,12 +228,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 intel_sandybridge_d_gt1_info __initconst = {

	SNB_D_PLATFORM,

	.gt = 1,

};



static const struct intel_device_info intel_sandybridge_d_gt2_info = {

static const struct intel_device_info intel_sandybridge_d_gt2_info __initconst = {

	SNB_D_PLATFORM,

	.gt = 2,

};
@@ -244,12 +244,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 intel_sandybridge_m_gt1_info __initconst = {

	SNB_M_PLATFORM,

	.gt = 1,

};



static const struct intel_device_info intel_sandybridge_m_gt2_info = {

static const struct intel_device_info intel_sandybridge_m_gt2_info __initconst = {

	SNB_M_PLATFORM,

	.gt = 2,

};
@@ -273,12 +273,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 intel_ivybridge_d_gt1_info __initconst = {

	IVB_D_PLATFORM,

	.gt = 1,

};



static const struct intel_device_info intel_ivybridge_d_gt2_info = {

static const struct intel_device_info intel_ivybridge_d_gt2_info __initconst = {

	IVB_D_PLATFORM,

	.gt = 2,

};
@@ -289,17 +289,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 intel_ivybridge_m_gt1_info __initconst = {

	IVB_M_PLATFORM,

	.gt = 1,

};



static const struct intel_device_info intel_ivybridge_m_gt2_info = {

static const struct intel_device_info intel_ivybridge_m_gt2_info __initconst = {

	IVB_M_PLATFORM,

	.gt = 2,

};



static const struct intel_device_info intel_ivybridge_q_info = {

static const struct intel_device_info intel_ivybridge_q_info __initconst = {

	GEN7_FEATURES,

	.platform = INTEL_IVYBRIDGE,

	.gt = 2,
@@ -307,7 +307,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 intel_valleyview_info __initconst = {

	.platform = INTEL_VALLEYVIEW,

	.gen = 7,

	.is_lp = 1,
@@ -342,17 +342,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 intel_haswell_gt1_info __initconst = {

	HSW_PLATFORM,

	.gt = 1,

};



static const struct intel_device_info intel_haswell_gt2_info = {

static const struct intel_device_info intel_haswell_gt2_info __initconst = {

	HSW_PLATFORM,

	.gt = 2,

};



static const struct intel_device_info intel_haswell_gt3_info = {

static const struct intel_device_info intel_haswell_gt3_info __initconst = {

	HSW_PLATFORM,

	.gt = 3,

};
@@ -370,17 +370,17 @@ static const struct intel_device_info intel_haswell_gt3_info = { 
	.gen = 8, \

	.platform = INTEL_BROADWELL



static const struct intel_device_info intel_broadwell_gt1_info = {

static const struct intel_device_info intel_broadwell_gt1_info __initconst = {

	BDW_PLATFORM,

	.gt = 1,

};



static const struct intel_device_info intel_broadwell_gt2_info = {

static const struct intel_device_info intel_broadwell_gt2_info __initconst = {

	BDW_PLATFORM,

	.gt = 2,

};



static const struct intel_device_info intel_broadwell_rsvd_info = {

static const struct intel_device_info intel_broadwell_rsvd_info __initconst = {

	BDW_PLATFORM,

	.gt = 3,

	/* According to the device ID those devices are GT3, they were
@@ -388,13 +388,13 @@ 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 intel_broadwell_gt3_info __initconst = {

	BDW_PLATFORM,

	.gt = 3,

	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,

};



static const struct intel_device_info intel_cherryview_info = {

static const struct intel_device_info intel_cherryview_info __initconst = {

	.gen = 8, .num_pipes = 3,

	.has_hotplug = 1,

	.is_lp = 1,
@@ -425,12 +425,12 @@ static const struct intel_device_info intel_cherryview_info = { 
	.has_guc = 1, \

	.ddb_size = 896



static const struct intel_device_info intel_skylake_gt1_info = {

static const struct intel_device_info intel_skylake_gt1_info __initconst = {

	SKL_PLATFORM,

	.gt = 1,

};



static const struct intel_device_info intel_skylake_gt2_info = {

static const struct intel_device_info intel_skylake_gt2_info __initconst = {

	SKL_PLATFORM,

	.gt = 2,

};
@@ -440,12 +440,12 @@ static const struct intel_device_info intel_skylake_gt2_info = { 
	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING





static const struct intel_device_info intel_skylake_gt3_info = {

static const struct intel_device_info intel_skylake_gt3_info __initconst = {

	SKL_GT3_PLUS_PLATFORM,

	.gt = 3,

};



static const struct intel_device_info intel_skylake_gt4_info = {

static const struct intel_device_info intel_skylake_gt4_info __initconst = {

	SKL_GT3_PLUS_PLATFORM,

	.gt = 4,

};
@@ -477,13 +477,13 @@ static const struct intel_device_info intel_skylake_gt4_info = { 
	IVB_CURSOR_OFFSETS, \

	BDW_COLORS



static const struct intel_device_info intel_broxton_info = {

static const struct intel_device_info intel_broxton_info __initconst = {

	GEN9_LP_FEATURES,

	.platform = INTEL_BROXTON,

	.ddb_size = 512,

};



static const struct intel_device_info intel_geminilake_info = {

static const struct intel_device_info intel_geminilake_info __initconst = {

	GEN9_LP_FEATURES,

	.platform = INTEL_GEMINILAKE,

	.ddb_size = 1024,
@@ -498,17 +498,17 @@ static const struct intel_device_info intel_geminilake_info = { 
	.has_guc = 1, \

	.ddb_size = 896



static const struct intel_device_info intel_kabylake_gt1_info = {

static const struct intel_device_info intel_kabylake_gt1_info __initconst = {

	KBL_PLATFORM,

	.gt = 1,

};



static const struct intel_device_info intel_kabylake_gt2_info = {

static const struct intel_device_info intel_kabylake_gt2_info __initconst = {

	KBL_PLATFORM,

	.gt = 2,

};



static const struct intel_device_info intel_kabylake_gt3_info = {

static const struct intel_device_info intel_kabylake_gt3_info __initconst = {

	KBL_PLATFORM,

	.gt = 3,

	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
@@ -523,23 +523,23 @@ static const struct intel_device_info intel_kabylake_gt3_info = { 
	.has_guc = 1, \

	.ddb_size = 896



static const struct intel_device_info intel_coffeelake_gt1_info = {

static const struct intel_device_info intel_coffeelake_gt1_info __initconst = {

	CFL_PLATFORM,

	.gt = 1,

};



static const struct intel_device_info intel_coffeelake_gt2_info = {

static const struct intel_device_info intel_coffeelake_gt2_info __initconst = {

	CFL_PLATFORM,

	.gt = 2,

};



static const struct intel_device_info intel_coffeelake_gt3_info = {

static const struct intel_device_info intel_coffeelake_gt3_info __initconst = {

	CFL_PLATFORM,

	.gt = 3,

	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,

};



static const struct intel_device_info intel_cannonlake_gt2_info = {

static const struct intel_device_info intel_cannonlake_gt2_info __initconst = {

	BDW_FEATURES,

	.is_alpha_support = 1,

	.platform = INTEL_CANNONLAKE,