Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69787f7d authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: run the hpd irq event code directly 



All drivers already have a work item to run the hpd code, so we don't
need to launch a new one in the helper code. Dave Airlie mentioned
that the cancel+re-queue might paper over DP related hpd ping-pongs,
hence why this is split out.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 816da85a

drivers/gpu/drm/drm_crtc_helper.c

+1 −13
Original line number Diff line number Diff line
@@ -1019,12 +1019,9 @@ void drm_kms_helper_poll_enable(struct drm_device *dev) 
}

EXPORT_SYMBOL(drm_kms_helper_poll_enable);



static void hpd_irq_event_execute(struct work_struct *work);



void drm_kms_helper_poll_init(struct drm_device *dev)

{

	INIT_DELAYED_WORK(&dev->mode_config.output_poll_work, output_poll_execute);

	INIT_DELAYED_WORK(&dev->mode_config.hpd_irq_work, hpd_irq_event_execute);

	dev->mode_config.poll_enabled = true;



	drm_kms_helper_poll_enable(dev);
@@ -1037,10 +1034,8 @@ void drm_kms_helper_poll_fini(struct drm_device *dev) 
}

EXPORT_SYMBOL(drm_kms_helper_poll_fini);



static void hpd_irq_event_execute(struct work_struct *work)

void drm_helper_hpd_irq_event(struct drm_device *dev)

{

	struct delayed_work *delayed_work = to_delayed_work(work);

	struct drm_device *dev = container_of(delayed_work, struct drm_device, mode_config.hpd_irq_work);

	struct drm_connector *connector;

	enum drm_connector_status old_status;

	bool changed = false;
@@ -1071,11 +1066,4 @@ static void hpd_irq_event_execute(struct work_struct *work) 
	if (changed)

		drm_kms_helper_hotplug_event(dev);

}



void drm_helper_hpd_irq_event(struct drm_device *dev)

{

	cancel_delayed_work(&dev->mode_config.hpd_irq_work);

	if (drm_kms_helper_poll)

		schedule_delayed_work(&dev->mode_config.hpd_irq_work, 0);

}

EXPORT_SYMBOL(drm_helper_hpd_irq_event);

include/drm/drm_crtc.h

+0 −1
Original line number Diff line number Diff line
@@ -793,7 +793,6 @@ struct drm_mode_config { 
	/* output poll support */

	bool poll_enabled;

	struct delayed_work output_poll_work;

	struct delayed_work hpd_irq_work;



	/* pointers to standard properties */

	struct list_head property_blob_list;