From: Dave Airlie Date: Fri, 27 Apr 2012 07:21:28 +0000 (+0100) Subject: Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=792ac99c9a09dae1408617a6578ba189424a911e;p=deliverable%2Flinux.git Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes From Daniel Vetter - VGA load-detect fix. This bug seems to be as old as the load-detect code (2.6.30), but needs stupid userspace (upowerd trying to detect connectors on dpms-off outputs) to actually kill the machine. And obviously a machine without VGA-hotplug, otherwise we don't do load detect. - 2 interger overflow fixes for unpriviledged ioctls from Xi Wang. - Fix SDVO regression for low-res (pixelclock < 100MHz) digital outputs, introduce in 2.6.36. * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: drm/i915: handle input/output sdvo timings separately in mode_set drm/i915: fix integer overflow in i915_gem_do_execbuffer() drm/i915: fix integer overflow in i915_gem_execbuffer2() drm/i915: fixup load-detect on enabled, but not active pipe --- 792ac99c9a09dae1408617a6578ba189424a911e