On Thu, Jul 28, 2016 at 12:12:31PM -0700, Carlos Santa wrote:
> Based on the GEN7_FEATURES changes from Ben W.
>
> Use it for 830, 845g, i85x, i865g.
>
> Signed-off-by: Carlos Santa <carlos.santa@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_pci.c | 33 ++++++++++++++-------------------
> 1 file changed, 14 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index c43d25a..7a14f68 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -54,38 +54,33 @@
> #define CHV_COLORS \
> .color = { .degamma_lut_size = 65, .gamma_lut_size = 257 }
>
> +#define GEN2_FEATURES \
> + .gen=2, .num_pipes = 2, \
I would keep num_pipes out from the template as there's no "standard"
number of pipes for gen2.
> + .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,
> + .num_pipes = 1,
> };
>
> 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 = {
> + GEN2_FEATURES,
> .gen = 2, .num_pipes = 1,
> - .has_overlay = 1, .overlay_needs_physical = 1,
> - .ring_mask = RENDER_RING,
> - GEN_DEFAULT_PIPEOFFSETS,
> - CURSOR_OFFSETS,
> };
>
> #define GEN3_FEATURES \
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
