diff options
| author | Daniel Vetter | 2012-01-28 14:49:23 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2012-02-10 17:28:45 +0100 |
| commit | dbb025757a30cd225c5587685ae0971ecf301718 (patch) | |
| tree | 2ff13c3b8cabaef2d238021b311bb4212422861d /drivers/gpu/drm/i915/intel_crt.c | |
| parent | drm/i915: fixup interlaced support on ilk+ (diff) | |
| download | kernel-qcow2-linux-dbb025757a30cd225c5587685ae0971ecf301718.tar.gz kernel-qcow2-linux-dbb025757a30cd225c5587685ae0971ecf301718.tar.xz kernel-qcow2-linux-dbb025757a30cd225c5587685ae0971ecf301718.zip | |
drm/i915: don't allow interlaced pipeconf on gen2
gen2 doesn't support it, so be a bit more paranoid and add a check to
ensure that we never ever set an unsupported interlaced bit.
Ensure that userspace can't set an interlaced mode by resetting
interlace_allowed for the crt on gen2. dvo and lvds are the only other
encoders that gen2 supports and these already disallow interlaced
modes.
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_crt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index dd729d46a61f..4d3d736a4f56 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -594,7 +594,10 @@ void intel_crt_init(struct drm_device *dev) 1 << INTEL_ANALOG_CLONE_BIT | 1 << INTEL_SDVO_LVDS_CLONE_BIT); crt->base.crtc_mask = (1 << 0) | (1 << 1); - connector->interlace_allowed = 1; + if (IS_GEN2(dev)) + connector->interlace_allowed = 0; + else + connector->interlace_allowed = 1; connector->doublescan_allowed = 0; drm_encoder_helper_add(&crt->base.base, &intel_crt_helper_funcs); |