openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Cleanup after failed initialization of ringbuffers 

The callers expect us to cleanup any partially initialised structures
before reporting the error.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Chris Wilson 2010-05-27 13:18:22 +01:00 committed by Eric Anholt
parent 654fc6073f
commit 68f95ba9e2
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/i915/i915_gem.c
View File

@ -4632,23 +4632,40 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
{ {
drm_i915_private_t *dev_priv = dev->dev_private; drm_i915_private_t *dev_priv = dev->dev_private;
int ret; int ret;
dev_priv->render_ring = render_ring; dev_priv->render_ring = render_ring;
if (!I915_NEED_GFX_HWS(dev)) { if (!I915_NEED_GFX_HWS(dev)) {
dev_priv->render_ring.status_page.page_addr dev_priv->render_ring.status_page.page_addr
= dev_priv->status_page_dmah->vaddr; = dev_priv->status_page_dmah->vaddr;
memset(dev_priv->render_ring.status_page.page_addr, memset(dev_priv->render_ring.status_page.page_addr,
0, PAGE_SIZE); 0, PAGE_SIZE);
} }
if (HAS_PIPE_CONTROL(dev)) { if (HAS_PIPE_CONTROL(dev)) {
ret = i915_gem_init_pipe_control(dev); ret = i915_gem_init_pipe_control(dev);
if (ret) if (ret)
return ret; return ret;
} }
ret = intel_init_ring_buffer(dev, &dev_priv->render_ring); ret = intel_init_ring_buffer(dev, &dev_priv->render_ring);
if (!ret && HAS_BSD(dev)) { if (ret)
goto cleanup_pipe_control;
if (HAS_BSD(dev)) {
dev_priv->bsd_ring = bsd_ring; dev_priv->bsd_ring = bsd_ring;
ret = intel_init_ring_buffer(dev, &dev_priv->bsd_ring); ret = intel_init_ring_buffer(dev, &dev_priv->bsd_ring);
if (ret)
goto cleanup_render_ring;
} }
return 0;
cleanup_render_ring:
intel_cleanup_ring_buffer(dev, &dev_priv->render_ring);
cleanup_pipe_control:
if (HAS_PIPE_CONTROL(dev))
i915_gem_cleanup_pipe_control(dev);
return ret; return ret;
} }