On Thu, Mar 26, 2015 at 12:47:15PM +0100, Daniel Vetter wrote:
> In spirit with
>
> commit 5724dbd1678e2f573b13f0688277941fad66cb88
> Author: Damien Lespiau <damien.lesp...@intel.com>
> Date: Tue Jan 20 12:51:52 2015 +0000
>
> drm/i915: Rename plane_config to initial_plane_config
>
> to make it clear that this code is all special-purpose for the initial
> plane takeover.
>
> Cc: Damien Lespiau <damien.lesp...@intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
Reviewed-by: Damien Lespiau <damien.lesp...@intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 3b7c3491ea68..1142ffce66ea 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2508,8 +2508,8 @@ static int skl_format_to_fourcc(int format, bool
> rgb_order, bool alpha)
> }
>
> static bool
> -intel_alloc_plane_obj(struct intel_crtc *crtc,
> - struct intel_initial_plane_config *plane_config)
> +intel_alloc_initial_plane_obj(struct intel_crtc *crtc,
> + struct intel_initial_plane_config *plane_config)
> {
> struct drm_device *dev = crtc->base.dev;
> struct drm_i915_gem_object *obj = NULL;
> @@ -2553,7 +2553,7 @@ intel_alloc_plane_obj(struct intel_crtc *crtc,
> obj->frontbuffer_bits = INTEL_FRONTBUFFER_PRIMARY(crtc->pipe);
> mutex_unlock(&dev->struct_mutex);
>
> - DRM_DEBUG_KMS("plane fb obj %p\n", obj);
> + DRM_DEBUG_KMS("initial plane fb obj %p\n", obj);
> return true;
>
> out_unref_obj:
> @@ -2577,8 +2577,8 @@ update_state_fb(struct drm_plane *plane)
> }
>
> static void
> -intel_find_plane_obj(struct intel_crtc *intel_crtc,
> - struct intel_initial_plane_config *plane_config)
> +intel_find_initial_plane_obj(struct intel_crtc *intel_crtc,
> + struct intel_initial_plane_config *plane_config)
> {
> struct drm_device *dev = intel_crtc->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -2589,7 +2589,7 @@ intel_find_plane_obj(struct intel_crtc *intel_crtc,
> if (!plane_config->fb)
> return;
>
> - if (intel_alloc_plane_obj(intel_crtc, plane_config)) {
> + if (intel_alloc_initial_plane_obj(intel_crtc, plane_config)) {
> struct drm_plane *primary = intel_crtc->base.primary;
>
> primary->fb = &plane_config->fb->base;
> @@ -13572,7 +13572,7 @@ void intel_modeset_init(struct drm_device *dev)
> * If the fb is shared between multiple heads, we'll
> * just get the first one.
> */
> - intel_find_plane_obj(crtc, &crtc->plane_config);
> + intel_find_initial_plane_obj(crtc, &crtc->plane_config);
> }
> }
> }
> --
> 2.1.4
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
