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

Commit 7e508a27 authored by Eugeni Dodonov's avatar Eugeni Dodonov Committed by Daniel Vetter
Browse files

drm/i915: transform HAS_PCH_SPLIT in a feature check 



The macro is becoming too complex and with VLV upon us it can lead to
confusion. So transforming this into a feature check instead.

Signed-off-by: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
[danvet: fixed conflict with is_valleyview addition.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 23e3f9b3

drivers/gpu/drm/i915/i915_drv.c

+6 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ static const struct intel_device_info intel_ironlake_d_info = { 
	.gen = 5,

	.need_gfx_hws = 1, .has_hotplug = 1,

	.has_bsd_ring = 1,

	.has_pch_split = 1,

};



static const struct intel_device_info intel_ironlake_m_info = {
@@ -218,6 +219,7 @@ static const struct intel_device_info intel_ironlake_m_info = { 
	.need_gfx_hws = 1, .has_hotplug = 1,

	.has_fbc = 1,

	.has_bsd_ring = 1,

	.has_pch_split = 1,

};



static const struct intel_device_info intel_sandybridge_d_info = {
@@ -226,6 +228,7 @@ static const struct intel_device_info intel_sandybridge_d_info = { 
	.has_bsd_ring = 1,

	.has_blt_ring = 1,

	.has_llc = 1,

	.has_pch_split = 1,

};



static const struct intel_device_info intel_sandybridge_m_info = {
@@ -235,6 +238,7 @@ static const struct intel_device_info intel_sandybridge_m_info = { 
	.has_bsd_ring = 1,

	.has_blt_ring = 1,

	.has_llc = 1,

	.has_pch_split = 1,

};



static const struct intel_device_info intel_ivybridge_d_info = {
@@ -243,6 +247,7 @@ static const struct intel_device_info intel_ivybridge_d_info = { 
	.has_bsd_ring = 1,

	.has_blt_ring = 1,

	.has_llc = 1,

	.has_pch_split = 1,

};



static const struct intel_device_info intel_ivybridge_m_info = {
@@ -252,6 +257,7 @@ static const struct intel_device_info intel_ivybridge_m_info = { 
	.has_bsd_ring = 1,

	.has_blt_ring = 1,

	.has_llc = 1,

	.has_pch_split = 1,

};



static const struct intel_device_info intel_valleyview_m_info = {

drivers/gpu/drm/i915/i915_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ struct intel_device_info { 
	u8 is_crestline:1;

	u8 is_ivybridge:1;

	u8 is_valleyview:1;

	u8 has_pch_split:1;

	u8 has_fbc:1;

	u8 has_pipe_cxsr:1;

	u8 has_hotplug:1;
@@ -1051,7 +1052,7 @@ struct drm_i915_file_private { 
#define HAS_PIPE_CXSR(dev) (INTEL_INFO(dev)->has_pipe_cxsr)

#define I915_HAS_FBC(dev) (INTEL_INFO(dev)->has_fbc)



#define HAS_PCH_SPLIT(dev) (IS_GEN5(dev) || IS_GEN6(dev) || IS_IVYBRIDGE(dev))

#define HAS_PCH_SPLIT(dev) (INTEL_INFO(dev)->has_pch_split)

#define HAS_PIPE_CONTROL(dev) (INTEL_INFO(dev)->gen >= 5)



#define INTEL_PCH_TYPE(dev) (((struct drm_i915_private *)(dev)->dev_private)->pch_type)