17 Dec, 2009
2 commits
-
* 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/vmwgfx: Add DRM driver for VMware Virtual GPU
drm/vmwgfx: Add svga headers for vmwgfx driver
drm/ttm: Add more driver type enums -
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: fix r100->r500 CS checker for compressed textures. (v2)
drm/radeon/kms: allow for texture tiling
drm/radeon/kms: init pm on all chipsets
drm/radeon/kms: HDMI support for R600 KMS
drm/radeon/kms: make sure mc is initialized before mapping blit bo
drm/radeon/kms: Return to userspace on ERESTARTSYS
drm/radeon/gem: don't leak a gem object if reserve fails on get tiling (v2)
drm/radeon/kms: don't report allocate failure on ERESTARTSYS
drm/radeon/kms: Check if bo we got from ttm are radeon object or not
drm/radeon/kms: If no placement is supplied fallback to system
drm/ttm: Fix memory type manager debug information printing
drm/ttm: Fix printk format & compute bo->mem.size at bo initialization
drm/ttm: Fix potential ttm_mem_evict_first races.
drm/ttm: Delayed delete fixes.
drm/ttm: fix two bugs in new placement routines.
drm/ttm: fix incorrect logic in ttm_bo_io path
drm/nouveau: remove use of -ERESTART
nouveau: Fix endianness with new context program loader
drm/nouveau: fix build with CONFIG_AGP=n
drm/nouveau: fix ch7006 build
16 Dec, 2009
18 commits
-
This adds support for compressed textures to the r100->r500 CS
checker, it lets me run openarena and the demos in mesa fine.Thanks to Maciej Cencora for initial comments.
Changes since v1:
fix calculations with Maciej formulasReviewed-by: Maciej Cencora
Signed-off-by: Dave Airlie -
This adds the relocations for texture tiling for KMS.
Signed-off-by: Maciej Cencora
Signed-off-by: Dave Airlie -
* korg/drm-radeon-next:
drm/radeon/kms: init pm on all chipsets -
Signed-off-by: Rafał Miłecki
Signed-off-by: Dave Airlie -
* 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next:
drm/nouveau: remove use of -ERESTART
nouveau: Fix endianness with new context program loader
drm/nouveau: fix build with CONFIG_AGP=n
drm/nouveau: fix ch7006 build -
Adding basic HDMI support for R600 KMS, ported from radeonhd ddx.
[airlied:- checkpatch cleanups]
Signed-off-by: Christian Koenig
Signed-off-by: Dave Airlie -
We need to make sure the the MC is intialized before we map the
blit shader object on r6xx+.Signed-off-by: Alex Deucher
Signed-off-by: Dave Airlie -
radeon_object.h wasn't converted to ERESTARTSYS change. No
each time we got an ERESTARTSYS we return to userspace (ie
we were interrupted by a signal and we let the userspace
reschedule the ioctl).Signed-off-by: Jerome Glisse
Signed-off-by: Dave Airlie -
Not sure it ever happens in practice, spotted during code review.
spare brace snuck in
Signed-off-by: Dave Airlie
-
if we fail with ERESTARTSYS during alloc, we'll get a retry from
userspace so don't report it in dmesg.Signed-off-by: Dave Airlie
-
If they are not radeon object don't do anythings special for them,
this avoid rare oops than can happen in a complex use case.[airlied: additional fixups]
Signed-off-by: Jerome Glisse
Signed-off-by: Dave Airlie -
Do as we did before rework, if no placement is supplied at bo
creation time, fallback to allocating bo from system ram. This
will fix most of the creation failed issue report we got since
the rework get merged.Signed-off-by: Jerome Glisse
Signed-off-by: Dave Airlie -
System memory type doesn't have a drm_mm manager associated to
it. This patch avoid trying to call drm_mm_debug on unitialized
drm_mm when printing debug info on the system memory manager.Signed-off-by: Jerome Glisse
Signed-off-by: Dave Airlie -
Signed-off-by: Jerome Glisse
Signed-off-by: Dave Airlie -
1) The function was previously called with a potentially empty
LRU list which would have lead to an OOPS or servere corruption.
2) In rare cases, after reservation has succeeded, another process may
already have evicted it or even pinned it. We must revalidate the
buffer status after releasing the lru lock.Signed-off-by: Thomas Hellstrom
Signed-off-by: Dave Airlie -
1) Remove from lru before reserving so we avoid competing with
evicting processes.
2) Avoid calling kref_put() on bo::list_kref while spinlocked.
3) Additional refcounting bug-checking.Signed-off-by: Thomas Hellstrom
Signed-off-by: Dave Airlie -
a) the loops were going to
Signed-off-by: Dave Airlie -
This path isn't used by radeon yet, but future drivers will want it,
so fix it right.Reported-by: Luca Barbieri
Signed-off-by: Dave Airlie
15 Dec, 2009
6 commits
-
Signed-off-by: Ben Skeggs
-
When switching to request_firmware() to load the context programs,
some endian fixes need to be applied. This makes it work again on
my quad g5 nvidia 6600.Signed-off-by: Benjamin Herrenschmidt
Signed-off-by: Ben Skeggs -
Signed-off-by: Ben Skeggs
-
The ch7006 driver could be built even when nouveau was not enabled,
but the build fails in that case, so make it depend on DRM_NOUVEUA.Also make the I2c encoder/helper chips menu depend on I2C (no build
error, just visual inspection).ERROR: "drm_helper_probe_single_connector_modes" [drivers/gpu/drm/i2c/ch7006.ko] undefined!
Signed-off-by: Randy Dunlap
Signed-off-by: Ben Skeggs -
This commit adds the vmwgfx driver for the VWware Virtual GPU aka SVGA.
The driver is under staging the same as Nouveau and Radeon KMS. Hopefully
the 2D ioctls are bug free and don't need changing, so that part of the
API should be stable. But there there is a pretty big chance that the 3D API
will change in the future.Signed-off-by: Thomas Hellström
Signed-off-by: Jakob Bornecrantz
Signed-off-by: Dave Airlie -
These headers are shared between multiple place where
different coding standards apply. They will be fixed
up at a later time.Signed-off-by: Thomas Hellström
Signed-off-by: Jakob Bornecrantz
Signed-off-by: Dave Airlie
12 Dec, 2009
2 commits
-
* 'drm-nouveau-pony' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/nouveau: Add DRM driver for NVIDIA GPUs -
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/ttm: export some functions useful to drivers using ttm
drm/radeon/kms/avivo: fix typo in new_pll module description
drm/radeon/kms: Convert radeon to new ttm_bo_init
drm/ttm: Convert ttm_buffer_object_init to use ttm_placement
11 Dec, 2009
6 commits
-
This adds a drm/kms staging non-API stable driver for GPUs from NVIDIA.
This driver is a KMS-based driver and requires a compatible nouveau
userspace libdrm and nouveau X.org driver.This driver requires firmware files not available in this kernel tree,
interested parties can find them via the nouveau project git archive.This driver is reverse engineered, and is in no way supported by nVidia.
Support for nearly the complete range of nvidia hw from nv04->g80 (nv50)
is available, and the kms driver should support driving nearly all
output types (displayport is under development still) along with supporting
suspend/resume.This work is all from the upstream nouveau project found at
nouveau.freedesktop.org.The original authors list from nouveau git tree is:
Anssi Hannula
Ben Skeggs
Francisco Jerez
Maarten Maathuis
Marcin Kościelnicki
Matthew Garrett
Matt Parnell
Patrice Mandin
Pekka Paalanen
Xavier Chantry
along with project founder Stephane MarchesinSigned-off-by: Ben Skeggs
Signed-off-by: Dave Airlie -
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (189 commits)
drm/radeon/kms: fix warning about cur_placement being uninitialised.
drm/ttm: Print debug information on memory manager when eviction fails
drm: Add memory manager debug function
drm/radeon/kms: restore surface registers on resume.
drm/radeon/kms/r600/r700: fallback gracefully on ucode failure
drm/ttm: Initialize eviction placement in case the driver callback doesn't
drm/radeon/kms: cleanup structure and module if initialization fails
drm/radeon/kms: actualy set the eviction placements we choose
drm/radeon/kms: Fix NULL ptr dereference
drm/radeon/kms/avivo: add support for new pll selection algo
drm/radeon/kms/avivo: fix some bugs in the display bandwidth setup
drm/radeon/kms: fix return value from fence function.
drm/radeon: Remove tests for -ERESTART from the TTM code.
drm/ttm: Have the TTM code return -ERESTARTSYS instead of -ERESTART.
drm/radeon/kms: Convert radeon to new TTM validation API (V2)
drm/ttm: Rework validation & memory space allocation (V3)
drm: Add search/get functions to get a block in a specific range
drm/radeon/kms: fix avivo tiling regression since radeon object rework
drm/i915: Remove a debugging printk from hangcheck
drm/radeon/kms: make sure i2c id matches
... -
These are functions required by nouveau which will be merged later.
Signed-off-by: Ben Skeggs
Signed-off-by: Dave Airlie -
Signed-off-by: Alex Deucher
Signed-off-by: Dave Airlie -
Now bo init use placement structure like bo validation does.
Signed-off-by: Jerome Glisse
Signed-off-by: Dave Airlie -
Convert ttm_buffer_object_init to use struct ttm_placement and
rename to ttm_bo_init for consistency with function naming. This
allow to give more complex placement at buffer creation. For
instance you ask to allocate bo into vram first but if there is
not enough vram you can give system as a second possible
placement. It also allow to create buffer in a specific range.Also rename ttm_buffer_object_validate to ttm_bo_validate.
Signed-off-by: Jerome Glisse
Signed-off-by: Dave Airlie
10 Dec, 2009
6 commits
-
Signed-off-by: Dave Airlie
-
This merges some TTM overhauls to allow us to do better object placement
for certain radeon GPUs that need scanout+cursor within range of each other,
along with an API change to not return ERESTART to userspace, but to use
ERESTARTSYS properly internally and have it convert to EINTR and catch that
correctly. Also lots of radeon fixes across the board. -
Pull more Intel changes in, especially one to init the GTT properly
-
This add helper function to print information on eviction placements
and memory manager status when eviction fails to allocate memory
space.Signed-off-by: Jerome Glisse
Signed-off-by: Dave Airlie -
drm_mm_debug_table will print the memory manager state
in table allowing to give a snapshot of the manager at
given point in time. Usefull for debugging.Signed-off-by: Jerome Glisse
Signed-off-by: Dave Airlie -
On resume on my rv530 laptop surface cntl was left disabled, so
wierd stuff would happen with rendering to a tiled front buffer.This checks if the surface regs are assigned to bos and reprograms
the surface registers on resume using the same path that clears
them all on init.Signed-off-by: Dave Airlie