diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-14 06:07:23 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-09-14 06:38:48 -0400 |
commit | 930a9e283516a3a3595c0c515113f1b78d07f695 (patch) | |
tree | b527736ae76d678f8791755be28a250a6e2593bc /drivers/gpu/drm/i915/intel_tv.c | |
parent | a41ceb1c17af06a17c0d88e987215ef20b93c471 (diff) |
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/i915/intel_tv.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_tv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index d20b550c0f55..4a117e318a73 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c | |||
@@ -1341,8 +1341,7 @@ static void intel_tv_find_better_format(struct drm_connector *connector) | |||
1341 | * we have a pipe programmed in order to probe the TV. | 1341 | * we have a pipe programmed in order to probe the TV. |
1342 | */ | 1342 | */ |
1343 | static enum drm_connector_status | 1343 | static enum drm_connector_status |
1344 | intel_tv_detect(struct drm_connector *connector, | 1344 | intel_tv_detect(struct drm_connector *connector, bool force) |
1345 | bool nondestructive) | ||
1346 | { | 1345 | { |
1347 | struct drm_display_mode mode; | 1346 | struct drm_display_mode mode; |
1348 | struct drm_encoder *encoder = intel_attached_encoder(connector); | 1347 | struct drm_encoder *encoder = intel_attached_encoder(connector); |
@@ -1354,7 +1353,7 @@ intel_tv_detect(struct drm_connector *connector, | |||
1354 | 1353 | ||
1355 | if (encoder->crtc && encoder->crtc->enabled) { | 1354 | if (encoder->crtc && encoder->crtc->enabled) { |
1356 | type = intel_tv_detect_type(intel_tv); | 1355 | type = intel_tv_detect_type(intel_tv); |
1357 | } else if (nondestructive) { | 1356 | } else if (force) { |
1358 | struct drm_crtc *crtc; | 1357 | struct drm_crtc *crtc; |
1359 | int dpms_mode; | 1358 | int dpms_mode; |
1360 | 1359 | ||