linux.git/include/drm, branch v3.0-rc2

Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2011-05-24T19:06:40+00:00

* 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (169 commits)
  drivers/gpu/drm/radeon/atom.c: fix warning
  drm/radeon/kms: bump kms version number
  drm/radeon/kms: properly set num banks for fusion asics
  drm/radeon/kms/atom: move dig phy init out of modesetting
  drm/radeon/kms/cayman: fix typo in register mask
  drm/radeon/kms: fix typo in spread spectrum code
  drm/radeon/kms: fix tile_config value reported to userspace on cayman.
  drm/radeon/kms: fix incorrect comparison in cayman setup code.
  drm/radeon/kms: add wait idle ioctl for eg->cayman
  drm/radeon/cayman: setup hdp to invalidate and flush when asked
  drm/radeon/evergreen/btc/fusion: setup hdp to invalidate and flush when asked
  agp/uninorth: Fix lockups with radeon KMS and >1x.
  drm/radeon/kms: the SS_Id field in the LCD table if for LVDS only
  drm/radeon/kms: properly set the CLK_REF bit for DCE3 devices
  drm/radeon/kms: fixup eDP connector handling
  drm/radeon/kms: bail early for eDP in hotplug callback
  drm/radeon/kms: simplify hotplug handler logic
  drm/radeon/kms: rewrite DP handling
  drm/radeon/kms/atom: add support for setting DP panel mode
  drm/radeon/kms: atombios.h updates for DP panel mode
  ...

drm/dp: add some new DP regs for DP 1.2

2011-05-20T10:02:29+00:00

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

drm: Take lock around probes for drm_fb_helper_hotplug_event

2011-05-16T02:01:43+00:00

We need to hold the dev->mode_config.mutex whilst detecting the output
status. But we also need to drop it for the call into
drm_fb_helper_single_fb_probe(), which indirectly acquires the lock when
attaching the fbcon.

Failure to do so exposes a race with normal output probing. Detected by
adding some warnings that the mutex is held to the backend detect routines:

[   17.772456] WARNING: at drivers/gpu/drm/i915/intel_crt.c:471 intel_crt_detect+0x3e/0x373 [i915]()
[   17.772458] Hardware name: Latitude E6400
[   17.772460] Modules linked in: ....
[   17.772582] Pid: 11, comm: kworker/0:1 Tainted: G        W 2.6.38.4-custom.2 #8
[   17.772584] Call Trace:
[   17.772591]  [] ? warn_slowpath_common+0x78/0x8c
[   17.772603]  [] ? intel_crt_detect+0x3e/0x373 [i915]
[   17.772612]  [] ?  drm_helper_probe_single_connector_modes+0xbf/0x2af [drm_kms_helper]
[   17.772619]  [] ?  drm_fb_helper_probe_connector_modes+0x39/0x4d [drm_kms_helper]
[   17.772625]  [] ?  drm_fb_helper_hotplug_event+0xa5/0xc3 [drm_kms_helper]
[   17.772633]  [] ? output_poll_execute+0x146/0x17c [drm_kms_helper]
[   17.772638]  [] ? cfq_init_queue+0x247/0x345
[   17.772644]  [] ? output_poll_execute+0x0/0x17c [drm_kms_helper]
[   17.772648]  [] ? process_one_work+0x193/0x28e
[   17.772652]  [] ? worker_thread+0xef/0x172
[   17.772655]  [] ? worker_thread+0x0/0x172
[   17.772658]  [] ? worker_thread+0x0/0x172
[   17.772663]  [] ? kthread+0x7a/0x82
[   17.772668]  [] ? kernel_thread_helper+0x4/0x10
[   17.772671]  [] ? kthread+0x0/0x82
[   17.772674]  [] ? kernel_thread_helper+0x0/0x10

Reported-by:  Frederik Himpe 
References: https://bugs.freedesktop.org/show_bug.cgi?id=36394
Signed-off-by: Chris Wilson 
Signed-off-by: Dave Airlie

Merge remote branch 'keithp/drm-intel-next' of /ssd/git/drm-next into drm-core-next

2011-05-16T00:45:40+00:00

* 'keithp/drm-intel-next' of /ssd/git/drm-next: (301 commits)
  drm/i915: split PCH clock gating init
  drm/i915: add Ivybridge clock gating init function
  drm/i915: Update the location of the ringbuffers' HWS_PGA registers for IVB.
  drm/i915: Add support for fence registers on Ivybridge.
  drm/i915: Use existing function instead of open-coding fence reg clear.
  drm/i915: split clock gating init into per-chipset functions
  drm/i915: set IBX pch type explicitly
  drm/i915: add Ivy Bridge PCI IDs and driver feature structs
  drm/i915: add PantherPoint PCH ID
  agp/intel: add Ivy Bridge support
  drm/i915: ring support for Ivy Bridge
  drm/i915: page flip support for Ivy Bridge
  drm/i915: interrupt & vblank support for Ivy Bridge
  drm/i915: treat Ivy Bridge watermarks like Sandy Bridge
  drm/i915: manual FDI training for Ivy Bridge
  drm/i915: add swizzle/tiling support for Ivy Bridge
  drm/i915: Ivy Bridge has split display and pipe control
  drm/i915: add IS_IVYBRIDGE macro for checks
  drm/i915: add IS_GEN7 macro to cover Ivy Bridge and later
  drm/i915: split enable/disable vblank code into chipset specific functions
  ...

drm: mm: fix debug output

2011-05-08T23:14:45+00:00

The looping helper didn't do anything due to a superficial
semicolon. Furthermore one of the two dump functions suffered
from copy&paste fail.

While staring at the code I've also noticed that the replace
helper (currently unused) is a bit broken.

Signed-off-by: Daniel Vetter 
Signed-off-by: Dave Airlie

drm/radeon/kms: fix gart setup on fusion parts (v2)

2011-05-04T00:16:40+00:00

Out of the entire GART/VM subsystem, the hw designers changed
the location of 3 regs.

v2: airlied: add parameter for userspace to work from.

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

drm/radeon/kms: add some new pci ids

2011-05-03T23:28:59+00:00

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

drm: Export the command-line mode parser

2011-04-28T04:56:23+00:00

In the absence of configuration data for providing the fixed mode for
a panel, I would like to be able to pass such modes along a separate
module paramenter. To do so, I then need to parse a modeline from a
string, which drm is already capable of. Export that capability to the
drivers.

Signed-off-by: Chris Wilson 
Signed-off-by: Dave Airlie

drm: Verify debug message arguments

2011-04-28T04:53:21+00:00

Add __attribute__((format (printf, 4, 5))) to drm_ut_debug_printk
and fix fallout.

Signed-off-by: Joe Perches 
Signed-off-by: Dave Airlie

drm: Create and use drm_err

2011-04-28T04:53:02+00:00

Reduce drm text size ~1% by using drm_err and
printf extension %pV to emit error messages.

Remove unused macro DRM_MEM_ERROR.

$ size drivers/gpu/drm/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 361159	   9663	    256	 371078	  5a986	drivers/gpu/drm/built-in.o.new
 365416	   9663	    256	 375335	  5ba27	drivers/gpu/drm/built-in.o.old

Signed-off-by: Joe Perches 
Signed-off-by: Dave Airlie