Commit 76f05444 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-msm-fixes-2022-06-28' of https://gitlab.freedesktop.org/drm/msm into drm-fixes 



Fixes for v5.19-rc5

- Fix to increment vsync_cnt before calling drm_crtc_handle_vblank so that
  userspace sees the value *after* it is incremented if waiting for vblank
  events
- Fix to reset drm_dev to NULL in dp_display_unbind to avoid a crash in
  probe/bind error paths
- Fix to resolve the smatch error of de-referencing before NULL check in
  dpu_encoder_phys_wb.c
- Fix error return to userspace if fence-id allocation fails in submit
  ioctl

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGvswNKdd02EYKYv5Zjv7f+mcqeWC7hHQ1SBjqYzN_ZHnA@mail.gmail.com
parents 03c765b0 08de2141

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

+2 −1
Original line number Diff line number Diff line
@@ -1251,12 +1251,13 @@ static void dpu_encoder_vblank_callback(struct drm_encoder *drm_enc, 
	DPU_ATRACE_BEGIN("encoder_vblank_callback");

	dpu_enc = to_dpu_encoder_virt(drm_enc);



	atomic_inc(&phy_enc->vsync_cnt);



	spin_lock_irqsave(&dpu_enc->enc_spinlock, lock_flags);

	if (dpu_enc->crtc)

		dpu_crtc_vblank_callback(dpu_enc->crtc);

	spin_unlock_irqrestore(&dpu_enc->enc_spinlock, lock_flags);



	atomic_inc(&phy_enc->vsync_cnt);

	DPU_ATRACE_END("encoder_vblank_callback");

}

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

+5 −5
Original line number Diff line number Diff line
@@ -252,11 +252,6 @@ static int dpu_encoder_phys_wb_atomic_check( 
	DPU_DEBUG("[atomic_check:%d, \"%s\",%d,%d]\n",

			phys_enc->wb_idx, mode->name, mode->hdisplay, mode->vdisplay);



	if (!conn_state->writeback_job || !conn_state->writeback_job->fb)

		return 0;



	fb = conn_state->writeback_job->fb;



	if (!conn_state || !conn_state->connector) {

		DPU_ERROR("invalid connector state\n");

		return -EINVAL;
@@ -267,6 +262,11 @@ static int dpu_encoder_phys_wb_atomic_check( 
		return -EINVAL;

	}



	if (!conn_state->writeback_job || !conn_state->writeback_job->fb)

		return 0;



	fb = conn_state->writeback_job->fb;



	DPU_DEBUG("[fb_id:%u][fb:%u,%u]\n", fb->base.id,

			fb->width, fb->height);

drivers/gpu/drm/msm/dp/dp_display.c

+2 −0
Original line number Diff line number Diff line
@@ -316,6 +316,8 @@ static void dp_display_unbind(struct device *dev, struct device *master, 


	dp_power_client_deinit(dp->power);

	dp_aux_unregister(dp->aux);

	dp->drm_dev = NULL;

	dp->aux->drm_dev = NULL;

	priv->dp[dp->id] = NULL;

}

drivers/gpu/drm/msm/msm_gem_submit.c

+1 −1
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
						    INT_MAX, GFP_KERNEL);

	}

	if (submit->fence_id < 0) {

		ret = submit->fence_id = 0;

		ret = submit->fence_id;

		submit->fence_id = 0;

	}