Commit 1796c025 authored by Rob Clark's avatar Rob Clark
Browse files

Merge tag 'drm-msm-fixes-2022-06-28' into msm-next-staging 



Merge v5.19 fixes to avoid merge conflicts

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parents b13baccc 08de2141

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

+10 −4
Original line number Diff line number Diff line
@@ -498,10 +498,15 @@ int adreno_hw_init(struct msm_gpu *gpu) 


		ring->cur = ring->start;

		ring->next = ring->start;



		/* reset completed fence seqno: */

		ring->memptrs->fence = ring->fctx->completed_fence;

		ring->memptrs->rptr = 0;



		/* Detect and clean up an impossible fence, ie. if GPU managed

		 * to scribble something invalid, we don't want that to confuse

		 * us into mistakingly believing that submits have completed.

		 */

		if (fence_before(ring->fctx->last_fence, ring->memptrs->fence)) {

			ring->memptrs->fence = ring->fctx->last_fence;

		}

	}



	return 0;
@@ -1057,6 +1062,7 @@ void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu) 
	for (i = 0; i < ARRAY_SIZE(adreno_gpu->info->fw); i++)

		release_firmware(adreno_gpu->fw[i]);



	if (pm_runtime_enabled(&priv->gpu_pdev->dev))

		pm_runtime_disable(&priv->gpu_pdev->dev);



	msm_gpu_cleanup(&adreno_gpu->base);

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/disp/dpu1/dpu_writeback.c

+8 −1
Original line number Diff line number Diff line
@@ -11,7 +11,14 @@ static int dpu_wb_conn_get_modes(struct drm_connector *connector) 
	struct msm_drm_private *priv = dev->dev_private;

	struct dpu_kms *dpu_kms = to_dpu_kms(priv->kms);



	return drm_add_modes_noedid(connector, dpu_kms->catalog->caps->max_linewidth,

	/*

	 * We should ideally be limiting the modes only to the maxlinewidth but

	 * on some chipsets this will allow even 4k modes to be added which will

	 * fail the per SSPP bandwidth checks. So, till we have dual-SSPP support

	 * and source split support added lets limit the modes based on max_mixer_width

	 * as 4K modes can then be supported.

	 */

	return drm_add_modes_noedid(connector, dpu_kms->catalog->caps->max_mixer_width,

			dev->mode_config.max_height);

}

drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c

+2 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms, 
		encoder = mdp4_lcdc_encoder_init(dev, panel_node);

		if (IS_ERR(encoder)) {

			DRM_DEV_ERROR(dev->dev, "failed to construct LCDC encoder\n");

			of_node_put(panel_node);

			return PTR_ERR(encoder);

		}
@@ -225,6 +226,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms, 
		connector = mdp4_lvds_connector_init(dev, panel_node, encoder);

		if (IS_ERR(connector)) {

			DRM_DEV_ERROR(dev->dev, "failed to initialize LVDS connector\n");

			of_node_put(panel_node);

			return PTR_ERR(connector);

		}