Commit f8981e03 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'msm-fixes-2019_08_01' of https://gitlab.freedesktop.org/drm/msm into drm-fixes 



- Fix the dma_sync calls applied last week (Rob)
- Fix mdp5 dsi command mode (Brian)
- Squash fall through warnings (Jordan)
- Don't add disabled gpu nodes to the of device list (Jeffrey)

Cc: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
Cc: Jordan Crouse <jcrouse@codeaurora.org>
Cc: Brian Masney <masneyb@onstation.org>
Cc: Rob Clark <robdclark@chromium.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

# gpg: Signature made Fri 02 Aug 2019 05:54:27 AM AEST
# gpg:                using RSA key 96F70DFDA84A070A
# gpg: Can't check signature: public key not found
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190801200439.GV104440@art_vandelay
parents 412e85b6 9ca7ad6c

drivers/gpu/drm/msm/adreno/a5xx_gpu.c

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static void a5xx_submit_in_rb(struct msm_gpu *gpu, struct msm_gem_submit *submit 
		case MSM_SUBMIT_CMD_CTX_RESTORE_BUF:

			if (priv->lastctx == ctx)

				break;

			/* fall-thru */

		case MSM_SUBMIT_CMD_BUF:

			/* copy commands into RB: */

			obj = submit->bos[submit->cmd[i].idx].obj;
@@ -149,6 +150,7 @@ static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 
		case MSM_SUBMIT_CMD_CTX_RESTORE_BUF:

			if (priv->lastctx == ctx)

				break;

			/* fall-thru */

		case MSM_SUBMIT_CMD_BUF:

			OUT_PKT7(ring, CP_INDIRECT_BUFFER_PFE, 3);

			OUT_RING(ring, lower_32_bits(submit->cmd[i].iova));

drivers/gpu/drm/msm/adreno/a6xx_gpu.c

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 
		case MSM_SUBMIT_CMD_CTX_RESTORE_BUF:

			if (priv->lastctx == ctx)

				break;

			/* fall-thru */

		case MSM_SUBMIT_CMD_BUF:

			OUT_PKT7(ring, CP_INDIRECT_BUFFER_PFE, 3);

			OUT_RING(ring, lower_32_bits(submit->cmd[i].iova));

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+1 −0
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 
			/* ignore if there has not been a ctx switch: */

			if (priv->lastctx == ctx)

				break;

			/* fall-thru */

		case MSM_SUBMIT_CMD_BUF:

			OUT_PKT3(ring, adreno_is_a430(adreno_gpu) ?

				CP_INDIRECT_BUFFER_PFE : CP_INDIRECT_BUFFER_PFD, 2);

drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c

+15 −1
Original line number Diff line number Diff line
@@ -439,6 +439,18 @@ static void mdp5_crtc_atomic_disable(struct drm_crtc *crtc, 
	mdp5_crtc->enabled = false;

}



static void mdp5_crtc_vblank_on(struct drm_crtc *crtc)

{

	struct mdp5_crtc_state *mdp5_cstate = to_mdp5_crtc_state(crtc->state);

	struct mdp5_interface *intf = mdp5_cstate->pipeline.intf;

	u32 count;



	count = intf->mode == MDP5_INTF_DSI_MODE_COMMAND ? 0 : 0xffffffff;

	drm_crtc_set_max_vblank_count(crtc, count);



	drm_crtc_vblank_on(crtc);

}



static void mdp5_crtc_atomic_enable(struct drm_crtc *crtc,

				    struct drm_crtc_state *old_state)

{
@@ -475,7 +487,7 @@ static void mdp5_crtc_atomic_enable(struct drm_crtc *crtc, 
	}



	/* Restore vblank irq handling after power is enabled */

	drm_crtc_vblank_on(crtc);

	mdp5_crtc_vblank_on(crtc);



	mdp5_crtc_mode_set_nofb(crtc);
@@ -1028,6 +1040,8 @@ static void mdp5_crtc_reset(struct drm_crtc *crtc) 
		mdp5_crtc_destroy_state(crtc, crtc->state);



	__drm_atomic_helper_crtc_reset(crtc, &mdp5_cstate->base);



	drm_crtc_vblank_reset(crtc);

}



static const struct drm_crtc_funcs mdp5_crtc_funcs = {

drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) 
	dev->driver->get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos;

	dev->driver->get_scanout_position = mdp5_get_scanoutpos;

	dev->driver->get_vblank_counter = mdp5_get_vblank_counter;

	dev->max_vblank_count = 0xffffffff;

	dev->max_vblank_count = 0; /* max_vblank_count is set on each CRTC */

	dev->vblank_disable_immediate = true;



	return kms;

CRA Git | Maintained and supported by SUSTech CRA and CCSE