Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 222751
b: refs/heads/master
c: c5027de
h: refs/heads/master
i:
  222749: 4d8f50d
  222747: 9339f5a
  222743: aa118c5
  222735: 103e4a7
  222719: f858628
v: v3
  • Loading branch information
Keith Packard authored and Dave Airlie committed Nov 29, 2010
1 parent cb9744b commit f48a3a6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bf9dc102e284a5aa78c73fc9d72e11d5ccd8669f
refs/heads/master: c5027dec02c96964847fa68d512318ee5f6f7a19
7 changes: 4 additions & 3 deletions trunk/drivers/gpu/drm/drm_crtc_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
}

Expand Down

0 comments on commit f48a3a6

Please sign in to comment.