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_hdmi.c | |
| parent | a41ceb1c17af06a17c0d88e987215ef20b93c471 (diff) | |
| download | kernel_samsung_smdk4412-930a9e283516a3a3595c0c515113f1b78d07f695.zip kernel_samsung_smdk4412-930a9e283516a3a3595c0c515113f1b78d07f695.tar.gz kernel_samsung_smdk4412-930a9e283516a3a3595c0c515113f1b78d07f695.tar.bz2 | |
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_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 2ea123d..926934a 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -139,8 +139,7 @@ static bool intel_hdmi_mode_fixup(struct drm_encoder *encoder, } static enum drm_connector_status -intel_hdmi_detect(struct drm_connector *connector, - bool nondestructive) +intel_hdmi_detect(struct drm_connector *connector, bool force) { struct drm_encoder *encoder = intel_attached_encoder(connector); struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); |