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

Merge tag 'msm-next-5.19-fixes' of https://gitlab.freedesktop.org/abhinavk/msm into drm-next 



5.19 fixes for msm-next

- Limiting WB modes to max sspp linewidth
- Fixing the supported rotations to add 180 back for IGT
- Fix to handle pm_runtime_get_sync() errors to avoid unclocked access
   in the bind() path for dpu driver
- Fix the irq_free() without request issue which was a big-time
   hitter in the CI-runs.

Signed-off-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Abhinav Kumar <quic_abhinavk@quicinc.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b011d51d-d634-123e-bf5f-27219ee33151@quicinc.com
parents 66ccd1d1 64b22a0d

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

+1 −0
Original line number Diff line number Diff line
@@ -1914,6 +1914,7 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) 
	BUG_ON(!node);



	ret = a6xx_gmu_init(a6xx_gpu, node);

	of_node_put(node);

	if (ret) {

		a6xx_destroy(&(a6xx_gpu->base.base));

		return ERR_PTR(ret);

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

+3 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,9 @@ static int dpu_kms_hw_init(struct msm_kms *kms) 


	dpu_kms_parse_data_bus_icc_path(dpu_kms);



	pm_runtime_get_sync(&dpu_kms->pdev->dev);

	rc = pm_runtime_resume_and_get(&dpu_kms->pdev->dev);

	if (rc < 0)

		goto error;



	dpu_kms->core_rev = readl_relaxed(dpu_kms->mmio + 0x0);

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

+1 −1
Original line number Diff line number Diff line
@@ -1577,7 +1577,7 @@ struct drm_plane *dpu_plane_init(struct drm_device *dev, 
			BIT(DRM_MODE_BLEND_PREMULTI) |

			BIT(DRM_MODE_BLEND_COVERAGE));



	supported_rotations = DRM_MODE_REFLECT_MASK | DRM_MODE_ROTATE_0;

	supported_rotations = DRM_MODE_REFLECT_MASK | DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180;



	if (pdpu->pipe_hw->cap->features & BIT(DPU_SSPP_INLINE_ROTATION))

		supported_rotations |= DRM_MODE_ROTATE_MASK;

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

+3 −1
Original line number Diff line number Diff line
@@ -8,8 +8,10 @@ 
static int dpu_wb_conn_get_modes(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;

	struct msm_drm_private *priv = dev->dev_private;

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



	return drm_add_modes_noedid(connector, dev->mode_config.max_width,

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

			dev->mode_config.max_height);

}

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

+3 −1
Original line number Diff line number Diff line
@@ -997,8 +997,10 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc, 


	ret = msm_gem_get_and_pin_iova(cursor_bo, kms->aspace,

			&mdp5_crtc->cursor.iova);

	if (ret)

	if (ret) {

		drm_gem_object_put(cursor_bo);

		return -EINVAL;

	}



	pm_runtime_get_sync(&pdev->dev);