drm/msm/dpu: remove some impossible error checking
PATCH 1/2 drm/msm/dpu: remove some impossible error checking
From: Rob Clark <[email protected]>
I'm sure there is plenty more to remove.. this is just some of the ones I noticed.
Signed-off-by Rob Clark <[email protected]>
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 19 ------------------- .../drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 3 --- .../drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 5 ----- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 3 --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 5 ----- drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 10 ---------- 6 files changed, 45 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0 -19
@@ -1428,12 +1428,6 @@ static void _dpu_encoder_trigger_flush(struct drm_encoder *drm_enc,int pending_kickoff_cnt;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) {DPU_ERROR ("invalid pingpong hw\n" );return ;
@@ -1566,11 +1560,6 @@ static void _dpu_encoder_kickoff_phys(struct dpu_encoder_virt *dpu_enc,uint32_t i, pending_flush;unsigned long lock_flags; -if (!dpu_enc) { -DPU_ERROR ("invalid encoder\n" ); -return ; - } - pending_flush =0x0 ;/* update pending counts and trigger kickoff ctl flush atomically */
@@ -1798,10 +1787,6 @@ void dpu_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc, bool async)bool needs_hw_reset = false;unsigned int i; -if (!drm_enc) { -DPU_ERROR ("invalid args\n" ); -return ; - } dpu_enc =to_dpu_encoder_virt (drm_enc);trace_dpu_enc_prepare_kickoff (DRMID (drm_enc));
@@ -1837,10 +1822,6 @@ void dpu_encoder_kickoff(struct drm_encoder *drm_enc, bool async)ktime_t wakeup_time;unsigned int i; -if (!drm_enc) { -DPU_ERROR ("invalid encoder\n" ); -return ; - }DPU_ATRACE_BEGIN ("encoder_kickoff" ); dpu_enc =to_dpu_encoder_virt (drm_enc);
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c +0 -3
@@ -720,9 +720,6 @@ static int dpu_encoder_phys_cmd_wait_for_vblank(static void dpu_encoder_phys_cmd_handle_post_kickoff (struct dpu_encoder_phys *phys_enc) { -if (!phys_enc) -return ; -/** * re-enable external TE, either for the first time after enabling * or if disabled for Autorefresh
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +0 -5
@@ -612,11 +612,6 @@ static void dpu_encoder_phys_vid_handle_post_kickoff( {unsigned long lock_flags; -if (!phys_enc) { -DPU_ERROR ("invalid encoder\n" ); -return ; - } -/* * Video mode must flush CTL before enabling timing engine * Video encoders need to turn on their interfaces now
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +0 -3
@@ -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) { -if (!ctx) -return 0x0 ; -return ctx->pending_flush_mask; }
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -5
@@ -490,11 +490,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 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; priv = dev->dev_private; catalog = dpu_kms->catalog;
drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c +0 -10
@@ -264,11 +264,6 @@ void dpu_vbif_clear_errors(struct dpu_kms *dpu_kms)struct dpu_hw_vbif *vbif;u32 i, pnd, src; -if (!dpu_kms) { -DPU_ERROR ("invalid argument\n" ); -return ; - } -for (i =0 ; i <ARRAY_SIZE (dpu_kms->hw_vbif); i++) { vbif = dpu_kms->hw_vbif[i];if (vbif && vbif->ops.clear_errors) {
@@ -286,11 +281,6 @@ void dpu_vbif_init_memtypes(struct dpu_kms *dpu_kms)struct dpu_hw_vbif *vbif;int i, j; -if (!dpu_kms) { -DPU_ERROR ("invalid argument\n" ); -return ; - } -for (i =0 ; i <ARRAY_SIZE (dpu_kms->hw_vbif); i++) { vbif = dpu_kms->hw_vbif[i];if (vbif && vbif->cap && vbif->ops.set_mem_type) {
Signature · 6 lines
2.21.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 2/2 drm/msm/dpu: remove unused arg
From: Rob Clark <[email protected]>
Signed-off-by Rob Clark <[email protected]>
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -1
@@ -634,7 +634,7 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc, bool async)*/ drm_for_each_encoder_mask (encoder, crtc->dev, crtc->state->encoder_mask) -dpu_encoder_prepare_for_kickoff (encoder, async); +dpu_encoder_prepare_for_kickoff (encoder);if (!async) {/* wait for previous frame_event_done completion */
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +1 -1
@@ -1780,7 +1780,7 @@ static void dpu_encoder_vsync_event_work_handler(struct kthread_work *work) nsecs_to_jiffies(ktime_to_ns(wakeup_time))); } -void dpu_encoder_prepare_for_kickoff (struct drm_encoder *drm_enc,bool async) +void dpu_encoder_prepare_for_kickoff (struct drm_encoder *drm_enc) {struct dpu_encoder_virt *dpu_enc;struct dpu_encoder_phys *phys;
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +1 -2
@@ -68,9 +68,8 @@ void dpu_encoder_register_frame_event_callback(struct drm_encoder *encoder,* Immediately: if no previous commit is outstanding. * Delayed: Block until next trigger can be issued. * @encoder: encoder pointer -* @async: true if this is an asynchronous commit */ -void dpu_encoder_prepare_for_kickoff (struct drm_encoder *encoder,bool async); +void dpu_encoder_prepare_for_kickoff (struct drm_encoder *encoder);/** * dpu_encoder_trigger_kickoff_pending - Clear the flush bits from previous
Signature · 6 lines
2.21.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno