| Message ID | 1409830075-11139-9-git-send-email-damien.lespiau@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 4 September 2014 12:26, Damien Lespiau <damien.lespiau@intel.com> wrote: > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> While discussing this with Damien, he mentioned that legacy ring buffer submission is not supported on gen 9 and perhaps dispatch_execbuffer should be set to null instead. > --- > drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > index f8aadc3..7b3d0ca 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -2361,7 +2361,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) > > if (IS_HASWELL(dev)) > ring->dispatch_execbuffer = hsw_ring_dispatch_execbuffer; > - else if (IS_GEN8(dev)) > + else if (INTEL_INFO(dev)->gen >= 8) > ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer; > else if (INTEL_INFO(dev)->gen >= 6) > ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; > -- > 1.8.3.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Tue, Sep 16, 2014 at 03:53:12PM +0100, Thomas Wood wrote: > On 4 September 2014 12:26, Damien Lespiau <damien.lespiau@intel.com> wrote: > > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> > > --- > > drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > > index f8aadc3..7b3d0ca 100644 > > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > > @@ -2361,7 +2361,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) > > > > if (IS_HASWELL(dev)) > > ring->dispatch_execbuffer = hsw_ring_dispatch_execbuffer; > > - else if (IS_GEN8(dev)) > > + else if (INTEL_INFO(dev)->gen >= 8) > > ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer; > > else if (INTEL_INFO(dev)->gen >= 6) > > ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; > > While discussing this with Damien, he mentioned that legacy ring > buffer submission is not supported on gen 9 and perhaps > dispatch_execbuffer should be set to null instead. We can just drop the whole patch I guess, not expecting to run that code on gen >= 9.
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index f8aadc3..7b3d0ca 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -2361,7 +2361,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) if (IS_HASWELL(dev)) ring->dispatch_execbuffer = hsw_ring_dispatch_execbuffer; - else if (IS_GEN8(dev)) + else if (INTEL_INFO(dev)->gen >= 8) ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer; else if (INTEL_INFO(dev)->gen >= 6) ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> --- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)