Re: [Intel-gfx] [PATCH 18/23] drm/i915: Introduce GEN2 FEATURES for device info

2016-07-20 Thread 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 830, 845g, i85x, i865g.
>
> Signed-off-by: Carlos Santa 
> ---
>  drivers/gpu/drm/i915/i915_pci.c | 33 +
>  1 file changed, 13 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 5c490f8..50569c1 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -54,38 +54,31 @@
>  #define CHV_COLORS \
> .color = { .degamma_lut_size = 65, .gamma_lut_size = 257 }
>
> +#define GEN2_FEATURES \
> +   .gen = 2, .num_pipes = 1, \
> +   .has_overlay = 1, .overlay_needs_physical = 1, \
> +   .ring_mask = RENDER_RING, \
> +   GEN_DEFAULT_PIPEOFFSETS, \
> +   CURSOR_OFFSETS
> +
>  static const struct intel_device_info intel_i830_info = {
> -   .gen = 2, .is_mobile = 1, .cursor_needs_physical = 1, .num_pipes = 2,
> -   .has_overlay = 1, .overlay_needs_physical = 1,
> -   .ring_mask = RENDER_RING,
> -   GEN_DEFAULT_PIPEOFFSETS,
> -   CURSOR_OFFSETS,
> +   GEN2_FEATURES,
> +   .is_mobile = 1, .cursor_needs_physical = 1,
>  };
>
>  static const struct intel_device_info intel_845g_info = {
> -   .gen = 2, .num_pipes = 1,
> -   .has_overlay = 1, .overlay_needs_physical = 1,
> -   .ring_mask = RENDER_RING,
> -   GEN_DEFAULT_PIPEOFFSETS,
> -   CURSOR_OFFSETS,
> +   GEN2_FEATURES,
>  };
>
>  static const struct intel_device_info intel_i85x_info = {
> -   .gen = 2, .is_i85x = 1, .is_mobile = 1, .num_pipes = 2,
> +   GEN2_FEATURES,

this patch is reducing the number of supported pipes for this platform.

> +   .is_i85x = 1, .is_mobile = 1,
> .cursor_needs_physical = 1,
> -   .has_overlay = 1, .overlay_needs_physical = 1,
> .has_fbc = 1,
> -   .ring_mask = RENDER_RING,
> -   GEN_DEFAULT_PIPEOFFSETS,
> -   CURSOR_OFFSETS,
>  };
>
>  static const struct intel_device_info intel_i865g_info = {
> -   .gen = 2, .num_pipes = 1,
> -   .has_overlay = 1, .overlay_needs_physical = 1,
> -   .ring_mask = RENDER_RING,
> -   GEN_DEFAULT_PIPEOFFSETS,
> -   CURSOR_OFFSETS,
> +   GEN2_FEATURES,
>  };
>
>  #define GEN3_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 18/23] drm/i915: Introduce GEN2 FEATURES for device info

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

Use it for 830, 845g, i85x, i865g.

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

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 5c490f8..50569c1 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -54,38 +54,31 @@
 #define CHV_COLORS \
.color = { .degamma_lut_size = 65, .gamma_lut_size = 257 }
 
+#define GEN2_FEATURES \
+   .gen = 2, .num_pipes = 1, \
+   .has_overlay = 1, .overlay_needs_physical = 1, \
+   .ring_mask = RENDER_RING, \
+   GEN_DEFAULT_PIPEOFFSETS, \
+   CURSOR_OFFSETS
+
 static const struct intel_device_info intel_i830_info = {
-   .gen = 2, .is_mobile = 1, .cursor_needs_physical = 1, .num_pipes = 2,
-   .has_overlay = 1, .overlay_needs_physical = 1,
-   .ring_mask = RENDER_RING,
-   GEN_DEFAULT_PIPEOFFSETS,
-   CURSOR_OFFSETS,
+   GEN2_FEATURES,
+   .is_mobile = 1, .cursor_needs_physical = 1,
 };
 
 static const struct intel_device_info intel_845g_info = {
-   .gen = 2, .num_pipes = 1,
-   .has_overlay = 1, .overlay_needs_physical = 1,
-   .ring_mask = RENDER_RING,
-   GEN_DEFAULT_PIPEOFFSETS,
-   CURSOR_OFFSETS,
+   GEN2_FEATURES,
 };
 
 static const struct intel_device_info intel_i85x_info = {
-   .gen = 2, .is_i85x = 1, .is_mobile = 1, .num_pipes = 2,
+   GEN2_FEATURES,
+   .is_i85x = 1, .is_mobile = 1,
.cursor_needs_physical = 1,
-   .has_overlay = 1, .overlay_needs_physical = 1,
.has_fbc = 1,
-   .ring_mask = RENDER_RING,
-   GEN_DEFAULT_PIPEOFFSETS,
-   CURSOR_OFFSETS,
 };
 
 static const struct intel_device_info intel_i865g_info = {
-   .gen = 2, .num_pipes = 1,
-   .has_overlay = 1, .overlay_needs_physical = 1,
-   .ring_mask = RENDER_RING,
-   GEN_DEFAULT_PIPEOFFSETS,
-   CURSOR_OFFSETS,
+   GEN2_FEATURES,
 };
 
 #define GEN3_FEATURES \
-- 
1.9.1

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