Commit af197bef authored by Sean Anderson's avatar Sean Anderson Committed by Tomi Valkeinen
Browse files

drm: zynqmp_dp: Don't delay work 



We always call scheduled_delayed_work with no delay, so just use a
non-delayed work_struct instead.

Signed-off-by: default avatarSean Anderson <sean.anderson@linux.dev>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240503192922.2172314-4-sean.anderson@linux.dev
parent c194dd02

drivers/gpu/drm/xlnx/zynqmp_dp.c

+6 −7
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ struct zynqmp_dp_config { 
struct zynqmp_dp {

	struct drm_dp_aux aux;

	struct drm_bridge bridge;

	struct delayed_work hpd_work;

	struct work_struct hpd_work;



	struct drm_bridge *next_bridge;

	struct device *dev;
@@ -1482,7 +1482,7 @@ static void zynqmp_dp_bridge_atomic_disable(struct drm_bridge *bridge, 
	struct zynqmp_dp *dp = bridge_to_dp(bridge);



	dp->enabled = false;

	cancel_delayed_work(&dp->hpd_work);

	cancel_work(&dp->hpd_work);

	zynqmp_dp_write(dp, ZYNQMP_DP_MAIN_STREAM_ENABLE, 0);

	drm_dp_dpcd_writeb(&dp->aux, DP_SET_POWER, DP_SET_POWER_D3);

	zynqmp_dp_write(dp, ZYNQMP_DP_TX_PHY_POWER_DOWN,
@@ -1648,8 +1648,7 @@ void zynqmp_dp_disable_vblank(struct zynqmp_dp *dp) 


static void zynqmp_dp_hpd_work_func(struct work_struct *work)

{

	struct zynqmp_dp *dp = container_of(work, struct zynqmp_dp,

					    hpd_work.work);

	struct zynqmp_dp *dp = container_of(work, struct zynqmp_dp, hpd_work);

	enum drm_connector_status status;



	status = zynqmp_dp_bridge_detect(&dp->bridge);
@@ -1685,7 +1684,7 @@ static irqreturn_t zynqmp_dp_irq_handler(int irq, void *data) 
		zynqmp_dpsub_drm_handle_vblank(dp->dpsub);



	if (status & ZYNQMP_DP_INT_HPD_EVENT)

		schedule_delayed_work(&dp->hpd_work, 0);

		schedule_work(&dp->hpd_work);



	if (status & ZYNQMP_DP_INT_HPD_IRQ) {

		int ret;
@@ -1727,7 +1726,7 @@ int zynqmp_dp_probe(struct zynqmp_dpsub *dpsub) 
	dp->dpsub = dpsub;

	dp->status = connector_status_disconnected;



	INIT_DELAYED_WORK(&dp->hpd_work, zynqmp_dp_hpd_work_func);

	INIT_WORK(&dp->hpd_work, zynqmp_dp_hpd_work_func);



	/* Acquire all resources (IOMEM, IRQ and PHYs). */

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dp");
@@ -1832,7 +1831,7 @@ void zynqmp_dp_remove(struct zynqmp_dpsub *dpsub) 
	zynqmp_dp_write(dp, ZYNQMP_DP_INT_DS, ZYNQMP_DP_INT_ALL);

	disable_irq(dp->irq);



	cancel_delayed_work_sync(&dp->hpd_work);

	cancel_work_sync(&dp->hpd_work);



	zynqmp_dp_write(dp, ZYNQMP_DP_TRANSMITTER_ENABLE, 0);

	zynqmp_dp_write(dp, ZYNQMP_DP_INT_DS, 0xffffffff);