diff options
| author | Keith Packard <keithp@keithp.com> | 2010-11-26 19:45:59 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-11-29 07:27:57 +0100 |
| commit | c5027dec02c96964847fa68d512318ee5f6f7a19 (patch) | |
| tree | 185fdc72db34190a9f1da054a42890124472b85d /drivers/gpu/drm | |
| parent | drm: Set connector DPMS status to ON in drm_crtc_helper_set_config (diff) | |
| download | linux-c5027dec02c96964847fa68d512318ee5f6f7a19.tar.xz linux-c5027dec02c96964847fa68d512318ee5f6f7a19.zip | |
drm: record monitor status in output_poll_execute
In order to correctly report monitor connected status changes, the
previous monitor status must be recorded in the connector->status
value instead of being discarded.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc_helper.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index 232ee931b4da..7ca59359fee2 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -848,7 +848,7 @@ static void output_poll_execute(struct work_struct *work) struct delayed_work *delayed_work = to_delayed_work(work); struct drm_device *dev = container_of(delayed_work, struct drm_device, mode_config.output_poll_work); struct drm_connector *connector; - enum drm_connector_status old_status, status; + enum drm_connector_status old_status; bool repoll = false, changed = false; if (!drm_kms_helper_poll) @@ -873,8 +873,9 @@ static void output_poll_execute(struct work_struct *work) !(connector->polled & DRM_CONNECTOR_POLL_HPD)) continue; - status = connector->funcs->detect(connector, false); - if (old_status != status) + connector->status = connector->funcs->detect(connector, false); + DRM_DEBUG_KMS("connector status updated to %d\n", connector->status); + if (old_status != connector->status) changed = true; } |