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

Commit 54d2a6a1 authored by Carlos Santa's avatar Carlos Santa Committed by Rodrigo Vivi
Browse files

drm/i915: Introduce GEN3_FEATURES for device info 



Introducing a GEN3_FEATURES macro to simplify the struct definitions by
platforms given that most of the features are common. Inspired by the
GEN7_FEATURES macro done by Ben W. and others.

Use it for i915g, i915gm, i945g, i945gm, g33 and pnv.

CC: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarCarlos Santa <carlos.santa@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 4d495bea

drivers/gpu/drm/i915/i915_pci.c

+18 −24
Original line number Diff line number Diff line
@@ -88,39 +88,37 @@ static const struct intel_device_info intel_i865g_info = { 
	CURSOR_OFFSETS,

};



#define GEN3_FEATURES \

	.gen = 3, .num_pipes = 2, \

	.ring_mask = RENDER_RING, \

	GEN_DEFAULT_PIPEOFFSETS, \

	CURSOR_OFFSETS



static const struct intel_device_info intel_i915g_info = {

	.gen = 3, .is_i915g = 1, .cursor_needs_physical = 1, .num_pipes = 2,

	GEN3_FEATURES,

	.is_i915g = 1, .cursor_needs_physical = 1,

	.has_overlay = 1, .overlay_needs_physical = 1,

	.ring_mask = RENDER_RING,

	GEN_DEFAULT_PIPEOFFSETS,

	CURSOR_OFFSETS,

};

static const struct intel_device_info intel_i915gm_info = {

	.gen = 3, .is_mobile = 1, .num_pipes = 2,

	GEN3_FEATURES,

	.is_mobile = 1,

	.cursor_needs_physical = 1,

	.has_overlay = 1, .overlay_needs_physical = 1,

	.supports_tv = 1,

	.has_fbc = 1,

	.ring_mask = RENDER_RING,

	GEN_DEFAULT_PIPEOFFSETS,

	CURSOR_OFFSETS,

};

static const struct intel_device_info intel_i945g_info = {

	.gen = 3, .has_hotplug = 1, .cursor_needs_physical = 1, .num_pipes = 2,

	GEN3_FEATURES,

	.has_hotplug = 1, .cursor_needs_physical = 1,

	.has_overlay = 1, .overlay_needs_physical = 1,

	.ring_mask = RENDER_RING,

	GEN_DEFAULT_PIPEOFFSETS,

	CURSOR_OFFSETS,

};

static const struct intel_device_info intel_i945gm_info = {

	.gen = 3, .is_i945gm = 1, .is_mobile = 1, .num_pipes = 2,

	GEN3_FEATURES,

	.is_i945gm = 1, .is_mobile = 1,

	.has_hotplug = 1, .cursor_needs_physical = 1,

	.has_overlay = 1, .overlay_needs_physical = 1,

	.supports_tv = 1,

	.has_fbc = 1,

	.ring_mask = RENDER_RING,

	GEN_DEFAULT_PIPEOFFSETS,

	CURSOR_OFFSETS,

};



#define GEN4_FEATURES \
@@ -145,12 +143,10 @@ static const struct intel_device_info intel_i965gm_info = { 
};



static const struct intel_device_info intel_g33_info = {

	.gen = 3, .is_g33 = 1, .num_pipes = 2,

	GEN3_FEATURES,

	.is_g33 = 1,

	.need_gfx_hws = 1, .has_hotplug = 1,

	.has_overlay = 1,

	.ring_mask = RENDER_RING,

	GEN_DEFAULT_PIPEOFFSETS,

	CURSOR_OFFSETS,

};



static const struct intel_device_info intel_g45_info = {
@@ -170,12 +166,10 @@ static const struct intel_device_info intel_gm45_info = { 
};



static const struct intel_device_info intel_pineview_info = {

	.gen = 3, .is_g33 = 1, .is_pineview = 1, .is_mobile = 1, .num_pipes = 2,

	GEN3_FEATURES,

	.is_g33 = 1, .is_pineview = 1, .is_mobile = 1,

	.need_gfx_hws = 1, .has_hotplug = 1,

	.has_overlay = 1,

	.ring_mask = RENDER_RING,

	GEN_DEFAULT_PIPEOFFSETS,

	CURSOR_OFFSETS,

};



#define GEN5_FEATURES \