diff options
| author | Matt Roper | 2014-03-19 01:22:55 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-03-19 13:03:54 +0100 |
| commit | 262ca2b08fbdb9346e66ef30424b2226a00e0ffc (patch) | |
| tree | 158f1af506dd0ec088194ad4228f7c5939f5fa44 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | drm/i915/vlv: no MCHBAR on VLV (diff) | |
| download | kernel-qcow2-linux-262ca2b08fbdb9346e66ef30424b2226a00e0ffc.tar.gz kernel-qcow2-linux-262ca2b08fbdb9346e66ef30424b2226a00e0ffc.tar.xz kernel-qcow2-linux-262ca2b08fbdb9346e66ef30424b2226a00e0ffc.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 70fbe904016f..a937711b4b43 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -462,8 +462,9 @@ struct drm_i915_display_funcs { struct drm_framebuffer *fb, struct drm_i915_gem_object *obj, uint32_t flags); - int (*update_plane)(struct drm_crtc *crtc, struct drm_framebuffer *fb, - int x, int y); + int (*update_primary_plane)(struct drm_crtc *crtc, + struct drm_framebuffer *fb, + int x, int y); void (*hpd_irq_setup)(struct drm_device *dev); /* clock updates for mode set */ /* cursor updates */ |