aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/gma500/framebuffer.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-12-13 17:38:38 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-01-20 09:29:24 -0500
commitc7d73f6a8ad71f9d9f58c86981322c6e48093a4f (patch)
tree5710889ea53df0cb695f96175708a91e430e8e45 /drivers/gpu/drm/gma500/framebuffer.c
parent065a50ed3ef75cb265e12e3e1b615db0835150bc (diff)
drm/<drivers>: reorder framebuffer init sequence
With more fine-grained locking we can no longer rely on the big mode_config lock to prevent concurrent access to mode resources like framebuffers. Instead a framebuffer becomes accessible to other threads as soon as it is added to the relevant lookup structures. Hence it needs to be fully set up by the time drivers call drm_framebuffer_init. This patch here is the drivers part of that reorg. Nothing really fancy going on safe for three special cases. - exynos needs to be careful to properly unref all handles. - nouveau gets a resource leak fixed for free: one of the error cases didn't cleanup the framebuffer, which is now moot since the framebuffer is only registered once it is fully set up. - vmwgfx requires a slight reordering of operations, I'm hoping I didn't break anything (but it's refcount management only, so should be safe). v2: Split out exynos, since it's a bit more hairy than expected. v3: Drop bogus cirrus hunk noticed by Richard Wilbur. v4: Split out vmwgfx since there's a small change in return values. Reviewed-by: Rob Clark <rob@ti.com> (core + omapdrm) Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/gma500/framebuffer.c')
-rw-r--r--drivers/gpu/drm/gma500/framebuffer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index afded54dbb10..38e7e7597de2 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -260,13 +260,13 @@ static int psb_framebuffer_init(struct drm_device *dev,
260 default: 260 default:
261 return -EINVAL; 261 return -EINVAL;
262 } 262 }
263 drm_helper_mode_fill_fb_struct(&fb->base, mode_cmd);
264 fb->gtt = gt;
263 ret = drm_framebuffer_init(dev, &fb->base, &psb_fb_funcs); 265 ret = drm_framebuffer_init(dev, &fb->base, &psb_fb_funcs);
264 if (ret) { 266 if (ret) {
265 dev_err(dev->dev, "framebuffer init failed: %d\n", ret); 267 dev_err(dev->dev, "framebuffer init failed: %d\n", ret);
266 return ret; 268 return ret;
267 } 269 }
268 drm_helper_mode_fill_fb_struct(&fb->base, mode_cmd);
269 fb->gtt = gt;
270 return 0; 270 return 0;
271} 271}
272 272