diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_fb.c | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h index 448d5c320a94..51dbb820ff1d 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.h +++ b/drivers/gpu/drm/omapdrm/omap_drv.h | |||
| @@ -183,7 +183,6 @@ struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev, | |||
| 183 | struct drm_file *file, const struct drm_mode_fb_cmd2 *mode_cmd); | 183 | struct drm_file *file, const struct drm_mode_fb_cmd2 *mode_cmd); |
| 184 | struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, | 184 | struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, |
| 185 | const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos); | 185 | const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos); |
| 186 | struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p); | ||
| 187 | int omap_framebuffer_pin(struct drm_framebuffer *fb); | 186 | int omap_framebuffer_pin(struct drm_framebuffer *fb); |
| 188 | void omap_framebuffer_unpin(struct drm_framebuffer *fb); | 187 | void omap_framebuffer_unpin(struct drm_framebuffer *fb); |
| 189 | void omap_framebuffer_update_scanout(struct drm_framebuffer *fb, | 188 | void omap_framebuffer_update_scanout(struct drm_framebuffer *fb, |
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c index f84570d1636c..530567cc25b7 100644 --- a/drivers/gpu/drm/omapdrm/omap_fb.c +++ b/drivers/gpu/drm/omapdrm/omap_fb.c | |||
| @@ -320,14 +320,6 @@ void omap_framebuffer_unpin(struct drm_framebuffer *fb) | |||
| 320 | mutex_unlock(&omap_fb->lock); | 320 | mutex_unlock(&omap_fb->lock); |
| 321 | } | 321 | } |
| 322 | 322 | ||
| 323 | struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p) | ||
| 324 | { | ||
| 325 | struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb); | ||
| 326 | if (p >= drm_format_num_planes(fb->pixel_format)) | ||
| 327 | return NULL; | ||
| 328 | return omap_fb->planes[p].bo; | ||
| 329 | } | ||
| 330 | |||
| 331 | /* iterate thru all the connectors, returning ones that are attached | 323 | /* iterate thru all the connectors, returning ones that are attached |
| 332 | * to the same fb.. | 324 | * to the same fb.. |
| 333 | */ | 325 | */ |
