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/i915/intel_crt.c | |
| parent | a41ceb1c17af06a17c0d88e987215ef20b93c471 (diff) | |
| download | blackbird-op-linux-930a9e283516a3a3595c0c515113f1b78d07f695.tar.gz blackbird-op-linux-930a9e283516a3a3595c0c515113f1b78d07f695.zip | |
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_crt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 0350e5d711f8..a02a8df73727 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -401,8 +401,7 @@ intel_crt_load_detect(struct drm_crtc *crtc, struct intel_encoder *intel_encoder } static enum drm_connector_status -intel_crt_detect(struct drm_connector *connector, - bool nondestructive) +intel_crt_detect(struct drm_connector *connector, bool force) { struct drm_device *dev = connector->dev; struct drm_encoder *encoder = intel_attached_encoder(connector); @@ -421,7 +420,7 @@ intel_crt_detect(struct drm_connector *connector, if (intel_crt_detect_ddc(encoder)) return connector_status_connected; - if (nondestructive) + if (!force) return connector->status; /* for pre-945g platforms use load detect */ |
