linux.git/drivers/gpu, branch v3.3-rc1

nouveau: Support Optimus models for vga_switcheroo

2012-01-13T09:09:15+00:00

Newer nVidia cards with Optimus do not support/use the DSM switching functions.
Instead, it require a DSM function to be called prior to bringing a device into
D3 state. No other _DSM calls are necessary before/after enabling/disabling a
device. Switching between discrete and integrated GPU is not supported by
this Optimus _DSM call, therefore return on the switching method.

Signed-off-by: Peter Lekensteyn 
Signed-off-by: Dave Airlie

nouveau: properly check for _DSM function support

2012-01-13T09:09:07+00:00

According to the ACPI spec version 4, section 9.14.1, _DSM functions
must return a value with the first bit enabled if any DSM functions are
supported for the given UUID and revision ID. For a given function index n
to be marked supported, bit n must be enabled.

Signed-off-by: Peter Lekensteyn 
Signed-off-by: Dave Airlie

radeon: Call pci_clear_master() instead of open-coding it.

2012-01-13T09:02:34+00:00

Reported-by: Ben Hutchings 
Signed-off-by: Michel Dänzer 
Reviewed-by: Alex Deucher 
Signed-off-by: Dave Airlie

gma500: Discard modes that don't fit in stolen memory

2012-01-13T09:02:06+00:00

[This fixes a crash on boot if the system is plugged into an HDTV so it's
 probably appropriate to push even though it didn't make the window. We could
 be cleverer about this but the simple version seems to be the safe one]

From: Patrik Jakobsson 

At the moment we cannot allocate more than stolen memory size for framebuffers.
To get around that issues we discard modes that doesn't fit. This is a temporary
solution until we can freely allocate framebuffer memory.

[Currently the framebuffer needs to be linear in kernel space due to limits
 in the kernel fb layer - AC]

Signed-off-by: Patrik Jakobsson 
Signed-off-by: Alan Cox 
Signed-off-by: Dave Airlie

drm/radeon/kms: Fix module parameter description format

2012-01-13T09:00:51+00:00

Module parameter descriptions don't take a trailing \n, otherwise it
breaks formatting of modinfo's output. Also add missing space after
comma.

Signed-off-by: Jean Delvare 
Cc: David Airlie 
Reviewed-by: Alex Deucher 
Cc: Jerome Glisse 
Signed-off-by: Dave Airlie

drm/radeon/kms/ni: fix packet2 handling for VM IB parser

2012-01-13T09:00:16+00:00

Packet2 is only one dword.

Signed-off-by: Alex Deucher 
Reviewed-by: Jerome Glisse 
Signed-off-by: Dave Airlie

ttm/dma: Remove the WARN() which is not useful.

2012-01-13T08:59:47+00:00

. It was useful during development, but now on a production system
we can get this (if the user forgot to upload the firmware):

[drm] radeon: irq initialized.
[drm] GART: num cpu pages 131072, num gpu pages 131072
[drm] radeon: ib pool ready.
[drm] Loading SUMO Microcode
r600_cp: Failed to load firmware "radeon/SUMO_pfp.bin"
atl1c 0000:03:00.0: version 1.0.1.0-NAPI.213057] [drm:evergreen_startup] *ERROR* Failed to load firmware!
radeon 0000:00:01.0: disabling GPU acceleration
88] radeon 0000:00:01.0: ffff8801bb782400 unpin not necessary
------------[ cut here ]------------
WARNING: at /home/konrad/linux-linus/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c:956 ttm_dma_unpopulate+0x79/0x300 [ttm]()
Hardware name: System Product Name
Modules linked in: e1000e atl1c radeon(+) ahci libahci libata scsi_mod fbcon tileblit font ttm bitblit softcursor drm_kms_helper wmi xen_blkfront xen_netfront fb_sys_fops sysimgblt sysfillrect syscopyarea xenfs xen_privcmd
Pid: 1600, comm: modprobe Not tainted 3.2.0-06100-ge343a89 #1
Call Trace:
 [] warn_slowpath_common+0x7a/0xb0
 [] warn_slowpath_null+0x15/0x20
 [] ttm_dma_unpopulate+0x79/0x300 [ttm]
 [] radeon_ttm_tt_unpopulate+0x120/0x130 [radeon]
 [] ttm_tt_destroy+0x2c/0x70 [ttm]
 [] ttm_bo_cleanup_memtype_use+0x3e/0x80 [ttm]
 [] ttm_bo_release+0x251/0x280 [ttm]
 [] ttm_bo_unref+0x40/0x60 [ttm]
 [] radeon_bo_unref+0x42/0x80 [radeon]
 [] radeon_sa_bo_manager_fini+0x6b/0x80 [radeon]
 [] radeon_ib_pool_fini+0x6f/0x90 [radeon]
 [] r100_ib_fini+0x19/0x20 [radeon]
 [] evergreen_init+0x1ee/0x2d0 [radeon]

The big WARN() has nothing to do with the culprit - which is that
the firmware was not loaded. So lets remove the WARN() from the TTM DMA code.

Signed-off-by: Konrad Rzeszutek Wilk 
Reviewed-by: Jerome Glisse 
Signed-off-by: Dave Airlie

Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux

2012-01-10T19:04:36+00:00

* 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (307 commits)
  drm/nouveau/pm: fix build with HWMON off
  gma500: silence gcc warnings in mid_get_vbt_data()
  drm/ttm: fix condition (and vs or)
  drm/radeon: double lock typo in radeon_vm_bo_rmv()
  drm/radeon: use after free in radeon_vm_bo_add()
  drm/sis|via: don't return stack garbage from free_mem ioctl
  drm/radeon/kms: remove pointless CS flags priority struct
  drm/radeon/kms: check if vm is supported in VA ioctl
  drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)
  radeon: Fix disabling PCI bus mastering on big endian hosts.
  ttm: fix agp since ttm tt rework
  agp: Fix multi-line warning message whitespace
  drm/ttm/dma: Fix accounting error when calling ttm_mem_global_free_page and don't try to free freed pages.
  drm/ttm/dma: Only call set_pages_array_wb when the page is not in WB pool.
  drm/radeon/kms: sync across multiple rings when doing bo moves v3
  drm/radeon/kms: Add support for multi-ring sync in CS ioctl (v2)
  drm/radeon: GPU virtual memory support v22
  drm: make DRM_UNLOCKED ioctls with their own mutex
  drm: no need to hold global mutex for static data
  drm/radeon/benchmark: common modes sweep ignores 640x480@32
  ...

Fix up trivial conflicts in radeon/evergreen.c and vmwgfx/vmwgfx_kms.c

drm/nouveau/pm: fix build with HWMON off

2012-01-10T10:13:16+00:00

Reported-by: Randy Dunlap 
Signed-off-by: Dave Airlie

gma500: silence gcc warnings in mid_get_vbt_data()

2012-01-10T10:01:22+00:00

Add a cast here to silence a Gcc warning.
drivers/gpu/drm/gma500/mid_bios.c:214:28: warning:
  cast from pointer to integer of different size [-Wpointer-to-int-cast]

Signed-off-by: Dan Carpenter 
Acked-by: Alan Cox 
Signed-off-by: Dave Airlie