Commit 96630140 authored by Drew Davenport's avatar Drew Davenport Committed by Rob Clark
Browse files

drm/msm/dpu: Remove unnecessary NULL checks 



msm_drm_private.kms will only be NULL in the dummy headless case, so
there is no need to check it in the dpu display driver.

Signed-off-by: default avatarDrew Davenport <ddavenport@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent c3739878

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

+10 −13
Original line number Diff line number Diff line
@@ -55,8 +55,7 @@ static void dpu_core_irq_callback_handler(void *arg, int irq_idx) 
int dpu_core_irq_idx_lookup(struct dpu_kms *dpu_kms,

		enum dpu_intr_type intr_type, u32 instance_idx)

{

	if (!dpu_kms || !dpu_kms->hw_intr ||

			!dpu_kms->hw_intr->ops.irq_idx_lookup)

	if (!dpu_kms->hw_intr || !dpu_kms->hw_intr->ops.irq_idx_lookup)

		return -EINVAL;



	return dpu_kms->hw_intr->ops.irq_idx_lookup(intr_type,
@@ -73,7 +72,7 @@ static int _dpu_core_irq_enable(struct dpu_kms *dpu_kms, int irq_idx) 
	unsigned long irq_flags;

	int ret = 0, enable_count;



	if (!dpu_kms || !dpu_kms->hw_intr ||

	if (!dpu_kms->hw_intr ||

			!dpu_kms->irq_obj.enable_counts ||

			!dpu_kms->irq_obj.irq_counts) {

		DPU_ERROR("invalid params\n");
@@ -114,7 +113,7 @@ int dpu_core_irq_enable(struct dpu_kms *dpu_kms, int *irq_idxs, u32 irq_count) 
{

	int i, ret = 0, counts;



	if (!dpu_kms || !irq_idxs || !irq_count) {

	if (!irq_idxs || !irq_count) {

		DPU_ERROR("invalid params\n");

		return -EINVAL;

	}
@@ -138,7 +137,7 @@ static int _dpu_core_irq_disable(struct dpu_kms *dpu_kms, int irq_idx) 
{

	int ret = 0, enable_count;



	if (!dpu_kms || !dpu_kms->hw_intr || !dpu_kms->irq_obj.enable_counts) {

	if (!dpu_kms->hw_intr || !dpu_kms->irq_obj.enable_counts) {

		DPU_ERROR("invalid params\n");

		return -EINVAL;

	}
@@ -169,7 +168,7 @@ int dpu_core_irq_disable(struct dpu_kms *dpu_kms, int *irq_idxs, u32 irq_count) 
{

	int i, ret = 0, counts;



	if (!dpu_kms || !irq_idxs || !irq_count) {

	if (!irq_idxs || !irq_count) {

		DPU_ERROR("invalid params\n");

		return -EINVAL;

	}
@@ -186,7 +185,7 @@ int dpu_core_irq_disable(struct dpu_kms *dpu_kms, int *irq_idxs, u32 irq_count) 


u32 dpu_core_irq_read(struct dpu_kms *dpu_kms, int irq_idx, bool clear)

{

	if (!dpu_kms || !dpu_kms->hw_intr ||

	if (!dpu_kms->hw_intr ||

			!dpu_kms->hw_intr->ops.get_interrupt_status)

		return 0;
@@ -205,7 +204,7 @@ int dpu_core_irq_register_callback(struct dpu_kms *dpu_kms, int irq_idx, 
{

	unsigned long irq_flags;



	if (!dpu_kms || !dpu_kms->irq_obj.irq_cb_tbl) {

	if (!dpu_kms->irq_obj.irq_cb_tbl) {

		DPU_ERROR("invalid params\n");

		return -EINVAL;

	}
@@ -240,7 +239,7 @@ int dpu_core_irq_unregister_callback(struct dpu_kms *dpu_kms, int irq_idx, 
{

	unsigned long irq_flags;



	if (!dpu_kms || !dpu_kms->irq_obj.irq_cb_tbl) {

	if (!dpu_kms->irq_obj.irq_cb_tbl) {

		DPU_ERROR("invalid params\n");

		return -EINVAL;

	}
@@ -274,8 +273,7 @@ int dpu_core_irq_unregister_callback(struct dpu_kms *dpu_kms, int irq_idx, 


static void dpu_clear_all_irqs(struct dpu_kms *dpu_kms)

{

	if (!dpu_kms || !dpu_kms->hw_intr ||

			!dpu_kms->hw_intr->ops.clear_all_irqs)

	if (!dpu_kms->hw_intr || !dpu_kms->hw_intr->ops.clear_all_irqs)

		return;



	dpu_kms->hw_intr->ops.clear_all_irqs(dpu_kms->hw_intr);
@@ -283,8 +281,7 @@ static void dpu_clear_all_irqs(struct dpu_kms *dpu_kms) 


static void dpu_disable_all_irqs(struct dpu_kms *dpu_kms)

{

	if (!dpu_kms || !dpu_kms->hw_intr ||

			!dpu_kms->hw_intr->ops.disable_all_irqs)

	if (!dpu_kms->hw_intr || !dpu_kms->hw_intr->ops.disable_all_irqs)

		return;



	dpu_kms->hw_intr->ops.disable_all_irqs(dpu_kms->hw_intr);

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

+3 −9
Original line number Diff line number Diff line
@@ -32,13 +32,7 @@ enum dpu_perf_mode { 
static struct dpu_kms *_dpu_crtc_get_kms(struct drm_crtc *crtc)

{

	struct msm_drm_private *priv;



	priv = crtc->dev->dev_private;

	if (!priv->kms) {

		DPU_ERROR("invalid kms\n");

		return NULL;

	}



	return to_dpu_kms(priv->kms);

}
@@ -111,7 +105,7 @@ int dpu_core_perf_crtc_check(struct drm_crtc *crtc, 
	}



	kms = _dpu_crtc_get_kms(crtc);

	if (!kms || !kms->catalog) {

	if (!kms->catalog) {

		DPU_ERROR("invalid parameters\n");

		return 0;

	}
@@ -219,7 +213,7 @@ void dpu_core_perf_crtc_release_bw(struct drm_crtc *crtc) 
	}



	kms = _dpu_crtc_get_kms(crtc);

	if (!kms || !kms->catalog) {

	if (!kms->catalog) {

		DPU_ERROR("invalid kms\n");

		return;

	}
@@ -292,7 +286,7 @@ int dpu_core_perf_crtc_update(struct drm_crtc *crtc, 
	}



	kms = _dpu_crtc_get_kms(crtc);

	if (!kms || !kms->catalog) {

	if (!kms->catalog) {

		DPU_ERROR("invalid kms\n");

		return -EINVAL;

	}

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

+2 −12
Original line number Diff line number Diff line
@@ -645,11 +645,6 @@ static void _dpu_encoder_update_vsync_source(struct dpu_encoder_virt *dpu_enc, 
	priv = drm_enc->dev->dev_private;



	dpu_kms = to_dpu_kms(priv->kms);

	if (!dpu_kms) {

		DPU_ERROR("invalid dpu_kms\n");

		return;

	}



	hw_mdptop = dpu_kms->hw_mdp;

	if (!hw_mdptop) {

		DPU_ERROR("invalid mdptop\n");
@@ -1098,10 +1093,6 @@ static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc) 


	priv = drm_enc->dev->dev_private;

	dpu_kms = to_dpu_kms(priv->kms);

	if (!dpu_kms) {

		DPU_ERROR("invalid dpu_kms\n");

		return;

	}



	dpu_enc = to_dpu_encoder_virt(drm_enc);

	if (!dpu_enc || !dpu_enc->cur_master) {
@@ -2032,9 +2023,8 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc, 
	enum dpu_intf_type intf_type;

	struct dpu_enc_phys_init_params phys_params;



	if (!dpu_enc || !dpu_kms) {

		DPU_ERROR("invalid arg(s), enc %d kms %d\n",

				dpu_enc != 0, dpu_kms != 0);

	if (!dpu_enc) {

		DPU_ERROR("invalid arg(s), enc %d\n", dpu_enc != 0);

		return -EINVAL;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static void dpu_encoder_phys_cmd_tearcheck_config( 
	}



	dpu_kms = phys_enc->dpu_kms;

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

	if (!dpu_kms->dev) {

		DPU_ERROR("invalid device\n");

		return;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static void dpu_encoder_phys_vid_mode_set( 
		struct drm_display_mode *mode,

		struct drm_display_mode *adj_mode)

{

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

	if (!phys_enc) {

		DPU_ERROR("invalid encoder/kms\n");

		return;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE