Re: [Intel-gfx] [PATCH 11/23] drm/i915: Move HAS_RC6p definition to platform definition

[Rodrigo Vivi]

On Wed, Jul 20, 2016 at 10:40 AM, Carlos Santa  wrote:
> 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: Carlos Santa 
> ---
>  drivers/gpu/drm/i915/i915_drv.h | 3 ++-
>  drivers/gpu/drm/i915/i915_pci.c | 7 +++
>  2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 75131a0..a6a22b4 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -776,6 +776,7 @@ struct intel_csr {
> func(has_guc_ucode) sep \
> func(has_guc_sched) sep \
> func(has_rc6) sep \
> +   func(has_rc6p) sep \
> func(has_resource_streamer) sep \
> func(has_pipe_cxsr) sep \
> func(has_hotplug) sep \
> @@ -2858,7 +2859,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)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index e10fb5c..c6dae2c 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -201,6 +201,7 @@ static const struct intel_device_info 
> intel_ironlake_m_info = {
> .has_runtime_pm = 1, \
> .has_core_ring_freq = 1, \
> .has_rc6 = 1, \
> +   .has_rc6p = 1, \
> .ring_mask = RENDER_RING | BSD_RING | BLT_RING, \
> .has_llc = 1, \
> GEN_DEFAULT_PIPEOFFSETS, \
> @@ -226,19 +227,25 @@ static const struct intel_device_info 
> intel_sandybridge_m_info = {
> GEN_DEFAULT_PIPEOFFSETS, \
> IVB_CURSOR_OFFSETS
>
> +#define IVB_FEATURES  \
> +   .has_rc6p = 1
> +
>  static const struct intel_device_info intel_ivybridge_d_info = {
> GEN7_FEATURES,
> +   IVB_FEATURES,

another case where I don't like 2 macros together...

> .is_ivybridge = 1,
>  };
>
>  static const struct intel_device_info intel_ivybridge_m_info = {
> GEN7_FEATURES,
> +   IVB_FEATURES,
> .is_ivybridge = 1,
> .is_mobile = 1,
>  };
>
>  static const struct intel_device_info intel_ivybridge_q_info = {
> GEN7_FEATURES,
> +   IVB_FEATURES,
> .is_ivybridge = 1,
> .num_pipes = 0, /* legal, last one wins */
>  };
> --
> 1.9.1
>
> ___
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 11/23] drm/i915: Move HAS_RC6p definition to platform definition

[Carlos Santa]

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: Carlos Santa 
---
 drivers/gpu/drm/i915/i915_drv.h | 3 ++-
 drivers/gpu/drm/i915/i915_pci.c | 7 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 75131a0..a6a22b4 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -776,6 +776,7 @@ struct intel_csr {
func(has_guc_ucode) sep \
func(has_guc_sched) sep \
func(has_rc6) sep \
+   func(has_rc6p) sep \
func(has_resource_streamer) sep \
func(has_pipe_cxsr) sep \
func(has_hotplug) sep \
@@ -2858,7 +2859,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)
 
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index e10fb5c..c6dae2c 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -201,6 +201,7 @@ static const struct intel_device_info intel_ironlake_m_info 
= {
.has_runtime_pm = 1, \
.has_core_ring_freq = 1, \
.has_rc6 = 1, \
+   .has_rc6p = 1, \
.ring_mask = RENDER_RING | BSD_RING | BLT_RING, \
.has_llc = 1, \
GEN_DEFAULT_PIPEOFFSETS, \
@@ -226,19 +227,25 @@ static const struct intel_device_info 
intel_sandybridge_m_info = {
GEN_DEFAULT_PIPEOFFSETS, \
IVB_CURSOR_OFFSETS
 
+#define IVB_FEATURES  \
+   .has_rc6p = 1
+
 static const struct intel_device_info intel_ivybridge_d_info = {
GEN7_FEATURES,
+   IVB_FEATURES,
.is_ivybridge = 1,
 };
 
 static const struct intel_device_info intel_ivybridge_m_info = {
GEN7_FEATURES,
+   IVB_FEATURES,
.is_ivybridge = 1,
.is_mobile = 1,
 };
 
 static const struct intel_device_info intel_ivybridge_q_info = {
GEN7_FEATURES,
+   IVB_FEATURES,
.is_ivybridge = 1,
.num_pipes = 0, /* legal, last one wins */
 };
-- 
1.9.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx