| Message ID | 1469036435-18918-14-git-send-email-carlos.santa@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> On Wed, Jul 20, 2016 at 10:40 AM, Carlos Santa <carlos.santa@intel.com> wrote: > 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, 11 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 099f134..3844840 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -177,21 +177,22 @@ 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, > + GEN5_FEATURES, > + .is_mobile = 1, > .has_fbc = 1, > - .ring_mask = RENDER_RING | BSD_RING, > - GEN_DEFAULT_PIPEOFFSETS, > - CURSOR_OFFSETS, > + > }; > > #define GEN6_FEATURES \ > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
ops, actually on this one you could do GEN6_FEATURE inherit and extend this. On Wed, Jul 20, 2016 at 2:22 PM, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote: > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > On Wed, Jul 20, 2016 at 10:40 AM, Carlos Santa <carlos.santa@intel.com> wrote: >> 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, 11 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c >> index 099f134..3844840 100644 >> --- a/drivers/gpu/drm/i915/i915_pci.c >> +++ b/drivers/gpu/drm/i915/i915_pci.c >> @@ -177,21 +177,22 @@ 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, >> + GEN5_FEATURES, >> + .is_mobile = 1, >> .has_fbc = 1, >> - .ring_mask = RENDER_RING | BSD_RING, >> - GEN_DEFAULT_PIPEOFFSETS, >> - CURSOR_OFFSETS, >> + >> }; >> >> #define GEN6_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
On Wed, 20 Jul 2016, Carlos Santa <carlos.santa@intel.com> wrote: > 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, 11 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 099f134..3844840 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -177,21 +177,22 @@ 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 Like before, please stick the comma at the end. > }; > > 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, > + GEN5_FEATURES, > + .is_mobile = 1, > .has_fbc = 1, > - .ring_mask = RENDER_RING | BSD_RING, > - GEN_DEFAULT_PIPEOFFSETS, > - CURSOR_OFFSETS, > + Do not add superfluous empty lines. BR, Jani. > }; > > #define GEN6_FEATURES \
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 099f134..3844840 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -177,21 +177,22 @@ 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, + GEN5_FEATURES, + .is_mobile = 1, .has_fbc = 1, - .ring_mask = RENDER_RING | BSD_RING, - GEN_DEFAULT_PIPEOFFSETS, - CURSOR_OFFSETS, + }; #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, 11 insertions(+), 10 deletions(-)