drm/i915: Do a fuller init after reset
Subsystems (2)
PATCH 1/2 drm/i915: Do a fuller init after reset
From: Ben Widawsky <[email protected]>
I had this lying around from he original PPGTT series, and thought we might try to get it in by itself.
It's convenient to just call i915_gem_init_hw at reset because we'll be adding new things to that function, and having just one function to call instead of reimplementing it in two places is nice.
In order to accommodate we cleanup ringbuffers in order to bring them back up cleanly. Optionally, we could also teardown/re initialize the default context but this was causing some problems on reset which I wasn't able to fully debug, and is unnecessary with the previous context init/enable split.
This essentially reverts:
commit 8e88a2bd5987178d16d53686197404e149e996d9
Author: Daniel Vetter <[email protected]> Date: Tue Jun 19 18:40:00 2012 +0200
drm/i915: don't call modeset_init_hw in i915_reset
It seems to work for me on ILK now. Perhaps it's due to:
commit 8a5c2ae753c588bcb2a4e38d1c6a39865dbf1ff3
Author: Jesse Barnes <[email protected]> Date: Thu Mar 28 13:57:19 2013 -0700
drm/i915: fix ILK GPU reset for render
--- drivers/gpu/drm/i915/i915_drv.c | 29 ++++++++--------------------- drivers/gpu/drm/i915/i915_gem.c | 2 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 4 +++- 3 files changed, 13 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +8 -21
@@ -744,30 +744,17 @@ int i915_reset(struct drm_device *dev)*/ if (drm_core_check_feature (dev,DRIVER_MODESET ) || !dev_priv->ums.mm_suspended) { -struct intel_ring_buffer *ring; -int i; - +bool hw_contexts_disabled = dev_priv->hw_contexts_disabled; dev_priv->ums.mm_suspended =0 ; -i915_gem_init_swizzling (dev); - -for_each_ring (ring, dev_priv, i) - ring->init (ring); - -i915_gem_context_init (dev); -if (dev_priv->mm.aliasing_ppgtt) { - ret = dev_priv->mm.aliasing_ppgtt->enable (dev); -if (ret) -i915_gem_cleanup_aliasing_ppgtt (dev); - } - -/* -* It would make sense to re-init all the other hw state, at -* least the rps/rc6/emon init done within modeset_init_hw. For -* some unknown reason, this blows up my ilk, so don't. -*/ - + ret =i915_gem_init_hw (dev); +if (!hw_contexts_disabled && dev_priv->hw_contexts_disabled) +DRM_ERROR ("HW contexts didn't survive reset\n" );mutex_unlock (&dev->struct_mutex); +if (ret) { +DRM_ERROR ("Failed hw init on reset %d\n" , ret); +return ret; + }drm_irq_uninstall (dev);drm_irq_install (dev);
drivers/gpu/drm/i915/i915_gem.c +2 -0
@@ -2406,6 +2406,8 @@ void i915_gem_reset(struct drm_device *dev)for_each_ring (ring, dev_priv, i)i915_gem_reset_ring_lists (dev_priv, ring); +i915_gem_cleanup_ringbuffer (dev); +i915_gem_restore_fences (dev); }
drivers/gpu/drm/i915/intel_ringbuffer.c +3 -1
@@ -1324,7 +1324,7 @@ void intel_cleanup_ring_buffer(struct intel_ring_buffer *ring)/* Disable the ring buffer. The ring must be idle at this point */ dev_priv = ring->dev->dev_private; ret =intel_ring_idle (ring); -if (ret) +if (ret && !i915_reset_in_progress (&dev_priv->gpu_error))DRM_ERROR ("failed to quiesce %s whilst cleaning up: %d\n" , ring->name, ret);
@@ -1335,6 +1335,8 @@ void intel_cleanup_ring_buffer(struct intel_ring_buffer *ring)i915_gem_object_unpin (ring->obj);drm_gem_object_unreference (&ring->obj->base); ring->obj =NULL ; + ring->preallocated_lazy_request =NULL ; + ring->outstanding_lazy_seqno =0 ;if (ring->cleanup) ring->cleanup (ring);
Signature · 1 line
1.8.4
PATCH 2/2 drm/i915: cleanup context fini
From: Ben Widawsky <[email protected]>
I had this lying around from he original PPGTT series, and thought we might try to get it in by itself.
With the introduction of context refcounting we never explicitly ref/unref the backing object. As such, the previous fix was a bit wonky.
Aside from fixing the above, this patch also puts us in good shape for an upcoming patch which allows a failure to occur in between context_init and the first do_switch.
--- drivers/gpu/drm/i915/i915_gem_context.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_gem_context.c +13 -4
@@ -220,7 +220,6 @@ static int create_default_context(struct drm_i915_private *dev_priv)* may not be available. To avoid this we always pin the * default context. */ - dev_priv->ring[RCS ].default_context = ctx; ret =i915_gem_obj_ggtt_pin (ctx->obj,CONTEXT_ALIGN , false, false);if (ret) {DRM_DEBUG_DRIVER ("Couldn't pin %d\n" , ret);
@@ -233,6 +232,8 @@ static int create_default_context(struct drm_i915_private *dev_priv) goto err_unpin; } + dev_priv->ring[RCS ].default_context = ctx; +DRM_DEBUG_DRIVER ("Default HW context loaded\n" );return 0 ;
@@ -288,16 +289,24 @@ void i915_gem_context_fini(struct drm_device *dev)* other code, leading to spurious errors. */ intel_gpu_reset (dev); -i915_gem_object_unpin (dctx->obj); -/* When default context is created and switched to, base object refcount * will be 2 (+1 from object creation and +1 from do_switch()). * i915_gem_context_fini() will be called after gpu_idle() has switched * to default context. So we need to unreference the base object once * to offset the do_switch part, so that i915_gem_context_unreference() * can then free the base object correctly. */ -drm_gem_object_unreference (&dctx->obj->base); +WARN_ON (!dev_priv->ring[RCS ].last_context); +if (dev_priv->ring[RCS ].last_context == dctx) { +/* Fake switch to NULL context */ +WARN_ON (dctx->obj->active); +i915_gem_object_unpin (dctx->obj); +i915_gem_context_unreference (dctx); + } + +i915_gem_object_unpin (dctx->obj);i915_gem_context_unreference (dctx); + dev_priv->ring[RCS ].default_context =NULL ; + dev_priv->ring[RCS ].last_context =NULL ; }static int context_idr_cleanup (int id,void *p,void *data)
Signature · 1 line
1.8.4
Quoted 4 lines · Ben Widawsky
From: Ben Widawsky <[email protected]>
I had this lying around from he original PPGTT series, and thought we might try to get it in by itself.
This conflicts with Mika's work to replay pending operations after the reset. But I wholeheartedly agree with just being able to call init_hw(). I'd suggest we punt this todo task to Mika :) -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 11 lines · Chris Wilson
Quoted 4 lines · Ben Widawsky
From: Ben Widawsky <[email protected]>
I had this lying around from he original PPGTT series, and thought we might try to get it in by itself.
This conflicts with Mika's work to replay pending operations after the reset. But I wholeheartedly agree with just being able to call
init_hw(). I'd suggest we punt this todo task to Mika :) -Chris
The patch is 4 months old, and I didn't really do much other than resolve conflicts and basic tests. Also hopefully there is nothing fundamentally wrong with this so that he can't do that - it helps me in the long run with ppgtt a bit.
I'll add Mika to the CC so he doesn't miss it, hopefully we needn't wait for him.
Signature · 1 line
Ben Widawsky, Intel Open Source Technology Center
PATCH 1/1 drm/i915: Replace has_bsd/blt/vebox with a mask
In reply to Ben WidawskyFrom: Ben Widawsky <[email protected]>
I've sent this patch several times for various reasons. It essentially cleans up a lot of code where we need to do something per ring, and want to query whether or not the ring exists on that hardware.
It has various uses coming up, but for now it shouldn't be too offensive.
v2: Big conflict resolution on Damien's DEV_INFO_FOR_EACH stuff
v3: Resolved vebox addition
v4: Rebased after months of disuse. Also made failed ringbuffer init cleaner.
--- drivers/gpu/drm/i915/i915_drv.c | 32 ++++++++++++++++++++------------ drivers/gpu/drm/i915/i915_drv.h | 14 ++++++++------ drivers/gpu/drm/i915/i915_gem.c | 27 ++++++++++++++------------- 3 files changed, 42 insertions(+), 31 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +20 -12
@@ -160,49 +160,58 @@ extern int intel_agp_enabled;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 , };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 , };static const struct intel_device_info intel_i85x_info = { .gen =2 , .is_i85x =1 , .is_mobile =1 , .num_pipes =2 , .cursor_needs_physical =1 , .has_overlay =1 , .overlay_needs_physical =1 , + .ring_mask =RENDER_RING , };static const struct intel_device_info intel_i865g_info = { .gen =2 , .num_pipes =1 , .has_overlay =1 , .overlay_needs_physical =1 , + .ring_mask =RENDER_RING , };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 , };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 , .supports_tv =1 , + .ring_mask =RENDER_RING , };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 , };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 , .supports_tv =1 , + .ring_mask =RENDER_RING , };static const struct intel_device_info intel_i965g_info = { .gen =4 , .is_broadwater =1 , .num_pipes =2 , .has_hotplug =1 , .has_overlay =1 , + .ring_mask =RENDER_RING , };static const struct intel_device_info intel_i965gm_info = {
@@ -210,18 +219,20 @@ static const struct intel_device_info intel_i965gm_info = { .is_mobile = 1, .has_fbc = 1, .has_hotplug = 1, .has_overlay = 1, .supports_tv = 1, + .ring_mask = RENDER_RING, };static const struct intel_device_info intel_g33_info = { .gen =3 , .is_g33 =1 , .num_pipes =2 , .need_gfx_hws =1 , .has_hotplug =1 , .has_overlay =1 , + .ring_mask =RENDER_RING , };static const struct intel_device_info intel_g45_info = { .gen =4 , .is_g4x =1 , .need_gfx_hws =1 , .num_pipes =2 , .has_pipe_cxsr =1 , .has_hotplug =1 , - .has_bsd_ring =1 , + .ring_mask =RENDER_RING |BSD_RING , };static const struct intel_device_info intel_gm45_info = {
@@ -229,7 +240,7 @@ static const struct intel_device_info intel_gm45_info = { .is_mobile = 1, .need_gfx_hws = 1, .has_fbc = 1, .has_pipe_cxsr = 1, .has_hotplug = 1, .supports_tv = 1, - .has_bsd_ring = 1, + .ring_mask = RENDER_RING | BSD_RING, };static const struct intel_device_info intel_pineview_info = {
@@ -241,21 +252,20 @@ static const struct intel_device_info intel_pineview_info = {static const struct intel_device_info intel_ironlake_d_info = { .gen =5 , .num_pipes =2 , .need_gfx_hws =1 , .has_hotplug =1 , - .has_bsd_ring =1 , + .ring_mask =RENDER_RING |BSD_RING , };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 , - .has_bsd_ring =1 , + .ring_mask =RENDER_RING |BSD_RING , };static const struct intel_device_info intel_sandybridge_d_info = { .gen =6 , .num_pipes =2 , .need_gfx_hws =1 , .has_hotplug =1 , - .has_bsd_ring =1 , - .has_blt_ring =1 , + .ring_mask =RENDER_RING |BSD_RING |BLT_RING , .has_llc =1 , };
@@ -263,16 +273,14 @@ static const struct intel_device_info intel_sandybridge_m_info = { .gen = 6, .is_mobile = 1, .num_pipes = 2, .need_gfx_hws = 1, .has_hotplug = 1, .has_fbc = 1, - .has_bsd_ring = 1, - .has_blt_ring = 1, + .ring_mask = RENDER_RING | BSD_RING | BLT_RING, .has_llc = 1, };#define GEN7_FEATURES \ .gen = 7, .num_pipes = 3, \ .need_gfx_hws = 1, .has_hotplug = 1, \ - .has_bsd_ring = 1, \ - .has_blt_ring = 1, \ + .ring_mask = RENDER_RING | BSD_RING | BLT_RING, \ .has_llc = 1static const struct intel_device_info intel_ivybridge_d_info = {
@@ -315,7 +323,7 @@ static const struct intel_device_info intel_haswell_d_info = { .is_haswell = 1, .has_ddi = 1, .has_fpga_dbg = 1, - .has_vebox_ring = 1, + .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, };static const struct intel_device_info intel_haswell_m_info = {
@@ -325,7 +333,7 @@ static const struct intel_device_info intel_haswell_m_info = { .has_ddi = 1, .has_fpga_dbg = 1, .has_fbc = 1, - .has_vebox_ring = 1, + .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, };/*
drivers/gpu/drm/i915/i915_drv.h +8 -6
@@ -448,9 +448,6 @@ struct intel_uncore { func(has_overlay) sep \ func(overlay_needs_physical) sep \ func(supports_tv) sep \ - func(has_bsd_ring) sep \ - func(has_blt_ring) sep \ - func(has_vebox_ring) sep \ func(has_llc) sep \ func(has_ddi) sep \ func(has_fpga_dbg)
@@ -462,6 +459,7 @@ struct intel_device_info {u32 display_mmio_offset; u8 num_pipes:3;u8 gen; +u8 ring_mask;/* Rings supported by the HW */ DEV_INFO_FOR_EACH_FLAG (DEFINE_FLAG ,SEP_SEMICOLON ); };
@@ -1688,9 +1686,13 @@ struct drm_i915_file_private {#define IS_GEN6 (dev) (INTEL_INFO(dev)->gen == 6)#define IS_GEN7 (dev) (INTEL_INFO(dev)->gen == 7) -#define HAS_BSD (dev) (INTEL_INFO(dev)->has_bsd_ring) -#define HAS_BLT (dev) (INTEL_INFO(dev)->has_blt_ring) -#define HAS_VEBOX (dev) (INTEL_INFO(dev)->has_vebox_ring) +#define RENDER_RING (1<<RCS) +#define BSD_RING (1<<VCS) +#define BLT_RING (1<<BCS) +#define VEBOX_RING (1<<VECS) +#define HAS_BSD (dev) (INTEL_INFO(dev)->ring_mask & BSD_RING) +#define HAS_BLT (dev) (INTEL_INFO(dev)->ring_mask & BLT_RING) +#define HAS_VEBOX (dev) (INTEL_INFO(dev)->ring_mask & VEBOX_RING)#define HAS_LLC (dev) (INTEL_INFO(dev)->has_llc)#define HAS_WT (dev) (IS_HASWELL(dev) && to_i915(dev)->ellc_size)#define I915_NEED_GFX_HWS (dev) (INTEL_INFO(dev)->need_gfx_hws)
drivers/gpu/drm/i915/i915_gem.c +14 -13
@@ -4363,7 +4363,8 @@ intel_enable_blt(struct drm_device *dev)static int i915_gem_init_rings (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -int ret; +struct intel_ring_buffer *ring; +int ret, i; ret =intel_init_render_ring_buffer (dev);if (ret)
@@ -4372,36 +4373,36 @@ static int i915_gem_init_rings(struct drm_device *dev)if (HAS_BSD (dev)) { ret =intel_init_bsd_ring_buffer (dev);if (ret) - goto cleanup_render_ring; + goto cleanup; }if (intel_enable_blt (dev)) { ret =intel_init_blt_ring_buffer (dev);if (ret) - goto cleanup_bsd_ring; + goto cleanup; }if (HAS_VEBOX (dev)) { ret =intel_init_vebox_ring_buffer (dev);if (ret) - goto cleanup_blt_ring; + goto cleanup; } ret =i915_gem_set_seqno (dev, ((u32 )~0 -0x1000 ));if (ret) - goto cleanup_vebox_ring; + goto cleanup;return 0 ; -cleanup_vebox_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[VECS ]); -cleanup_blt_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[BCS ]); -cleanup_bsd_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[VCS ]); -cleanup_render_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[RCS ]); +cleanup: +for_each_ring (ring, dev_priv, i) { +if (!(INTEL_INFO (dev)->ring_mask & (1 <<i)) || + !ring->name) +continue ; + +intel_cleanup_ring_buffer (ring); + }return ret; }
Signature · 1 line
1.8.4
Re: [PATCH] drm/i915: Replace has_bsd/blt/vebox with a mask
drivers/gpu/drm/i915/i915_gem.c static int i915_gem_init_rings(struct drm_device *dev) · line 4402
Quoted 13 lines · Ben Widawsky
drivers/gpu/drm/i915/i915_gem.c +5
-8-cleanup_vebox_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[VECS ]); -cleanup_blt_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[BCS ]); -cleanup_bsd_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[VCS ]); -cleanup_render_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[RCS ]); +cleanup: +for_each_ring (ring, dev_priv, i) { +if (!(INTEL_INFO (dev)->ring_mask & (1 <<i)) || + !ring->name) +continue ;
This looks dubious. You don't need to check ring_mask here as that will be implicit in whatever we test for completeness. ring->name is set at the start of initialisation and is not cleaned upon error. A better choice is ring->obj, which we already check in intel_cleanup_ring_buffer.
So this becomes:
cleanup:
for_each_ring(ring, dev_priv, i)
drivers/gpu/drm/i915/i915_gem.c static int i915_gem_init_rings(struct drm_device *dev) · line 4404
Quoted 1 line
drivers/gpu/drm/i915/i915_gem.c +1
-0+intel_cleanup_ring_buffer (ring);
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH] drm/i915: Replace has_bsd/blt/vebox with a mask
Quoted 21 lines · Chris Wilson
drivers/gpu/drm/i915/i915_gem.c static int i915_gem_init_rings(struct drm_device *dev) · line 4402
Quoted 13 lines · Ben Widawsky
drivers/gpu/drm/i915/i915_gem.c +5
-8-cleanup_vebox_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[VECS ]); -cleanup_blt_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[BCS ]); -cleanup_bsd_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[VCS ]); -cleanup_render_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[RCS ]); +cleanup: +for_each_ring (ring, dev_priv, i) { +if (!(INTEL_INFO (dev)->ring_mask & (1 <<i)) || + !ring->name) +continue ;This looks dubious. You don't need to check
ring_maskhere as that will be implicit in whatever we test for completeness.ring->nameis set at the start of initialisation and is not cleaned upon error. A better choice isring->obj, which we already check inintel_cleanup_ring_buffer.
Quoted 7 lines
So this becomes:
cleanup:
for_each_ring(ring, dev_priv, i)drivers/gpu/drm/i915/i915_gem.c static int i915_gem_init_rings(struct drm_device *dev) · line 4404
Quoted 1 line
drivers/gpu/drm/i915/i915_gem.c +1
-0+intel_cleanup_ring_buffer (ring);-Chris
Actually, I just plopped this code in at the last minute because I wanted to provide a sample usage in the patch too. I do have some issues in the future of using for_each_ring(), hopefully you remember those...
In any event, I'll gladly drop this hunk. Can you review the rest?
P.S. if you want my acked-by on this above mentioned cleanup, have it.
Signature · 1 line
Ben Widawsky, Intel Open Source Technology Center
Chris Wilson
Reviewed-byRe: [PATCH] drm/i915: Replace has_bsd/blt/vebox with a mask
Quoted 30 lines · Ben Widawsky
Quoted 21 lines · Chris Wilson
drivers/gpu/drm/i915/i915_gem.c static int i915_gem_init_rings(struct drm_device *dev) · line 4402
Quoted 13 lines · Ben Widawsky
drivers/gpu/drm/i915/i915_gem.c +5
-8-cleanup_vebox_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[VECS ]); -cleanup_blt_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[BCS ]); -cleanup_bsd_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[VCS ]); -cleanup_render_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[RCS ]); +cleanup: +for_each_ring (ring, dev_priv, i) { +if (!(INTEL_INFO (dev)->ring_mask & (1 <<i)) || + !ring->name) +continue ;This looks dubious. You don't need to check
ring_maskhere as that will be implicit in whatever we test for completeness.ring->nameis set at the start of initialisation and is not cleaned upon error. A better choice isring->obj, which we already check inintel_cleanup_ring_buffer.Quoted 7 lines
So this becomes:
cleanup:
for_each_ring(ring, dev_priv, i)drivers/gpu/drm/i915/i915_gem.c static int i915_gem_init_rings(struct drm_device *dev) · line 4404
Quoted 1 line
drivers/gpu/drm/i915/i915_gem.c +1
-0+intel_cleanup_ring_buffer (ring);-Chris
Quoted 5 lines
Actually, I just plopped this code in at the last minute because I wanted to provide a sample usage in the patch too. I do have some issues in the future of using
for_each_ring(), hopefully you remember those...In any event, I'll gladly drop this hunk. Can you review the rest?
No comments on the rest and lgtm, so
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
PATCH 1/1 drm/i915: Replace has_bsd/blt/vebox with a mask
From: Ben Widawsky <[email protected]>
I've sent this patch several times for various reasons. It essentially cleans up a lot of code where we need to do something per ring, and want to query whether or not the ring exists on that hardware.
It has various uses coming up, but for now it shouldn't be too offensive.
v2: Big conflict resolution on Damien's DEV_INFO_FOR_EACH stuff
v3: Resolved vebox addition
v4: Rebased after months of disuse. Also made failed ringbuffer init cleaner.
v5: Remove the init cleaner from v4. There is a better way to do it. (Chris)
--- drivers/gpu/drm/i915/i915_drv.c | 32 ++++++++++++++++++++------------ drivers/gpu/drm/i915/i915_drv.h | 14 ++++++++------ 2 files changed, 28 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +20 -12
@@ -160,49 +160,58 @@ extern int intel_agp_enabled;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 , };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 , };static const struct intel_device_info intel_i85x_info = { .gen =2 , .is_i85x =1 , .is_mobile =1 , .num_pipes =2 , .cursor_needs_physical =1 , .has_overlay =1 , .overlay_needs_physical =1 , + .ring_mask =RENDER_RING , };static const struct intel_device_info intel_i865g_info = { .gen =2 , .num_pipes =1 , .has_overlay =1 , .overlay_needs_physical =1 , + .ring_mask =RENDER_RING , };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 , };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 , .supports_tv =1 , + .ring_mask =RENDER_RING , };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 , };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 , .supports_tv =1 , + .ring_mask =RENDER_RING , };static const struct intel_device_info intel_i965g_info = { .gen =4 , .is_broadwater =1 , .num_pipes =2 , .has_hotplug =1 , .has_overlay =1 , + .ring_mask =RENDER_RING , };static const struct intel_device_info intel_i965gm_info = {
@@ -210,18 +219,20 @@ static const struct intel_device_info intel_i965gm_info = { .is_mobile = 1, .has_fbc = 1, .has_hotplug = 1, .has_overlay = 1, .supports_tv = 1, + .ring_mask = RENDER_RING, };static const struct intel_device_info intel_g33_info = { .gen =3 , .is_g33 =1 , .num_pipes =2 , .need_gfx_hws =1 , .has_hotplug =1 , .has_overlay =1 , + .ring_mask =RENDER_RING , };static const struct intel_device_info intel_g45_info = { .gen =4 , .is_g4x =1 , .need_gfx_hws =1 , .num_pipes =2 , .has_pipe_cxsr =1 , .has_hotplug =1 , - .has_bsd_ring =1 , + .ring_mask =RENDER_RING |BSD_RING , };static const struct intel_device_info intel_gm45_info = {
@@ -229,7 +240,7 @@ static const struct intel_device_info intel_gm45_info = { .is_mobile = 1, .need_gfx_hws = 1, .has_fbc = 1, .has_pipe_cxsr = 1, .has_hotplug = 1, .supports_tv = 1, - .has_bsd_ring = 1, + .ring_mask = RENDER_RING | BSD_RING, };static const struct intel_device_info intel_pineview_info = {
@@ -241,21 +252,20 @@ static const struct intel_device_info intel_pineview_info = {static const struct intel_device_info intel_ironlake_d_info = { .gen =5 , .num_pipes =2 , .need_gfx_hws =1 , .has_hotplug =1 , - .has_bsd_ring =1 , + .ring_mask =RENDER_RING |BSD_RING , };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 , - .has_bsd_ring =1 , + .ring_mask =RENDER_RING |BSD_RING , };static const struct intel_device_info intel_sandybridge_d_info = { .gen =6 , .num_pipes =2 , .need_gfx_hws =1 , .has_hotplug =1 , - .has_bsd_ring =1 , - .has_blt_ring =1 , + .ring_mask =RENDER_RING |BSD_RING |BLT_RING , .has_llc =1 , };
@@ -263,16 +273,14 @@ static const struct intel_device_info intel_sandybridge_m_info = { .gen = 6, .is_mobile = 1, .num_pipes = 2, .need_gfx_hws = 1, .has_hotplug = 1, .has_fbc = 1, - .has_bsd_ring = 1, - .has_blt_ring = 1, + .ring_mask = RENDER_RING | BSD_RING | BLT_RING, .has_llc = 1, };#define GEN7_FEATURES \ .gen = 7, .num_pipes = 3, \ .need_gfx_hws = 1, .has_hotplug = 1, \ - .has_bsd_ring = 1, \ - .has_blt_ring = 1, \ + .ring_mask = RENDER_RING | BSD_RING | BLT_RING, \ .has_llc = 1static const struct intel_device_info intel_ivybridge_d_info = {
@@ -315,7 +323,7 @@ static const struct intel_device_info intel_haswell_d_info = { .is_haswell = 1, .has_ddi = 1, .has_fpga_dbg = 1, - .has_vebox_ring = 1, + .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, };static const struct intel_device_info intel_haswell_m_info = {
@@ -325,7 +333,7 @@ static const struct intel_device_info intel_haswell_m_info = { .has_ddi = 1, .has_fpga_dbg = 1, .has_fbc = 1, - .has_vebox_ring = 1, + .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, };/*
drivers/gpu/drm/i915/i915_drv.h +8 -6
@@ -448,9 +448,6 @@ struct intel_uncore { func(has_overlay) sep \ func(overlay_needs_physical) sep \ func(supports_tv) sep \ - func(has_bsd_ring) sep \ - func(has_blt_ring) sep \ - func(has_vebox_ring) sep \ func(has_llc) sep \ func(has_ddi) sep \ func(has_fpga_dbg)
@@ -462,6 +459,7 @@ struct intel_device_info {u32 display_mmio_offset; u8 num_pipes:3;u8 gen; +u8 ring_mask;/* Rings supported by the HW */ DEV_INFO_FOR_EACH_FLAG (DEFINE_FLAG ,SEP_SEMICOLON ); };
@@ -1688,9 +1686,13 @@ struct drm_i915_file_private {#define IS_GEN6 (dev) (INTEL_INFO(dev)->gen == 6)#define IS_GEN7 (dev) (INTEL_INFO(dev)->gen == 7) -#define HAS_BSD (dev) (INTEL_INFO(dev)->has_bsd_ring) -#define HAS_BLT (dev) (INTEL_INFO(dev)->has_blt_ring) -#define HAS_VEBOX (dev) (INTEL_INFO(dev)->has_vebox_ring) +#define RENDER_RING (1<<RCS) +#define BSD_RING (1<<VCS) +#define BLT_RING (1<<BCS) +#define VEBOX_RING (1<<VECS) +#define HAS_BSD (dev) (INTEL_INFO(dev)->ring_mask & BSD_RING) +#define HAS_BLT (dev) (INTEL_INFO(dev)->ring_mask & BLT_RING) +#define HAS_VEBOX (dev) (INTEL_INFO(dev)->ring_mask & VEBOX_RING)#define HAS_LLC (dev) (INTEL_INFO(dev)->has_llc)#define HAS_WT (dev) (IS_HASWELL(dev) && to_i915(dev)->ellc_size)#define I915_NEED_GFX_HWS (dev) (INTEL_INFO(dev)->need_gfx_hws)
Signature · 1 line
1.8.4
Re: [PATCH] drm/i915: Replace has_bsd/blt/vebox with a mask
Quoted 13 lines · Ben Widawsky
From: Ben Widawsky <[email protected]>
I've sent this patch several times for various reasons. It essentially cleans up a lot of code where we need to do something per ring, and want to query whether or not the ring exists on that hardware.
It has various uses coming up, but for now it shouldn't be too offensive.
v2: Big conflict resolution on Damien's
DEV_INFO_FOR_EACHstuffv3: Resolved vebox addition
Quoted 8 lines
v4: Rebased after months of disuse. Also made failed ringbuffer init cleaner.
v5: Remove the init cleaner from v4. There is a better way to do it. (Chris)
Reviewed-by Chris Wilson <[email protected]>Signed-off-by Ben Widawsky <[email protected]>
Series merged, thanks for patches&review.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch