]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: remove intel_crtc_cursor_set_obj() (v5)
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>
Mon, 1 Dec 2014 23:40:10 +0000 (15:40 -0800)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 5 Dec 2014 20:20:30 +0000 (21:20 +0100)
commit9cff6ca7cf281b51ebc9e6279d89c1f927c03798
tree730f0347a58e2de129d1eaabf81bae895844bb46
parent351721c18eccb4b4ac63f955315ad303a0ba9346
drm/i915: remove intel_crtc_cursor_set_obj() (v5)

Merge it into the plane update_plane() callback and make other
users use the update_plane() functions instead.

The fb != crtc->cursor->fb was already inside intel_crtc_cursor_set_obj()
so we fold intel_crtc_cursor_set_obj() inside intel_commit_cursor_plane()
and merge both paths into one.

v5 (by Matt):
 - Rebase onto latest di-nightly codebase
 - Drop extra unreference call when we fail to pin (Ville)

Reviewed-by(v4): Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c