2 Commits

Author	SHA1	Message	Date
Dave Airlie	3ff99164f6	Merge remote branch 'anholt/drm-intel-next' into drm-linus ... This merges the upstream Intel tree and fixes up numerous conflicts due to patches merged into Linus tree later in -rc cycle. Conflicts: drivers/char/agp/intel-agp.c drivers/gpu/drm/drm_dp_i2c_helper.c drivers/gpu/drm/i915/i915_irq.c drivers/gpu/drm/i915/i915_suspend.c	2009-12-08 14:03:47 +10:00
Dave Airlie	ab2c067298	drm/intel: refactor DP i2c support and DP common header to drm helper ... Both radeon and nouveau can re-use this code so move it up a level so they can. However the hw interfaces for aux ch are different enough that the code to translate from mode, address, bytes to actual hw interfaces isn't generic, so move that code into the Intel driver. Signed-off-by: Dave Airlie <airlied@redhat.com>	2009-12-08 09:24:23 +10:00