On 26/04/16 23:35, Laurent Pinchart wrote:
> The function is never used, remove it.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/omapdrm/omap_drv.h | 1 -
> drivers/gpu/drm/omapdrm/omap_fb.c | 10 ----------
> 2 files changed, 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
> index e30b77c42f63..bcb9520315ab 100644
> --- a/drivers/gpu/drm/omapdrm/omap_drv.h
> +++ b/drivers/gpu/drm/omapdrm/omap_drv.h
> @@ -168,7 +168,6 @@ struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
> struct drm_file *file, const struct drm_mode_fb_cmd2 *mode_cmd);
> struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
> const 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_pin(struct drm_framebuffer *fb);
> void omap_framebuffer_unpin(struct drm_framebuffer *fb);
> 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 2edf86ab1fe1..ec2a7cd1790e 100644
> --- a/drivers/gpu/drm/omapdrm/omap_fb.c
> +++ b/drivers/gpu/drm/omapdrm/omap_fb.c
> @@ -316,16 +316,6 @@ void omap_framebuffer_unpin(struct drm_framebuffer *fb)
> mutex_unlock(&omap_fb->lock);
> }
>
> -struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p)
> -{
> - struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
> -
> - if (p >= omap_fb->format->num_planes)
> - return NULL;
> -
> - return omap_fb->planes[p].bo;
> -}
> -
> /* iterate thru all the connectors, returning ones that are attached
> * to the same fb..
> */
>
I would have picked this up, but it doesn't apply without the previous
patches in the series. The conflict is trivial, though. Do you want me
to resolve it and apply, or do you want to keep this in your series?
Tomi
Attachment:
signature.asc
Description: OpenPGP digital signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
