[Intel-gfx] [PATCH 17/23] drm/i915: Introduce GEN3_FEATURES for device info

[Rodrigo Vivi]

same as previous patch

On Wed, Jul 20, 2016 at 10:40 AM, Carlos Santa <carlos.santa at intel.com> wrote:
> Based on the GEN7_FEATURES changes from Ben W.
>
> Use it for i915g, i915gm, i945g, i945gm, g33 and pineview.
>
> Signed-off-by: Carlos Santa <carlos.santa at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_pci.c | 58 ++++++++++++++++++++---------------------
>  1 file changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index c4fdb4d..5c490f8 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -88,39 +88,42 @@ static const struct intel_device_info intel_i865g_info = {
>         CURSOR_OFFSETS,
>  };
>
> +#define GEN3_FEATURES \
> +       .gen = 3, .num_pipes = 2,\
> +       .ring_mask = RENDER_RING, \
> +       GEN_DEFAULT_PIPEOFFSETS, \
> +       CURSOR_OFFSETS
> +
> +#define GEN3_i9X5_FEATURES \
> +       .cursor_needs_physical = 1, \
> +       .has_overlay = 1, \
> +       .overlay_needs_physical = 1
> +
>  static const struct intel_device_info intel_i915g_info = {
> -       .gen = 3, .is_i915g = 1, .cursor_needs_physical = 1, .num_pipes = 2,
> -       .has_overlay = 1, .overlay_needs_physical = 1,
> -       .ring_mask = RENDER_RING,
> -       GEN_DEFAULT_PIPEOFFSETS,
> -       CURSOR_OFFSETS,
> +       GEN3_FEATURES,
> +       GEN3_i9X5_FEATURES,
> +       .is_i915g = 1,
> +
>  };
>  static const struct intel_device_info intel_i915gm_info = {
> -       .gen = 3, .is_mobile = 1, .num_pipes = 2,
> -       .cursor_needs_physical = 1,
> -       .has_overlay = 1, .overlay_needs_physical = 1,
> +       GEN3_FEATURES,
> +       GEN3_i9X5_FEATURES,
> +       .is_mobile = 1,
>         .supports_tv = 1,
>         .has_fbc = 1,
> -       .ring_mask = RENDER_RING,
> -       GEN_DEFAULT_PIPEOFFSETS,
> -       CURSOR_OFFSETS,
>  };
>  static const struct intel_device_info intel_i945g_info = {
> -       .gen = 3, .has_hotplug = 1, .cursor_needs_physical = 1, .num_pipes = 2,
> -       .has_overlay = 1, .overlay_needs_physical = 1,
> -       .ring_mask = RENDER_RING,
> -       GEN_DEFAULT_PIPEOFFSETS,
> -       CURSOR_OFFSETS,
> +       GEN3_FEATURES,
> +       GEN3_i9X5_FEATURES,
> +       .has_hotplug = 1,
>  };
>  static const struct intel_device_info intel_i945gm_info = {
> -       .gen = 3, .is_i945gm = 1, .is_mobile = 1, .num_pipes = 2,
> -       .has_hotplug = 1, .cursor_needs_physical = 1,
> -       .has_overlay = 1, .overlay_needs_physical = 1,
> +       GEN3_FEATURES,
> +       GEN3_i9X5_FEATURES,
> +       .is_i945gm = 1, .is_mobile = 1,
> +       .has_hotplug = 1,
>         .supports_tv = 1,
>         .has_fbc = 1,
> -       .ring_mask = RENDER_RING,
> -       GEN_DEFAULT_PIPEOFFSETS,
> -       CURSOR_OFFSETS,
>  };
>
>  #define GEN4_FEATURES \
> @@ -154,12 +157,10 @@ static const struct intel_device_info intel_i965gm_info = {
>  };
>
>  static const struct intel_device_info intel_g33_info = {
> -       .gen = 3, .is_g33 = 1, .num_pipes = 2,
> +       GEN3_FEATURES,
> +       .is_g33 = 1,
>         .need_gfx_hws = 1, .has_hotplug = 1,
>         .has_overlay = 1,
> -       .ring_mask = RENDER_RING,
> -       GEN_DEFAULT_PIPEOFFSETS,
> -       CURSOR_OFFSETS,
>  };
>
>  static const struct intel_device_info intel_g45_info = {
> @@ -175,11 +176,10 @@ static const struct intel_device_info intel_gm45_info = {
>  };
>
>  static const struct intel_device_info intel_pineview_info = {
> -       .gen = 3, .is_g33 = 1, .is_pineview = 1, .is_mobile = 1, .num_pipes = 2,
> +       GEN3_FEATURES,
> +       .is_g33 = 1, .is_pineview = 1, .is_mobile = 1,
>         .need_gfx_hws = 1, .has_hotplug = 1,
>         .has_overlay = 1,
> -       GEN_DEFAULT_PIPEOFFSETS,
> -       CURSOR_OFFSETS,
>  };
>
>  #define GEN5_FEATURES \
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br