Commit e0d8eba5 authored by Xu YiPing's avatar Xu YiPing Committed by Sam Ravnborg
Browse files

drm: kirin: Remove uncessary parameter indirection 



In a few functions, we pass in a struct ade_crtc, which we only
use to get to the underlying struct ade_hw_ctx.

Thus this patch refactors the functions to just take the
struct ade_hw_ctx directly.

Cc: Rongrong Zou <zourongrong@gmail.com>
Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarXinliang Liu <z.liuxinliang@hisilicon.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarXu YiPing <xuyiping@hisilicon.com>
[jstultz: reworded commit message]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190820230626.23253-5-john.stultz@linaro.org
parent 9ec16cee

drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c

+5 −7
Original line number Diff line number Diff line
@@ -210,11 +210,10 @@ static void ade_set_pix_clk(struct ade_hw_ctx *ctx, 
	adj_mode->clock = clk_get_rate(ctx->ade_pix_clk) / 1000;

}



static void ade_ldi_set_mode(struct ade_crtc *acrtc,

static void ade_ldi_set_mode(struct ade_hw_ctx *ctx,

			     struct drm_display_mode *mode,

			     struct drm_display_mode *adj_mode)

{

	struct ade_hw_ctx *ctx = acrtc->ctx;

	void __iomem *base = ctx->base;

	u32 width = mode->hdisplay;

	u32 height = mode->vdisplay;
@@ -301,9 +300,8 @@ static void ade_power_down(struct ade_hw_ctx *ctx) 
	ctx->power_on = false;

}



static void ade_set_medianoc_qos(struct ade_crtc *acrtc)

static void ade_set_medianoc_qos(struct ade_hw_ctx *ctx)

{

	struct ade_hw_ctx *ctx = acrtc->ctx;

	struct regmap *map = ctx->noc_regmap;



	regmap_update_bits(map, ADE0_QOSGENERATOR_MODE,
@@ -515,7 +513,7 @@ static void ade_crtc_atomic_enable(struct drm_crtc *crtc, 
			return;

	}



	ade_set_medianoc_qos(acrtc);

	ade_set_medianoc_qos(ctx);

	ade_display_enable(acrtc);

	ade_dump_regs(ctx->base);

	drm_crtc_vblank_on(crtc);
@@ -545,7 +543,7 @@ static void ade_crtc_mode_set_nofb(struct drm_crtc *crtc) 


	if (!ctx->power_on)

		(void)ade_power_up(ctx);

	ade_ldi_set_mode(acrtc, mode, adj_mode);

	ade_ldi_set_mode(ctx, mode, adj_mode);

}



static void ade_crtc_atomic_begin(struct drm_crtc *crtc,
@@ -558,7 +556,7 @@ static void ade_crtc_atomic_begin(struct drm_crtc *crtc, 


	if (!ctx->power_on)

		(void)ade_power_up(ctx);

	ade_ldi_set_mode(acrtc, mode, adj_mode);

	ade_ldi_set_mode(ctx, mode, adj_mode);

}



static void ade_crtc_atomic_flush(struct drm_crtc *crtc,

CRA Git | Maintained and supported by SUSTech CRA and CCSE