Commit a5ce929b authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: keep intel device info structs in gen based order 



Move G33 and Pineview higher up in the list. Add a couple of blank lines
for OCD while at it.

Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/ef4cc8e6ddf592c8c2769b84d4b88a5422d46ea5.1480520526.git.jani.nikula@intel.com
parent 2e0d26f8

drivers/gpu/drm/i915/i915_pci.c

+18 −14
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#define CHV_COLORS \

	.color = { .degamma_lut_size = 65, .gamma_lut_size = 257 }



/* Keep in gen based order, and chronological order within a gen */

#define GEN2_FEATURES \

	.gen = 2, .num_pipes = 1, \

	.has_overlay = 1, .overlay_needs_physical = 1, \
@@ -101,6 +102,7 @@ static const struct intel_device_info intel_i915g_info = { 
	.has_overlay = 1, .overlay_needs_physical = 1,

	.hws_needs_physical = 1,

};



static const struct intel_device_info intel_i915gm_info = {

	GEN3_FEATURES,

	.platform = INTEL_I915GM,
@@ -111,6 +113,7 @@ static const struct intel_device_info intel_i915gm_info = { 
	.has_fbc = 1,

	.hws_needs_physical = 1,

};



static const struct intel_device_info intel_i945g_info = {

	GEN3_FEATURES,

	.platform = INTEL_I945G,
@@ -118,6 +121,7 @@ static const struct intel_device_info intel_i945g_info = { 
	.has_overlay = 1, .overlay_needs_physical = 1,

	.hws_needs_physical = 1,

};



static const struct intel_device_info intel_i945gm_info = {

	GEN3_FEATURES,

	.platform = INTEL_I945GM, .is_mobile = 1,
@@ -128,6 +132,20 @@ static const struct intel_device_info intel_i945gm_info = { 
	.hws_needs_physical = 1,

};



static const struct intel_device_info intel_g33_info = {

	GEN3_FEATURES,

	.platform = INTEL_G33,

	.has_hotplug = 1,

	.has_overlay = 1,

};



static const struct intel_device_info intel_pineview_info = {

	GEN3_FEATURES,

	.platform = INTEL_G33, .is_pineview = 1, .is_mobile = 1,

	.has_hotplug = 1,

	.has_overlay = 1,

};



#define GEN4_FEATURES \

	.gen = 4, .num_pipes = 2, \

	.has_hotplug = 1, \
@@ -152,13 +170,6 @@ static const struct intel_device_info intel_i965gm_info = { 
	.hws_needs_physical = 1,

};



static const struct intel_device_info intel_g33_info = {

	GEN3_FEATURES,

	.platform = INTEL_G33,

	.has_hotplug = 1,

	.has_overlay = 1,

};



static const struct intel_device_info intel_g45_info = {

	GEN4_FEATURES,

	.platform = INTEL_G4X,
@@ -175,13 +186,6 @@ static const struct intel_device_info intel_gm45_info = { 
	.ring_mask = RENDER_RING | BSD_RING,

};



static const struct intel_device_info intel_pineview_info = {

	GEN3_FEATURES,

	.platform = INTEL_G33, .is_pineview = 1, .is_mobile = 1,

	.has_hotplug = 1,

	.has_overlay = 1,

};



#define GEN5_FEATURES \

	.gen = 5, .num_pipes = 2, \

	.has_hotplug = 1, \

CRA Git | Maintained and supported by SUSTech CRA and CCSE