leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm: run the hpd irq event code directly

Browse Source 
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: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Daniel Vetter 2012-10-23 18:23:34 +00:00 committed by Dave Airlie
parent 816da85a09
commit 69787f7da6
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/drm_crtc_helper.c
View File

@ -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);

1
include/drm/drm_crtc.h
View File

@ -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;