Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33e42bf6 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/dpu: remove some impossible error checking 



I'm sure there is plenty more to remove.. this is just some of the ones
I noticed.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 15ee1e05

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

+0 −19
Original line number Original line Diff line number Diff line
@@ -1430,12 +1430,6 @@ static void _dpu_encoder_trigger_flush(struct drm_encoder *drm_enc, 
	int pending_kickoff_cnt;

	int pending_kickoff_cnt;

	u32 ret = UINT_MAX;

	u32 ret = UINT_MAX;





	if (!drm_enc || !phys) {

		DPU_ERROR("invalid argument(s), drm_enc %d, phys_enc %d\n",

				drm_enc != 0, phys != 0);

		return;

	}



	if (!phys->hw_pp) {

	if (!phys->hw_pp) {

		DPU_ERROR("invalid pingpong hw\n");

		DPU_ERROR("invalid pingpong hw\n");

		return;

		return;
@@ -1568,11 +1562,6 @@ static void _dpu_encoder_kickoff_phys(struct dpu_encoder_virt *dpu_enc, 
	uint32_t i, pending_flush;

	uint32_t i, pending_flush;

	unsigned long lock_flags;

	unsigned long lock_flags;





	if (!dpu_enc) {

		DPU_ERROR("invalid encoder\n");

		return;

	}



	pending_flush = 0x0;

	pending_flush = 0x0;





	/* update pending counts and trigger kickoff ctl flush atomically */

	/* update pending counts and trigger kickoff ctl flush atomically */
@@ -1800,10 +1789,6 @@ void dpu_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc, bool async) 
	bool needs_hw_reset = false;

	bool needs_hw_reset = false;

	unsigned int i;

	unsigned int i;





	if (!drm_enc) {

		DPU_ERROR("invalid args\n");

		return;

	}

	dpu_enc = to_dpu_encoder_virt(drm_enc);

	dpu_enc = to_dpu_encoder_virt(drm_enc);





	trace_dpu_enc_prepare_kickoff(DRMID(drm_enc));

	trace_dpu_enc_prepare_kickoff(DRMID(drm_enc));
@@ -1839,10 +1824,6 @@ void dpu_encoder_kickoff(struct drm_encoder *drm_enc, bool async) 
	ktime_t wakeup_time;

	ktime_t wakeup_time;

	unsigned int i;

	unsigned int i;





	if (!drm_enc) {

		DPU_ERROR("invalid encoder\n");

		return;

	}

	DPU_ATRACE_BEGIN("encoder_kickoff");

	DPU_ATRACE_BEGIN("encoder_kickoff");

	dpu_enc = to_dpu_encoder_virt(drm_enc);

	dpu_enc = to_dpu_encoder_virt(drm_enc);

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -720,9 +720,6 @@ static int dpu_encoder_phys_cmd_wait_for_vblank( 
static void dpu_encoder_phys_cmd_handle_post_kickoff(

static void dpu_encoder_phys_cmd_handle_post_kickoff(

		struct dpu_encoder_phys *phys_enc)

		struct dpu_encoder_phys *phys_enc)

{

{

	if (!phys_enc)

		return;



	/**

	/**

	 * re-enable external TE, either for the first time after enabling

	 * re-enable external TE, either for the first time after enabling

	 * or if disabled for Autorefresh

	 * or if disabled for Autorefresh

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -612,11 +612,6 @@ static void dpu_encoder_phys_vid_handle_post_kickoff( 
{

{

	unsigned long lock_flags;

	unsigned long lock_flags;





	if (!phys_enc) {

		DPU_ERROR("invalid encoder\n");

		return;

	}



	/*

	/*

	 * Video mode must flush CTL before enabling timing engine

	 * Video mode must flush CTL before enabling timing engine

	 * Video encoders need to turn on their interfaces now

	 * Video encoders need to turn on their interfaces now

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -102,9 +102,6 @@ static inline void dpu_hw_ctl_update_pending_flush(struct dpu_hw_ctl *ctx, 




static u32 dpu_hw_ctl_get_pending_flush(struct dpu_hw_ctl *ctx)

static u32 dpu_hw_ctl_get_pending_flush(struct dpu_hw_ctl *ctx)

{

{

	if (!ctx)

		return 0x0;



	return ctx->pending_flush_mask;

	return ctx->pending_flush_mask;

}

}

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -492,11 +492,6 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms) 
	int primary_planes_idx = 0, cursor_planes_idx = 0, i, ret;

	int primary_planes_idx = 0, cursor_planes_idx = 0, i, ret;

	int max_crtc_count;

	int max_crtc_count;





	if (!dpu_kms || !dpu_kms->dev || !dpu_kms->dev->dev) {

		DPU_ERROR("invalid dpu_kms\n");

		return -EINVAL;

	}



	dev = dpu_kms->dev;

	dev = dpu_kms->dev;

	priv = dev->dev_private;

	priv = dev->dev_private;

	catalog = dpu_kms->catalog;

	catalog = dpu_kms->catalog;