From: Matt Roper Date: Wed, 19 Mar 2014 00:22:55 +0000 (-0700) Subject: drm/i915: Rename similar plane functions to avoid confusion X-Git-Tag: v3.15-rc1~51^2~18^2~29 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=262ca2b08fbdb9346e66ef30424b2226a00e0ffc;p=pandora-kernel.git 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 Signed-off-by: Matt Roper [danvet: Fix up conflicts.] Signed-off-by: Daniel Vetter --- Reading git-diff-tree failed