[Intel-gfx] [PATCH] drm/i915/display: Whitespace cleanups

Navare, Manasi manasi.d.navare at intel.com
Thu Nov 19 19:19:09 UTC 2020


On Thu, Nov 19, 2020 at 09:07:17AM +0000, Chris Wilson wrote:
> drivers/gpu/drm/i915/display/intel_display.c:3634 intel_find_initial_plane_obj() warn: inconsistent indenting
> drivers/gpu/drm/i915/display/intel_display.c:15367 kill_bigjoiner_slave() warn: inconsistent indenting
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

Thank you for the whitespace fixes, probably got introduced in the rebasing

Reviewed-by: Manasi Navare <manasi.d.navare at intel.com>

Manasi

> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 23 ++++++++++----------
>  1 file changed, 11 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 5c07c74d4397..1a0f00f37ca9 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -3631,8 +3631,8 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc,
>  	struct intel_plane *intel_plane = to_intel_plane(primary);
>  	struct intel_plane_state *intel_state =
>  		to_intel_plane_state(plane_state);
> -	 struct intel_crtc_state *crtc_state =
> -		 to_intel_crtc_state(intel_crtc->base.state);
> +	struct intel_crtc_state *crtc_state =
> +		to_intel_crtc_state(intel_crtc->base.state);
>  	struct drm_framebuffer *fb;
>  	struct i915_vma *vma;
>  
> @@ -15361,17 +15361,17 @@ static int kill_bigjoiner_slave(struct intel_atomic_state *state,
>  				struct intel_crtc_state *master_crtc_state)
>  {
>  	struct intel_crtc_state *slave_crtc_state =
> -			intel_atomic_get_crtc_state(&state->base,
> -						    master_crtc_state->bigjoiner_linked_crtc);
> +		intel_atomic_get_crtc_state(&state->base,
> +					    master_crtc_state->bigjoiner_linked_crtc);
>  
> -		if (IS_ERR(slave_crtc_state))
> -			return PTR_ERR(slave_crtc_state);
> +	if (IS_ERR(slave_crtc_state))
> +		return PTR_ERR(slave_crtc_state);
>  
> -		slave_crtc_state->bigjoiner = master_crtc_state->bigjoiner = false;
> -		slave_crtc_state->bigjoiner_slave = master_crtc_state->bigjoiner_slave = false;
> -		slave_crtc_state->bigjoiner_linked_crtc = master_crtc_state->bigjoiner_linked_crtc = NULL;
> -		intel_crtc_copy_uapi_to_hw_state(state, slave_crtc_state);
> -		return 0;
> +	slave_crtc_state->bigjoiner = master_crtc_state->bigjoiner = false;
> +	slave_crtc_state->bigjoiner_slave = master_crtc_state->bigjoiner_slave = false;
> +	slave_crtc_state->bigjoiner_linked_crtc = master_crtc_state->bigjoiner_linked_crtc = NULL;
> +	intel_crtc_copy_uapi_to_hw_state(state, slave_crtc_state);
> +	return 0;
>  }
>  
>  /**
> @@ -15949,7 +15949,6 @@ static void intel_update_crtc(struct intel_atomic_state *state,
>  		intel_crtc_arm_fifo_underrun(crtc, new_crtc_state);
>  }
>  
> -
>  static void intel_old_crtc_state_disables(struct intel_atomic_state *state,
>  					  struct intel_crtc_state *old_crtc_state,
>  					  struct intel_crtc_state *new_crtc_state,
> -- 
> 2.20.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx


More information about the Intel-gfx mailing list