| Message ID | 1470768327-14932-12-git-send-email-carlos.santa@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Aug 09, 2016 at 11:45:17AM -0700, Carlos Santa wrote: > Based on the GEN7_FEATURES changes from Ben w. Maybe this comment and also on the previous GEN6_FEATURE could be improved. And also good to Cc people you are mentioning on the commit message. Besides I still believe we should add this but also making the next platform get based on the previous one. Anyway this can be done later so I won't block the progress here. Feel free to use Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Use it for ilk. > > Signed-off-by: Carlos Santa <carlos.santa@intel.com> > --- > drivers/gpu/drm/i915/i915_pci.c | 21 ++++++++++----------- > 1 file changed, 10 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index ba0f5c8f..8a50e45 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -178,21 +178,20 @@ static const struct intel_device_info intel_pineview_info = { > CURSOR_OFFSETS, > }; > > +#define GEN5_FEATURES \ > + .gen = 5, .num_pipes = 2, \ > + .need_gfx_hws = 1, .has_hotplug = 1, \ > + .ring_mask = RENDER_RING | BSD_RING, \ > + GEN_DEFAULT_PIPEOFFSETS, \ > + CURSOR_OFFSETS > + > static const struct intel_device_info intel_ironlake_d_info = { > - .gen = 5, .num_pipes = 2, > - .need_gfx_hws = 1, .has_hotplug = 1, > - .ring_mask = RENDER_RING | BSD_RING, > - GEN_DEFAULT_PIPEOFFSETS, > - CURSOR_OFFSETS, > + GEN5_FEATURES, > }; > > static const struct intel_device_info intel_ironlake_m_info = { > - .gen = 5, .is_mobile = 1, .num_pipes = 2, > - .need_gfx_hws = 1, .has_hotplug = 1, > - .has_fbc = 1, > - .ring_mask = RENDER_RING | BSD_RING, > - GEN_DEFAULT_PIPEOFFSETS, > - CURSOR_OFFSETS, > + GEN5_FEATURES, > + .is_mobile = 1, > }; > > #define GEN6_FEATURES \ > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index ba0f5c8f..8a50e45 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -178,21 +178,20 @@ static const struct intel_device_info intel_pineview_info = { CURSOR_OFFSETS, }; +#define GEN5_FEATURES \ + .gen = 5, .num_pipes = 2, \ + .need_gfx_hws = 1, .has_hotplug = 1, \ + .ring_mask = RENDER_RING | BSD_RING, \ + GEN_DEFAULT_PIPEOFFSETS, \ + CURSOR_OFFSETS + static const struct intel_device_info intel_ironlake_d_info = { - .gen = 5, .num_pipes = 2, - .need_gfx_hws = 1, .has_hotplug = 1, - .ring_mask = RENDER_RING | BSD_RING, - GEN_DEFAULT_PIPEOFFSETS, - CURSOR_OFFSETS, + GEN5_FEATURES, }; static const struct intel_device_info intel_ironlake_m_info = { - .gen = 5, .is_mobile = 1, .num_pipes = 2, - .need_gfx_hws = 1, .has_hotplug = 1, - .has_fbc = 1, - .ring_mask = RENDER_RING | BSD_RING, - GEN_DEFAULT_PIPEOFFSETS, - CURSOR_OFFSETS, + GEN5_FEATURES, + .is_mobile = 1, }; #define GEN6_FEATURES \
Based on the GEN7_FEATURES changes from Ben w. Use it for ilk. Signed-off-by: Carlos Santa <carlos.santa@intel.com> --- drivers/gpu/drm/i915/i915_pci.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)