diff options
| author | Rob Clark | 2013-08-07 19:41:21 +0200 |
|---|---|---|
| committer | Dave Airlie | 2013-08-19 02:33:39 +0200 |
| commit | 5833bd2fe1c7d9e2650a11a8785b848bbd0d0188 (patch) | |
| tree | a269a17ae4b26775be3d82baa85d3e7ae1824ab1 /drivers/gpu/drm/omapdrm/omap_drv.h | |
| parent | drm/tilcdc: use flip-work helper (diff) | |
| download | kernel-qcow2-linux-5833bd2fe1c7d9e2650a11a8785b848bbd0d0188.tar.gz kernel-qcow2-linux-5833bd2fe1c7d9e2650a11a8785b848bbd0d0188.tar.xz kernel-qcow2-linux-5833bd2fe1c7d9e2650a11a8785b848bbd0d0188.zip | |
drm/omap: use flip-work helper
And simplify how we hold a ref+pin to what is being scanned out by using
fb refcnt'ing. The previous logic pre-dated fb refcnt, and as a result
was less straightforward than it could have been. By holding a ref to
the fb, we don't have to care about how many plane's there are and
holding a ref to each color plane's bo.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_drv.h')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h index f2ba425d80dd..30b95b736658 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.h +++ b/drivers/gpu/drm/omapdrm/omap_drv.h @@ -203,9 +203,8 @@ struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev, struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos); struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p); -int omap_framebuffer_replace(struct drm_framebuffer *a, - struct drm_framebuffer *b, void *arg, - void (*unpin)(void *arg, struct drm_gem_object *bo)); +int omap_framebuffer_pin(struct drm_framebuffer *fb); +int omap_framebuffer_unpin(struct drm_framebuffer *fb); void omap_framebuffer_update_scanout(struct drm_framebuffer *fb, struct omap_drm_window *win, struct omap_overlay_info *info); struct drm_connector *omap_framebuffer_get_next_connector( |