summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* drm/vmwgfx: Fix framebuffer modesettingJakob Bornecrantz2010-06-031-18/+4Star
| | | | | | | | Must set SVGA_NUM_REG_GUEST_DISPLAY before setting up the display information. Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/vmwgfx: Fix vga save / restore with display topology.Thomas Hellstrom2010-06-032-7/+56
| | | | | | | vga save / restore previously didn't handle the display topology case. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* vgaarb: use MIT licenseTiago Vignatti2010-06-032-3/+44
| | | | | | Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Cc: Henry Zhao <Henry.Zhao@Sun.COM> Signed-off-by: Dave Airlie <airlied@redhat.com>
* vgaarb: convert pr_devel() to pr_debug()Tiago Vignatti2010-06-031-17/+18
| | | | | | | | | | We want to be able to use CONFIG_DYNAMIC_DEBUG in arbiter code, switch the few existing pr_devel() calls to pr_debug(). Also, add one more debug information regarding decoding count. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: fix typos in Linux DRM Developer's GuideNicolas Kaiser2010-06-031-6/+6
| | | | | | | | A few typos in the DRM Developer's Guide. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Acked-by: Jesse Barnes <jesse.barnes@intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/radeon/kms/pm: voltage fixesAlex Deucher2010-06-032-4/+12
| | | | | | | | - Enable GPIO voltage for non pm modes as well so resetting the default voltage works. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/radeon/kms/pm: radeon_set_power_state fixesAlex Deucher2010-06-031-41/+34Star
| | | | | | | | | | - wait for vbl for both profile and dynpm - unify profile and dynpm code paths more - call pm_misc before of after clocks to make sure voltage is changed in the proper order. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/radeon/kms/pm: patch default power state with default clocks/voltages on ↵Alex Deucher2010-06-031-1/+24
| | | | | | | | | | | r6xx+ The default power state does not always match the default clocks and voltage for a particular card. The information in the firmware info table is correct and should be used in preference to the info the default power state. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/radeon/kms/pm: enable SetVoltage on r7xx/evergreenAlex Deucher2010-06-032-0/+10
| | | | | | | I missed these in the r6xx commit. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/radeon/kms/pm: add support for SetVoltage cmd table (V2)Alex Deucher2010-06-034-1/+45
| | | | | | | | | | | | - This enables voltage adjustment on r6xx+ and certain r5xx asics. - Voltage drop support is already available for most r1xx-r5xx asics. V2: endian fix for voltage table. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/radeon/kms/evergreen: add initial CS parserAlex Deucher2010-06-017-3/+2443
| | | | | | | | Advanced validation is not implemented yet. The mesa code that uses this will be released soon. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into ↵Dave Airlie2010-06-0110-34/+98
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drm-testing * 'nouveau/for-airlied' of ../drm-nouveau-next: drm/nv50: cast IGP memory location to u64 before shifting drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack drm/nouveau: fix dual-link displays when plugged into single-link outputs drm/nv50: obey dcb->duallink_possible drm/nv50: fix duallink_possible calculation for DCB 4.0 cards drm/nouveau: don't execute INIT_GPIO unless we're really running the table drm/nv40: allow cold-booting of nv4x chipsets drm/nouveau: fix POST detection for certain chipsets drm/nouveau: Add getparam for current PTIMER time. drm/nouveau: allow cursor image and position to survive suspend
| * drm/nv50: cast IGP memory location to u64 before shiftingBen Skeggs2010-06-011-1/+2
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nv50: use alternate source of SOR_MODE_CTRL for DP hackBen Skeggs2010-05-281-6/+1Star
| | | | | | | | | | | | | | Fixes module unload+reload on Dell M4500, where the "normal" registers get reset to 0. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau: fix dual-link displays when plugged into single-link outputsBen Skeggs2010-05-281-14/+17
| | | | | | | | | | | | | | | | | | | | When selecting the native mode for a display we weren't taking into account whether or not it was actually supported on that particular output. This patch modifies our native mode selection to run all modes through mode_valid() first. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nv50: obey dcb->duallink_possibleBen Skeggs2010-05-281-2/+1Star
| | | | | | | | | | | | | | | | It was once assumed that all G8x had dual-link TMDS everywhere, this isn't actually the case - especially considering passive DP->DVI converters and some HDMI connectors only support single-link. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nv50: fix duallink_possible calculation for DCB 4.0 cardsBen Skeggs2010-05-281-6/+10
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau: don't execute INIT_GPIO unless we're really running the tableBen Skeggs2010-05-281-1/+4
| | | | | | | | | | | | | | | | | | This resulted in accidently switching off the eDP panel on certain laptops since the default state in the GPIO table was off. Fixes rh#582621 Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nv40: allow cold-booting of nv4x chipsetsBen Skeggs2010-05-281-1/+1
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau: fix POST detection for certain chipsetsBen Skeggs2010-05-281-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | We totally fail at detecting un-POSTed chipsets prior to G80. This commit changes the pre-G80 POST detection to read the programmed horizontal total from CRTC 0, and assume the card isn't POSTed if it's 0. NVIDIA use some other heuristics more similar to what we do on G80, but I wasted quite a long time trying to figure out the exact specifics of what they do so we can try this for a bit instead. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau: Add getparam for current PTIMER time.Marcin Kościelnicki2010-05-282-0/+4
| | | | | | | | | | | | | | | | This will be useful for computing GPU-CPU latency, including GL_ARB_timer_query extension. Signed-off-by: Marcin Kościelnicki <koriakin@0x04.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * drm/nouveau: allow cursor image and position to survive suspendMaarten Maathuis2010-05-284-0/+33
| | | | | | | | | | | | | | | | | | - This isn't triggered yet on a normal kernel, because it still does a VT switch, but it seemed like a good idea to fix this now. Tested-by: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: Maarten Maathuis <madman2003@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
* | Merge branch 'drm-switcheroo-fixes' into drm-testingDave Airlie2010-06-018-15/+121
|\ \ | | | | | | | | | | | | | | | | | | * drm-switcheroo-fixes: drm/kms: disable/enable poll around switcheroo on/off drm/nouveau: fixup confusion over which handle the DSM is hanging off. drm/nouveau: attempt to get bios from ACPI v3
| * | drm/kms: disable/enable poll around switcheroo on/offDave Airlie2010-06-015-7/+33
| | | | | | | | | | | | | | | | | | Because we aren't in a suspend state the poll will still run when we have switcherooed a card off. Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | drm/nouveau: fixup confusion over which handle the DSM is hanging off.Dave Airlie2010-06-011-8/+6Star
| | | | | | | | | | | | | | | | | | This fixes the DSM setup correctly since vga switcheroo. Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | drm/nouveau: attempt to get bios from ACPI v3Dave Airlie2010-06-013-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | Some of the laptops with the switchable graphics, seem to not post the secondary GPU at all, and we can't find a copy of the BIOS anywhere except in the ACPI rom retrieval. This adds support for ACPI ROM retrieval to nouveau. Signed-off-by: Dave Airlie <airlied@redhat.com>
* | | Merge branch 'drm-vmware-fixes' into drm-testingDave Airlie2010-06-0111-149/+433
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * drm-vmware-fixes: drm/vmwgfx: Remove some leftover debug messages. drm/vmwgfx: Print warnings in kernel log about bo pinning that fails. drm/vmwgfx: Unpause overlay on update. drm/vmwgfx: Some modesetting cleanups and fixes. drm/vmwgfx: Don't use SVGA_REG_ENABLE in modesetting code. drm/vmwgfx: Remove duplicate member from struct vmw_legacy_display_unit. drm/vmwgfx: Reserve first part of VRAM for framebuffer. drm/vmwgfx: Support older hardware. drm/vmwgfx: Get connector status from detection function. drm/vmwgfx: Add kernel throttling support. Bump minor. drm/vmwgfx: Make sure to unpin old and pin new framebuffer. drm/vmwgfx: Fix single framebuffer detection. drm/vmwgfx: Assume larger framebuffer max size.
| * | | drm/vmwgfx: Remove some leftover debug messages.Thomas Hellstrom2010-06-011-8/+0Star
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | | drm/vmwgfx: Print warnings in kernel log about bo pinning that fails.Jakob Bornecrantz2010-06-012-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | | drm/vmwgfx: Unpause overlay on update.Jakob Bornecrantz2010-06-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unpause codepath uses vmw_overlay_update() so we must unset the paused status. Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | | drm/vmwgfx: Some modesetting cleanups and fixes.Jakob Bornecrantz2010-06-011-13/+4Star
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | | drm/vmwgfx: Don't use SVGA_REG_ENABLE in modesetting code.Jakob Bornecrantz2010-06-012-9/+0Star
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not use SVGA_REG_ENABLE anywhere but in the fifo setup code, since it controls whether the device is active. Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | | drm/vmwgfx: Remove duplicate member from struct vmw_legacy_display_unit.Jakob Bornecrantz2010-06-011-4/+2Star
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | | drm/vmwgfx: Reserve first part of VRAM for framebuffer.Thomas Hellstrom2010-06-011-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The host may be touching this part of VRAM at modesetting, even if we never use it ourselves, since we blit screen updates from 3D surfaces. Make sure no DMA buffers are placed in this part of VRAM. V2: Fix an error check in vmw_surface_dmabuf_pin(). Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | | drm/vmwgfx: Support older hardware.Jakob Bornecrantz2010-06-016-107/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | V2: Fix a couple of typos. Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | | drm/vmwgfx: Get connector status from detection function.Jakob Bornecrantz2010-06-011-7/+3Star
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make sure the ldu::active member is properly initialized. Part of fix by Michel Daenzer <daenzer@vmware.com>. Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Michel Daenzer <daenzer@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | | drm/vmwgfx: Add kernel throttling support. Bump minor.Thomas Hellstrom2010-06-016-6/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The throttle_us member in the execbuf argument is now honored. If the member is 0, no waiting for lag will occur, which guarantees backwards compatibility with well-behaved clients. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | | drm/vmwgfx: Make sure to unpin old and pin new framebuffer.Jakob Bornecrantz2010-06-011-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | | drm/vmwgfx: Fix single framebuffer detection.Jakob Bornecrantz2010-06-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | V2: Fix a typo. Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | | drm/vmwgfx: Assume larger framebuffer max size.Jakob Bornecrantz2010-06-011-2/+3
| |/ / | | | | | | | | | | | | | | | Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* | | drm/ttm: Fix ttm_page_alloc.cThomas Hellstrom2010-06-011-26/+36
| | | | | | | | | | | | | | | | | | | | | | | | Fix a number of typos misspellings and checkpatch.pl warnings. Replace "[ttm] " with TTM_PFX Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* | | drm/ttm: Fix cached TTM page allocation.Thomas Hellstrom2010-06-011-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | This patch fixes a regression introduced with the pool page allocator in the event that there are no highmem pages (for example x86_64), in which case cached page allocation would fail. Tested with the vmwgfx driver on a 64-bit vm. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* | drm/radeon: fix the r100/r200 ums block 0 page fixDave Airlie2010-05-281-2/+3
| | | | | | | | | | | | | | | | | | | | airlied -> brown paper bag. I blame Hi-5 or the Wiggles for lowering my IQ, move the fix inside some brackets instead of breaking everything in site. Cc: stable@kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
* | agp: amd64, fix pci reference leaksJiri Slaby2010-05-261-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | Stanse found pci reference leaks in uli_agp_init and nforce3_agp_init initialization functions. The PCI devices are bridges, so it's not critical, but still worth fixing. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
* | drm/edid: Allow non-fatal checksum errors in CEA blocksAdam Jackson2010-05-261-1/+4
| | | | | | | | | | | | | | | | | | | | Switches will try to update the topology address and not correctly fix up the checksum, so just let it slide. https://bugs.freedesktop.org/28229 Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* | drm/radeon/kms: suppress a build warning (unused variable)Stefan Richter2010-05-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | At least 'make CONFIG_DEBUG_SECTION_MISMATCH=y' causes drivers/gpu/drm/radeon/atombios_crtc.c: In function 'atombios_crtc_set_pll': drivers/gpu/drm/radeon/atombios_crtc.c:684: warning: 'pll' may be used uninitialized in this function which has the looks of a falso positive. Add a default: case so that gcc rests assured that all possible pll_id's are covered. Keep the present cases that fall through to the default one for self-documentation. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* | drm: Fixes linux-next & linux-2.6 checkstack warnings:Prarit Bhargava2010-05-242-3/+18
| | | | | | | | | | | | | | | | | | | | drivers/gpu/drm/nouveau/nv40_graph.c: In function `nv40_graph_init': drivers/gpu/drm/nouveau/nv40_graph.c:400: warning: the frame size of 1184 bytes is larger than 1024 bytes drivers/gpu/drm/radeon/radeon_atombios.c: In function `radeon_get_atom_connector_info_from_supported_devices_table': drivers/gpu/drm/radeon/radeon_atombios.c:857: warning: the frame size of 1872 bytes is larger than 1024 bytes Signed-off-by: Prarit Bhargava <prarit@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* | nouveau: fix acpi_lid_open undefinedRandy Dunlap2010-05-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | When CONFIG_ACPI_BUTTON=m (and probably when ACPI_BUTTON is not enabled) and NOUVEAU is built-in (not as a loadable module): nouveau_connector.c:(.text+0xe17ce): undefined reference to `acpi_lid_open' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* | drm/radeon/kms: release AGP bridge at suspendJerome Glisse2010-05-243-0/+8
| | | | | | | | | | | | | | | | | | | | I think it's good to release the AGP bridge at suspend and reacquire it at resume. Also fix : https://bugzilla.kernel.org/show_bug.cgi?id=15969 Signed-off-by: Jerome Glisse <jglisse@redhat.com> Cc: stable <stable@kernel.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
* | drm/radeon/kms/pm/r600: select the mid clock mode for single head low profileAlex Deucher2010-05-211-1/+1
| | | | | | | | | | | | | | This saves some more power at the expense of performance. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>