diff mbox

[22/23] drm/i915: Move HAS_L3_DPF definition to platform definition

Message ID 1469036435-18918-23-git-send-email-carlos.santa@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Santa, Carlos July 20, 2016, 5:40 p.m. UTC
Moving all GPU features to the platform definition allows for
	- standard place when adding new features from new platforms
	- possible to see supported features when dumping struct
	  definitions

Signed-off-by: Carlos Santa <carlos.santa@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h | 3 ++-
 drivers/gpu/drm/i915/i915_pci.c | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

Comments

Rodrigo Vivi July 20, 2016, 9:52 p.m. UTC | #1
This patch is adding support to l3_dpf to bdw, skl and kbl...

On Wed, Jul 20, 2016 at 10:40 AM, Carlos Santa <carlos.santa@intel.com> wrote:
> Moving all GPU features to the platform definition allows for
>         - standard place when adding new features from new platforms
>         - possible to see supported features when dumping struct
>           definitions
>
> Signed-off-by: Carlos Santa <carlos.santa@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h | 3 ++-
>  drivers/gpu/drm/i915/i915_pci.c | 6 ++++--
>  2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 8f93a93..7075f76 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -783,6 +783,7 @@ struct intel_csr {
>         func(has_fw_blc) sep \
>         func(has_hw_contexts) sep \
>         func(has_logical_ring_contexts) sep \
> +       func(has_l3_dpf) sep \
>         func(has_resource_streamer) sep \
>         func(has_pipe_cxsr) sep \
>         func(has_hotplug) sep \
> @@ -2910,7 +2911,7 @@ struct drm_i915_cmd_table {
>                                IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev))
>
>  /* DPF == dynamic parity feature */
> -#define HAS_L3_DPF(dev) (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
> +#define HAS_L3_DPF(dev) (INTEL_INFO(dev)->has_l3_dpf)
>  #define NUM_L3_SLICES(dev) (IS_HSW_GT3(dev) ? 2 : HAS_L3_DPF(dev))
>
>  #define GT_FREQUENCY_MULTIPLIER 50
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index d90cb47..c03cb97 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -240,7 +240,8 @@ static const struct intel_device_info intel_sandybridge_m_info = {
>         IVB_CURSOR_OFFSETS
>
>  #define IVB_FEATURES  \
> -       .has_rc6p = 1
> +       .has_rc6p = 1, \
> +       .has_l3_dpf = 1
>
>  static const struct intel_device_info intel_ivybridge_d_info = {
>         GEN7_FEATURES,
> @@ -296,7 +297,8 @@ static const struct intel_device_info intel_valleyview_d_info = {
>         .has_psr = 1, \
>         .has_runtime_pm = 1, \
>         .has_resource_streamer = 1, \
> -       .has_dp_mst = 1
> +       .has_dp_mst = 1, \
> +       .has_l3_dpf = 1
>
>  static const struct intel_device_info intel_haswell_d_info = {
>         HSW_FEATURES,
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 8f93a93..7075f76 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -783,6 +783,7 @@  struct intel_csr {
 	func(has_fw_blc) sep \
 	func(has_hw_contexts) sep \
 	func(has_logical_ring_contexts) sep \
+	func(has_l3_dpf) sep \
 	func(has_resource_streamer) sep \
 	func(has_pipe_cxsr) sep \
 	func(has_hotplug) sep \
@@ -2910,7 +2911,7 @@  struct drm_i915_cmd_table {
 			       IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev))
 
 /* DPF == dynamic parity feature */
-#define HAS_L3_DPF(dev) (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
+#define HAS_L3_DPF(dev) (INTEL_INFO(dev)->has_l3_dpf)
 #define NUM_L3_SLICES(dev) (IS_HSW_GT3(dev) ? 2 : HAS_L3_DPF(dev))
 
 #define GT_FREQUENCY_MULTIPLIER 50
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index d90cb47..c03cb97 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -240,7 +240,8 @@  static const struct intel_device_info intel_sandybridge_m_info = {
 	IVB_CURSOR_OFFSETS
 
 #define IVB_FEATURES  \
-	.has_rc6p = 1
+	.has_rc6p = 1, \
+	.has_l3_dpf = 1
 
 static const struct intel_device_info intel_ivybridge_d_info = {
 	GEN7_FEATURES,
@@ -296,7 +297,8 @@  static const struct intel_device_info intel_valleyview_d_info = {
 	.has_psr = 1, \
 	.has_runtime_pm = 1, \
 	.has_resource_streamer = 1, \
-	.has_dp_mst = 1
+	.has_dp_mst = 1, \
+	.has_l3_dpf = 1
 
 static const struct intel_device_info intel_haswell_d_info = {
 	HSW_FEATURES,