diff options
author | Oscar Mateo <oscar.mateo@intel.com> | 2014-07-24 12:04:15 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-08-11 10:10:58 -0400 |
commit | 84c2377fcee7a43cd964b62143e9a3714130bb0c (patch) | |
tree | 15f76ff6f576544e00180e1231558ecd847a28a8 /drivers/gpu/drm/i915/intel_ringbuffer.c | |
parent | 8c8579176a144b1dca1d99ebb92510924168d508 (diff) |
drm/i915/bdw: Allocate ringbuffers for Logical Ring Contexts
As we have said a couple of times by now, logical ring contexts have
their own ringbuffers: not only the backing pages, but the whole
management struct.
In a previous version of the series, this was achieved with two separate
patches:
drm/i915/bdw: Allocate ringbuffer backing objects for default global LRC
drm/i915/bdw: Allocate ringbuffer for user-created LRCs
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index a059b64a0fb2..064652034d7e 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -1519,7 +1519,7 @@ static int init_phys_status_page(struct intel_engine_cs *ring) | |||
1519 | return 0; | 1519 | return 0; |
1520 | } | 1520 | } |
1521 | 1521 | ||
1522 | static void intel_destroy_ringbuffer_obj(struct intel_ringbuffer *ringbuf) | 1522 | void intel_destroy_ringbuffer_obj(struct intel_ringbuffer *ringbuf) |
1523 | { | 1523 | { |
1524 | if (!ringbuf->obj) | 1524 | if (!ringbuf->obj) |
1525 | return; | 1525 | return; |
@@ -1530,8 +1530,8 @@ static void intel_destroy_ringbuffer_obj(struct intel_ringbuffer *ringbuf) | |||
1530 | ringbuf->obj = NULL; | 1530 | ringbuf->obj = NULL; |
1531 | } | 1531 | } |
1532 | 1532 | ||
1533 | static int intel_alloc_ringbuffer_obj(struct drm_device *dev, | 1533 | int intel_alloc_ringbuffer_obj(struct drm_device *dev, |
1534 | struct intel_ringbuffer *ringbuf) | 1534 | struct intel_ringbuffer *ringbuf) |
1535 | { | 1535 | { |
1536 | struct drm_i915_private *dev_priv = to_i915(dev); | 1536 | struct drm_i915_private *dev_priv = to_i915(dev); |
1537 | struct drm_i915_gem_object *obj; | 1537 | struct drm_i915_gem_object *obj; |