diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-14 11:07:23 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-09-14 20:38:48 +1000 |
commit | 930a9e283516a3a3595c0c515113f1b78d07f695 (patch) | |
tree | b527736ae76d678f8791755be28a250a6e2593bc /drivers/gpu/drm/drm_crtc_helper.c | |
parent | a41ceb1c17af06a17c0d88e987215ef20b93c471 (diff) | |
download | op-kernel-dev-930a9e283516a3a3595c0c515113f1b78d07f695.zip op-kernel-dev-930a9e283516a3a3595c0c515113f1b78d07f695.tar.gz |
drm: Use a nondestructive mode for output detect when polling (v2)
v2: Julien Cristau pointed out that @nondestructive results in
double-negatives and confusion when trying to interpret the parameter,
so use @force instead. Much easier to type as well. ;-)
And fix the miscompilation of vmgfx reported by Sedat Dilek.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_crtc_helper.c')
-rw-r--r-- | drivers/gpu/drm/drm_crtc_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index fb6b70f..dcbeb98 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -103,7 +103,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, if (connector->funcs->force) connector->funcs->force(connector); } else { - connector->status = connector->funcs->detect(connector, false); + connector->status = connector->funcs->detect(connector, true); drm_kms_helper_poll_enable(dev); } @@ -866,7 +866,7 @@ static void output_poll_execute(struct work_struct *work) !(connector->polled & DRM_CONNECTOR_POLL_HPD)) continue; - status = connector->funcs->detect(connector, true); + status = connector->funcs->detect(connector, false); if (old_status != status) changed = true; } |