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

Commit ab0d24ac authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Promote IS_BROADWELL to a simple macro 



If we allow it a dedicated flag in dev_priv we enable the
compiler to nicely optimize conditions like IS_HASSWELL ||
IS_BROADWELL.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent ae5702d2

drivers/gpu/drm/i915/i915_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -300,22 +300,26 @@ static const struct intel_device_info intel_haswell_m_info = { 
static const struct intel_device_info intel_broadwell_d_info = {

	BDW_FEATURES,

	.gen = 8,

	.is_broadwell = 1,

};



static const struct intel_device_info intel_broadwell_m_info = {

	BDW_FEATURES,

	.gen = 8, .is_mobile = 1,

	.is_broadwell = 1,

};



static const struct intel_device_info intel_broadwell_gt3d_info = {

	BDW_FEATURES,

	.gen = 8,

	.is_broadwell = 1,

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

};



static const struct intel_device_info intel_broadwell_gt3m_info = {

	BDW_FEATURES,

	.gen = 8, .is_mobile = 1,

	.is_broadwell = 1,

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

};

drivers/gpu/drm/i915/i915_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -735,6 +735,7 @@ struct intel_csr { 
	func(is_valleyview) sep \

	func(is_cherryview) sep \

	func(is_haswell) sep \

	func(is_broadwell) sep \

	func(is_skylake) sep \

	func(is_broxton) sep \

	func(is_kabylake) sep \
@@ -2553,7 +2554,7 @@ struct drm_i915_cmd_table { 
#define IS_VALLEYVIEW(dev)	(INTEL_INFO(dev)->is_valleyview)

#define IS_CHERRYVIEW(dev)	(INTEL_INFO(dev)->is_cherryview)

#define IS_HASWELL(dev)	(INTEL_INFO(dev)->is_haswell)

#define IS_BROADWELL(dev)	(!INTEL_INFO(dev)->is_cherryview && IS_GEN8(dev))

#define IS_BROADWELL(dev)	(INTEL_INFO(dev)->is_broadwell)

#define IS_SKYLAKE(dev)	(INTEL_INFO(dev)->is_skylake)

#define IS_BROXTON(dev)		(INTEL_INFO(dev)->is_broxton)

#define IS_KABYLAKE(dev)	(INTEL_INFO(dev)->is_kabylake)