Commit 58fba464 authored by Sean Paul's avatar Sean Paul Committed by Rob Clark
Browse files

drm/msm: dpu: Remove 'inline' from several functions 



Per chapter 15 of coding-style, removing 'inline' keyword from functions
that are larger than a typical macro. In a couple of cases I've
simplified the function and kept the inline.

Reviewed-by: default avatarJeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent bf711751

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static inline int _dpu_crtc_get_mixer_width(struct dpu_crtc_state *cstate, 
	return mode->hdisplay / cstate->num_mixers;

}



static inline struct dpu_kms *_dpu_crtc_get_kms(struct drm_crtc *crtc)

static struct dpu_kms *_dpu_crtc_get_kms(struct drm_crtc *crtc)

{

	struct msm_drm_private *priv = crtc->dev->dev_private;

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h

+2 −14
Original line number Diff line number Diff line
@@ -264,13 +264,7 @@ static inline int dpu_crtc_get_mixer_height(struct dpu_crtc *dpu_crtc, 
 */

static inline int dpu_crtc_frame_pending(struct drm_crtc *crtc)

{

	struct dpu_crtc *dpu_crtc;



	if (!crtc)

		return -EINVAL;



	dpu_crtc = to_dpu_crtc(crtc);

	return atomic_read(&dpu_crtc->frame_pending);

	return crtc ? atomic_read(&to_dpu_crtc(crtc)->frame_pending) : -EINVAL;

}



/**
@@ -327,13 +321,7 @@ enum dpu_intf_mode dpu_crtc_get_intf_mode(struct drm_crtc *crtc); 
static inline enum dpu_crtc_client_type dpu_crtc_get_client_type(

						struct drm_crtc *crtc)

{

	struct dpu_crtc_state *cstate =

			crtc ? to_dpu_crtc_state(crtc->state) : NULL;



	if (!cstate)

		return NRT_CLIENT;



	return RT_CLIENT;

	return crtc && crtc->state ? RT_CLIENT : NRT_CLIENT;

}



/**

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

+2 −2
Original line number Diff line number Diff line
@@ -1374,7 +1374,7 @@ static void dpu_encoder_off_work(struct kthread_work *work) 
 * phys: Pointer to physical encoder structure

 * extra_flush_bits: Additional bit mask to include in flush trigger

 */

static inline void _dpu_encoder_trigger_flush(struct drm_encoder *drm_enc,

static void _dpu_encoder_trigger_flush(struct drm_encoder *drm_enc,

		struct dpu_encoder_phys *phys, uint32_t extra_flush_bits)

{

	struct dpu_hw_ctl *ctl;
@@ -1417,7 +1417,7 @@ static inline void _dpu_encoder_trigger_flush(struct drm_encoder *drm_enc, 
 * _dpu_encoder_trigger_start - trigger start for a physical encoder

 * phys: Pointer to physical encoder structure

 */

static inline void _dpu_encoder_trigger_start(struct dpu_encoder_phys *phys)

static void _dpu_encoder_trigger_start(struct dpu_encoder_phys *phys)

{

	if (!phys) {

		DPU_ERROR("invalid argument(s)\n");

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static void drm_mode_to_intf_timing_params( 
	 */

}



static inline u32 get_horizontal_total(const struct intf_timing_params *timing)

static u32 get_horizontal_total(const struct intf_timing_params *timing)

{

	u32 active = timing->xres;

	u32 inactive =
@@ -119,7 +119,7 @@ static inline u32 get_horizontal_total(const struct intf_timing_params *timing) 
	return active + inactive;

}



static inline u32 get_vertical_total(const struct intf_timing_params *timing)

static u32 get_vertical_total(const struct intf_timing_params *timing)

{

	u32 active = timing->yres;

	u32 inactive =

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c

+3 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static inline void dpu_hw_ctl_trigger_flush(struct dpu_hw_ctl *ctx) 
	DPU_REG_WRITE(&ctx->hw, CTL_FLUSH, ctx->pending_flush_mask);

}



static inline uint32_t dpu_hw_ctl_get_bitmask_sspp(struct dpu_hw_ctl *ctx,

static uint32_t dpu_hw_ctl_get_bitmask_sspp(struct dpu_hw_ctl *ctx,

	enum dpu_sspp sspp)

{

	uint32_t flushbits = 0;
@@ -179,7 +179,7 @@ static inline uint32_t dpu_hw_ctl_get_bitmask_sspp(struct dpu_hw_ctl *ctx, 
	return flushbits;

}



static inline uint32_t dpu_hw_ctl_get_bitmask_mixer(struct dpu_hw_ctl *ctx,

static uint32_t dpu_hw_ctl_get_bitmask_mixer(struct dpu_hw_ctl *ctx,

	enum dpu_lm lm)

{

	uint32_t flushbits = 0;
@@ -212,7 +212,7 @@ static inline uint32_t dpu_hw_ctl_get_bitmask_mixer(struct dpu_hw_ctl *ctx, 
	return flushbits;

}



static inline int dpu_hw_ctl_get_bitmask_intf(struct dpu_hw_ctl *ctx,

static int dpu_hw_ctl_get_bitmask_intf(struct dpu_hw_ctl *ctx,

		u32 *flushbits, enum dpu_intf intf)

{

	switch (intf) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE