drm/i915: Rename similar plane functions to avoid confusion
authorMatt Roper <matthew.d.roper@intel.com>
Wed, 19 Mar 2014 00:22:55 +0000 (17:22 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 19 Mar 2014 12:03:54 +0000 (13:03 +0100)
commit262ca2b08fbdb9346e66ef30424b2226a00e0ffc
tree158f1af506dd0ec088194ad4228f7c5939f5fa44
parent11ea8b7d3e9b5d62217fbd12d66866172e187f9b
drm/i915: Rename similar plane functions to avoid confusion

The name 'update_plane' was used both for the primary plane functions in
intel_display.c and the sprite/overlay functions in intel_sprite.c.
Rename the primary plane functions to 'update_primary_plane' to avoid
confusion.

On a similar note, intel_display.c already had a function called
intel_disable_primary_plane() that programs the hardware to disable a
pipe's primary plane.  When we hook up primary planes through the DRM
plane interface, one of the natural handler names will be
intel_primary_plane_disable(), which is very similar.  To avoid
confusion, rename the existing intel_disable_primary_plane() to
intel_disable_primary_hw_plane() to make the two names a little more
distinct.

Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
[danvet: Fix up conflicts.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c