linux.git/drivers/gpu/drm, branch v3.1-rc3

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

2011-08-20T06:07:08+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-intel:
  drm/i915: set GFX_MODE to pre-Ivybridge default value even on Ivybridge

drm/i915: set GFX_MODE to pre-Ivybridge default value even on Ivybridge

2011-08-19T18:57:12+00:00

Prior to Ivybridge, the GFX_MODE would default to 0x800, meaning that
MI_FLUSH would flush the TLBs in addition to the rest of the caches
indicated in the MI_FLUSH command.  However starting with Ivybridge, the
register defaults to 0x2800 out of reset, meaning that to invalidate the
TLB we need to use PIPE_CONTROL.  Since we're not doing that yet, go
back to the old default so things work.

v2: don't forget to actually *clear* the new bit

Reviewed-by: Eric Anholt 
Reviewed-by: Chris Wilson 
Tested-by: Kenneth Graunke 
Signed-off-by: Jesse Barnes

Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6

2011-08-16T02:14:18+00:00

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
  drm/i915: Cannot set clock gating under UMS
  drm/i915: Can't do accurate vblank timestamps with UMS
  Not all systems expose a firmware or platform mechanism for changing the backlight intensity on i915, so add native driver support.
  drm/i915: split out PCH refclk update code
  drm/i915: show interrupt info on IVB
  drm/i915: Remove unused 'reg' argument to dp_pipe_enabled
  drm/i915: Fix PCH port pipe select in CPT disable paths
  drm/i915: Leave LVDS registers unlocked
  drm/i915: Wait for LVDS panel power sequence

drm/i915: Cannot set clock gating under UMS

2011-08-15T19:10:27+00:00

The clock gating functions are only assigned under KMS, so don't try
to call them under UMS.

Signed-off-by: Keith Packard 
Tested-by: Justin P. Mattock

drm/i915: Can't do accurate vblank timestamps with UMS

2011-08-15T19:10:26+00:00

Disable this feature when KMS is not running by setting the
driver->get_vblank_timestamp function pointer to NULL.

Signed-off-by: Keith Packard 
Tested-by: Justin P. Mattock

Not all systems expose a firmware or platform mechanism for changing the backlight intensity on i915, so add native driver support.

2011-08-15T19:10:25+00:00

Signed-off-by: Matthew Garrett 
Cc: Richard Purdie 
Cc: Chris Wilson 
Cc: David Airlie 
Cc: Alex Deucher 
Cc: Ben Skeggs 
Cc: Zhang Rui 
Cc: Len Brown 
Cc: Jesse Barnes 
Tested-by: Sedat Dilek 
Tested-by: Michel Alexandre Salim 
Tested-by: Kamal Mostafa 
Signed-off-by: Andrew Morton 
Signed-off-by: Keith Packard

drm/radeon/kms: don't try to be smart in the hpd handler

2011-08-15T08:44:12+00:00

Attempting to try and turn off disconnected display hw in the
hotput handler lead to more problems than it helped.  For
now just register an event and only attempt the do something
interesting with DP.  Other connectors are just too problematic:
- Some systems have an HPD pin assigned to LVDS, but it's rarely
if ever connected properly and we don't really care about hpd
events on LVDS anyway since it's always connected.
- The HPD pin is wired up correctly for eDP, but we don't really
have to do anything since the events since it's always connected.
- Some HPD pins fire more than once when you connect/disconnect
- etc.

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=39882

Signed-off-by: Alex Deucher 
Cc: stable@kernel.org
Signed-off-by: Dave Airlie

drm/radeon: re-POST the asic on Apple hardware when booted via EFI

2011-08-12T10:04:29+00:00

At least some Apples program the GPU into a state that wedges the engine
once userspace starts trying to perform accelerated operations. Executing
the Atom init scripts gets the hardware back into a working state. The
same hardware works fine when booted via BIOS emulation, so let's just
execute the init scripts on Apples when we're using EFI.

Signed-off-by: Matthew Garrett 
Reviewed-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm/radeon: Allow panel preferred EDID to override BIOS native mode

2011-08-12T10:02:46+00:00

We have two sources of information about panel capabilities on mobile
radeon - the BIOS, which gives us a native mode, and the panel's preferred
mode. In theory these two will always match, but there's some corner cases
where the BIOS hasn't been fully initialised and so the native mode in it
ends up with default values. However, if we get a panel with reasonable
EDID, it's probably the case that the panel's preferred mode does actually
represent the panel capabilities. This patch handles that case by replacing
the native mode with the panel's preferred mode if the resolutions don't
match. Systems without a valid internal panel EDID will still use the BIOS
native mode.

Signed-off-by: Matthew Garrett 
Reviewed-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm/radeon/kms: make some watermark messages debug only

2011-08-12T09:49:43+00:00

Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie