Commit 1a5409fa authored by Rob Clark's avatar Rob Clark
Browse files

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

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

 into msm-fixes-staging

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 avatarRob Clark <robdclark@chromium.org>
parents 947a844b 64b22a0d

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/msm_drv.c

+6 −1
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ static int msm_irq_postinstall(struct drm_device *dev) 


static int msm_irq_install(struct drm_device *dev, unsigned int irq)

{

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_kms *kms = priv->kms;

	int ret;



	if (irq == IRQ_NOTCONNECTED)
@@ -124,6 +126,8 @@ static int msm_irq_install(struct drm_device *dev, unsigned int irq) 
	if (ret)

		return ret;



	kms->irq_requested = true;



	ret = msm_irq_postinstall(dev);

	if (ret) {

		free_irq(irq, dev);
@@ -139,6 +143,7 @@ static void msm_irq_uninstall(struct drm_device *dev) 
	struct msm_kms *kms = priv->kms;



	kms->funcs->irq_uninstall(kms);

	if (kms->irq_requested)

		free_irq(kms->irq, dev);

}

drivers/gpu/drm/msm/msm_kms.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ struct msm_kms { 


	/* irq number to be passed on to msm_irq_install */

	int irq;

	bool irq_requested;



	/* mapper-id used to request GEM buffer mapped for scanout: */

	struct msm_gem_address_space *aspace;