Re: [Intel-gfx] [PATCH 02/23] drm/i915: Introduce GEN6_FEATURES for device info

2016-07-20 Thread Rodrigo Vivi
Reviewed-by: Rodrigo Vivi 


On Wed, Jul 20, 2016 at 10:40 AM, Carlos Santa  wrote:
> Based on the GEN7_FEATURES changes from Ben W.
>
> Use it for snb.
>
> Signed-off-by: Carlos Santa 
> ---
>  drivers/gpu/drm/i915/i915_pci.c | 26 --
>  1 file changed, 12 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 08cdeb3..8b1311d 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -194,24 +194,22 @@ static const struct intel_device_info 
> intel_ironlake_m_info = {
> CURSOR_OFFSETS,
>  };
>
> +#define GEN6_FEATURES \
> +   .gen = 6, .num_pipes = 2, \
> +   .need_gfx_hws = 1, .has_hotplug = 1, \
> +   .has_fbc = 1, \
> +   .ring_mask = RENDER_RING | BSD_RING | BLT_RING, \
> +   .has_llc = 1, \
> +   GEN_DEFAULT_PIPEOFFSETS, \
> +   CURSOR_OFFSETS
> +
>  static const struct intel_device_info intel_sandybridge_d_info = {
> -   .gen = 6, .num_pipes = 2,
> -   .need_gfx_hws = 1, .has_hotplug = 1,
> -   .has_fbc = 1,
> -   .ring_mask = RENDER_RING | BSD_RING | BLT_RING,
> -   .has_llc = 1,
> -   GEN_DEFAULT_PIPEOFFSETS,
> -   CURSOR_OFFSETS,
> +   GEN6_FEATURES
>  };
>
>  static const struct intel_device_info intel_sandybridge_m_info = {
> -   .gen = 6, .is_mobile = 1, .num_pipes = 2,
> -   .need_gfx_hws = 1, .has_hotplug = 1,
> -   .has_fbc = 1,
> -   .ring_mask = RENDER_RING | BSD_RING | BLT_RING,
> -   .has_llc = 1,
> -   GEN_DEFAULT_PIPEOFFSETS,
> -   CURSOR_OFFSETS,
> +   GEN6_FEATURES,
> +   .is_mobile = 1
>  };
>
>  #define GEN7_FEATURES  \
> --
> 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 02/23] drm/i915: Introduce GEN6_FEATURES for device info

2016-07-20 Thread Carlos Santa
Based on the GEN7_FEATURES changes from Ben W.

Use it for snb.

Signed-off-by: Carlos Santa 
---
 drivers/gpu/drm/i915/i915_pci.c | 26 --
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 08cdeb3..8b1311d 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -194,24 +194,22 @@ static const struct intel_device_info 
intel_ironlake_m_info = {
CURSOR_OFFSETS,
 };
 
+#define GEN6_FEATURES \
+   .gen = 6, .num_pipes = 2, \
+   .need_gfx_hws = 1, .has_hotplug = 1, \
+   .has_fbc = 1, \
+   .ring_mask = RENDER_RING | BSD_RING | BLT_RING, \
+   .has_llc = 1, \
+   GEN_DEFAULT_PIPEOFFSETS, \
+   CURSOR_OFFSETS
+
 static const struct intel_device_info intel_sandybridge_d_info = {
-   .gen = 6, .num_pipes = 2,
-   .need_gfx_hws = 1, .has_hotplug = 1,
-   .has_fbc = 1,
-   .ring_mask = RENDER_RING | BSD_RING | BLT_RING,
-   .has_llc = 1,
-   GEN_DEFAULT_PIPEOFFSETS,
-   CURSOR_OFFSETS,
+   GEN6_FEATURES
 };
 
 static const struct intel_device_info intel_sandybridge_m_info = {
-   .gen = 6, .is_mobile = 1, .num_pipes = 2,
-   .need_gfx_hws = 1, .has_hotplug = 1,
-   .has_fbc = 1,
-   .ring_mask = RENDER_RING | BSD_RING | BLT_RING,
-   .has_llc = 1,
-   GEN_DEFAULT_PIPEOFFSETS,
-   CURSOR_OFFSETS,
+   GEN6_FEATURES,
+   .is_mobile = 1
 };
 
 #define GEN7_FEATURES  \
-- 
1.9.1

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