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

Commit 7526ac19 authored by Rodrigo Vivi's avatar Rodrigo Vivi Committed by Jani Nikula
Browse files

drm/i915: Define IS_BROXTON properly. 



Kabylake will also be defined as gen9 and !is_skylake.
So we need start by creating a proper Broxton
definition, otherwise we will break broxton with the
introduction of Kabylake.

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1445966099-1640-2-git-send-email-rodrigo.vivi@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 3cb27f38

drivers/gpu/drm/i915/i915_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ static const struct intel_device_info intel_skylake_gt3_info = { 


static const struct intel_device_info intel_broxton_info = {

	.is_preliminary = 1,

	.is_broxton = 1,

	.gen = 9,

	.need_gfx_hws = 1, .has_hotplug = 1,

	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,

drivers/gpu/drm/i915/i915_drv.h

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

	func(is_haswell) sep \

	func(is_skylake) sep \

	func(is_broxton) sep \

	func(is_preliminary) sep \

	func(has_fbc) sep \

	func(has_pipe_cxsr) sep \
@@ -2476,7 +2477,7 @@ struct drm_i915_cmd_table { 
#define IS_HASWELL(dev)	(INTEL_INFO(dev)->is_haswell)

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

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

#define IS_BROXTON(dev)	(!INTEL_INFO(dev)->is_skylake && IS_GEN9(dev))

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

#define IS_MOBILE(dev)		(INTEL_INFO(dev)->is_mobile)

#define IS_HSW_EARLY_SDV(dev)	(IS_HASWELL(dev) && \

				 (INTEL_DEVID(dev) & 0xFF00) == 0x0C00)