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

Merge tag 'drm-xilinx-dpsub-20210809' of git://linuxtv.org/pinchartl/media into drm-next 



- Miscellaneous fixes in ZynqMP DPSUB driver

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YRCSRZZV1HZYPvaG@pendragon.ideasonboard.com
parents 25fed6b3 6ebfd22c

drivers/gpu/drm/xlnx/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ config DRM_ZYNQMP_DPSUB 
	depends on ARCH_ZYNQMP || COMPILE_TEST

	depends on COMMON_CLK && DRM && OF

	depends on DMADEVICES

	depends on PHY_XILINX_ZYNQMP

	depends on XILINX_ZYNQMP_DPDMA

	select DMA_ENGINE

	select DRM_GEM_CMA_HELPER

	select DRM_KMS_CMA_HELPER

drivers/gpu/drm/xlnx/zynqmp_disp.c

+159 −161

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/xlnx/zynqmp_dp.c

+12 −10
Original line number Diff line number Diff line
@@ -402,10 +402,6 @@ static int zynqmp_dp_phy_init(struct zynqmp_dp *dp) 
		}

	}



	ret = zynqmp_dp_reset(dp, false);

	if (ret < 0)

		return ret;



	zynqmp_dp_clr(dp, ZYNQMP_DP_PHY_RESET, ZYNQMP_DP_PHY_RESET_ALL_RESET);



	/*
@@ -441,8 +437,6 @@ static void zynqmp_dp_phy_exit(struct zynqmp_dp *dp) 
				ret);

	}



	zynqmp_dp_reset(dp, true);



	for (i = 0; i < dp->num_lanes; i++) {

		ret = phy_exit(dp->phy[i]);

		if (ret)
@@ -1683,9 +1677,13 @@ int zynqmp_dp_probe(struct zynqmp_dpsub *dpsub, struct drm_device *drm) 
		return PTR_ERR(dp->reset);

	}



	ret = zynqmp_dp_reset(dp, false);

	if (ret < 0)

		return ret;



	ret = zynqmp_dp_phy_probe(dp);

	if (ret)

		return ret;

		goto err_reset;



	/* Initialize the hardware. */

	zynqmp_dp_write(dp, ZYNQMP_DP_TX_PHY_POWER_DOWN,
@@ -1697,7 +1695,7 @@ int zynqmp_dp_probe(struct zynqmp_dpsub *dpsub, struct drm_device *drm) 


	ret = zynqmp_dp_phy_init(dp);

	if (ret)

		return ret;

		goto err_reset;



	zynqmp_dp_write(dp, ZYNQMP_DP_TRANSMITTER_ENABLE, 1);
@@ -1709,15 +1707,18 @@ int zynqmp_dp_probe(struct zynqmp_dpsub *dpsub, struct drm_device *drm) 
					zynqmp_dp_irq_handler, IRQF_ONESHOT,

					dev_name(dp->dev), dp);

	if (ret < 0)

		goto error;

		goto err_phy_exit;



	dev_dbg(dp->dev, "ZynqMP DisplayPort Tx probed with %u lanes\n",

		dp->num_lanes);



	return 0;



error:

err_phy_exit:

	zynqmp_dp_phy_exit(dp);

err_reset:

	zynqmp_dp_reset(dp, true);



	return ret;

}
@@ -1735,4 +1736,5 @@ void zynqmp_dp_remove(struct zynqmp_dpsub *dpsub) 
	zynqmp_dp_write(dp, ZYNQMP_DP_INT_DS, 0xffffffff);



	zynqmp_dp_phy_exit(dp);

	zynqmp_dp_reset(dp, true);

}