linux-toradex.git/drivers, branch v2.6.36-rc2

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel

2010-08-22T18:03:27+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (58 commits)
  drm/i915,intel_agp: Add support for Sandybridge D0
  drm/i915: fix render pipe control notify on sandybridge
  agp/intel: set 40-bit dma mask on Sandybridge
  drm/i915: Remove the conflicting BUG_ON()
  drm/i915/suspend: s/IS_IRONLAKE/HAS_PCH_SPLIT/
  drm/i915/suspend: Flush register writes before busy-waiting.
  i915: disable DAC on Ironlake also when doing CRT load detection.
  drm/i915: wait for actual vblank, not just 20ms
  drm/i915: make sure eDP PLL is enabled at the right time
  drm/i915: fix VGA plane disable for Ironlake+
  drm/i915: eDP mode set sequence corrections
  drm/i915: add panel reset workaround
  drm/i915: Enable RC6 on Ironlake.
  drm/i915/sdvo: Only set is_lvds if we have a valid fixed mode.
  drm/i915: Set up a render context on Ironlake
  drm/i915 invalidate indirect state pointers at end of ring exec
  drm/i915: Wake-up wait_request() from elapsed hang-check (v2)
  drm/i915: Apply i830 errata for cursor alignment
  drm/i915: Only update i845/i865 CURBASE when disabled (v2)
  drm/i915: FBC is updated within set_base() so remove second call in mode_set()
  ...

drm/i915,intel_agp: Add support for Sandybridge D0

2010-08-22T06:29:03+00:00

Signed-off-by: Zhenyu Wang 
Signed-off-by: Eric Anholt

drm/i915: fix render pipe control notify on sandybridge

2010-08-22T06:28:54+00:00

This one is missed in last pipe control fix for sandybridge,
that really unmask interrupt bit for notify in render engine IMR.

Signed-off-by: Zhenyu Wang 
Signed-off-by: Eric Anholt

agp/intel: set 40-bit dma mask on Sandybridge

2010-08-22T06:24:50+00:00

Signed-off-by: Zhenyu Wang 
Signed-off-by: Eric Anholt

drm/i915: Remove the conflicting BUG_ON()

2010-08-22T06:21:13+00:00

We now attempt to free "active" objects following a GPU hang as either
the GPU will be reset or the hang is permenant. In either case, the GPU
writes will not be flushed to main memory and it should be safe to
return that memory back to the system.

The BUG_ON(active) is thus overkill and can erroneously fire after a
EIO.

Signed-off-by: Chris Wilson 
Signed-off-by: Eric Anholt

drm/i915/suspend: s/IS_IRONLAKE/HAS_PCH_SPLIT/

2010-08-22T06:20:21+00:00

For the shared paths on the next generation chipsets.

Signed-off-by: Chris Wilson 
Signed-off-by: Eric Anholt

drm/i915/suspend: Flush register writes before busy-waiting.

2010-08-22T06:20:17+00:00

Signed-off-by: Chris Wilson 
Signed-off-by: Eric Anholt

i915: disable DAC on Ironlake also when doing CRT load detection.

2010-08-22T06:07:04+00:00

Like on Sandybridge, disabling the DAC here when doing CRT load detect
avoids forever hangs waiting on the hardware.

test procedure on HP 2740p:
boot with no VGA plugged in, start X,
plug in VGA monitor (1280x1024)
chvt 3
machine hangs waiting forever.

Signed-off-by: Dave Airlie 
Signed-off-by: Eric Anholt

drm/i915: wait for actual vblank, not just 20ms

2010-08-22T05:59:23+00:00

Waiting for a hard coded 20ms isn't always enough to make sure a vblank
period has actually occurred, so add code to make sure we really have
passed through a vblank period (or that the pipe is off when disabling).

This prevents problems with mode setting and link training, and seems to
fix a bug like https://bugs.freedesktop.org/show_bug.cgi?id=29278, but
on an HP 8440p instead.  Hopefully also fixes
https://bugs.freedesktop.org/show_bug.cgi?id=29141.

Signed-off-by: Jesse Barnes 
Signed-off-by: Eric Anholt

Merge git://git.infradead.org/mtd-2.6

2010-08-21T19:47:05+00:00

* git://git.infradead.org/mtd-2.6:
  mtd: nand: Fix probe of Samsung NAND chips
  mtd: nand: Fix regression in BBM detection
  pxa3xx: fix ns2cycle equation