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

Commit 33b5bf82 authored by Carlos Santa's avatar Carlos Santa Committed by Rodrigo Vivi
Browse files

drm/i915: Move HAS_RC6p definition to platform definition 



Moving all GPU features to the platform struct definition allows for
	- standard place when adding new features from new platforms
	- possible to see supported features when dumping struct
	  definitions

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 86f3624b

drivers/gpu/drm/i915/i915_drv.h

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

	func(has_resource_streamer) sep \

	func(has_rc6) sep \

	func(has_rc6p) sep \

	func(has_pipe_cxsr) sep \

	func(has_hotplug) sep \

	func(cursor_needs_physical) sep \
@@ -2792,7 +2793,7 @@ struct drm_i915_cmd_table { 
#define HAS_PSR(dev)		(INTEL_INFO(dev)->has_psr)

#define HAS_RUNTIME_PM(dev)	(INTEL_INFO(dev)->has_runtime_pm)

#define HAS_RC6(dev)		(INTEL_INFO(dev)->has_rc6)

#define HAS_RC6p(dev)		(IS_GEN6(dev) || IS_IVYBRIDGE(dev))

#define HAS_RC6p(dev)		(INTEL_INFO(dev)->has_rc6p)



#define HAS_CSR(dev)	(INTEL_INFO(dev)->has_csr)

drivers/gpu/drm/i915/i915_pci.c

+3 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ static const struct intel_device_info intel_ironlake_m_info = { 
	.ring_mask = RENDER_RING | BSD_RING | BLT_RING, \

	.has_llc = 1, \

	.has_rc6 = 1, \

	.has_rc6p = 1, \

	GEN_DEFAULT_PIPEOFFSETS, \

	CURSOR_OFFSETS
@@ -221,6 +222,7 @@ static const struct intel_device_info intel_sandybridge_m_info = { 
	.ring_mask = RENDER_RING | BSD_RING | BLT_RING, \

	.has_llc = 1, \

	.has_rc6 = 1, \

	.has_rc6p = 1, \

	GEN_DEFAULT_PIPEOFFSETS, \

	IVB_CURSOR_OFFSETS
@@ -264,6 +266,7 @@ static const struct intel_device_info intel_valleyview_info = { 
	.has_fpga_dbg = 1, \

	.has_psr = 1, \

	.has_resource_streamer = 1, \

	.has_rc6p = 0 /* RC6p removed-by HSW */, \

	.has_runtime_pm = 1



static const struct intel_device_info intel_haswell_info = {