aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-02-25drm/nouveau: support version 0x20 displayport tablesBen Skeggs1-1/+1
Not entirely identical to 0x21, the per-encoder table header lacks the third init table pointer. However, our current parsing of the table should work just fine. Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: Fix noaccel/nofbaccel option descriptions.Marcin Kościelnicki1-2/+2
Signed-off-by: Marcin Kościelnicki <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nv50: Implement ctxprog/state generation.Marcin Kościelnicki4-33/+2411
This removes dependence on external firmware for NV50 generation cards. If the generated ctxprogs don't work for you for some reason, please report it. Signed-off-by: Marcin Kościelnicki <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: use dcb connector types throughout the driverBen Skeggs1-32/+41
Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nv50: enable hpd on any connector we know the gpio line forBen Skeggs1-3/+1
Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: use dcb connector table for creating drm connectorsBen Skeggs4-115/+62
This makes this code common to both the nv04 and nv50 paths. For the moment, we keep the previous behaviour with HDMI/eDP connectors and report them as DVI-D/DP instead. This will be fixed once the rest of the code has been fixed to deal with those types. Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: construct a connector table for cards that lack a real oneBen Skeggs1-13/+16
Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: check for known dcb connector typesBen Skeggs2-0/+62
Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: parse dcb gpio/connector tables after encodersBen Skeggs1-4/+6
Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: reorganise bios header, add dcb connector type enumsBen Skeggs3-44/+63
Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: merge nvbios and nouveau_bios_infoBen Skeggs15-81/+73
Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: merge parsed_dcb and bios_parsed_dcb into dcb_tableBen Skeggs6-95/+85
Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: rename parsed_dcb_gpio to dcb_gpio_tableBen Skeggs2-3/+3
Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: allow retrieval of vbios image from debugfsBen Skeggs1-0/+13
It's very useful to be able to access this without additional tools for debugging purposes. Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: fix missing spin_unlock in failure pathLuca Barbieri1-1/+1
Found by sparse. Signed-off-by: Luca Barbieri <[email protected]> Signed-off-by: Francisco Jerez <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: fix i2ctable bounds checkingMarcin Slusarz1-3/+4
i2c_entries seems to be the number of i2c entries, so with index equal to this number, we could read invalid data from i2ctable. Fix it. Signed-off-by: Marcin Slusarz <[email protected]> Signed-off-by: Francisco Jerez <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: fix nouveau_i2c_find bounds checkingMarcin Slusarz1-1/+1
Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Marcin Slusarz <[email protected]> Signed-off-by: Francisco Jerez <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: fix pramdac_table range checkingMarcin Slusarz1-1/+1
get_tmds_index_reg reads some value from stack when mlv happens to be equal to size of pramdac_table array. Fix it. Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Marcin Slusarz <[email protected]> Signed-off-by: Francisco Jerez <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: new gem pushbuf interface, bump to 0.0.16Ben Skeggs7-404/+208
This commit breaks the userspace interface, and requires a new libdrm for nouveau to operate again. The multiple GEM_PUSHBUF ioctls that were present in 0.0.15 for compatibility purposes are now gone, and replaced with the new ioctl which allows for multiple push buffers to be submitted (necessary for hw index buffers in the nv50 3d driver) and relocations to be applied on any buffer. A number of other ioctls (CARD_INIT, GEM_PIN, GEM_UNPIN) that were needed for userspace modesetting have also been removed. Signed-off-by: Ben Skeggs <[email protected]> Signed-off-by: Francisco Jerez <[email protected]>
2010-02-25drm/nv50: make pushbuf dma object cover entire vmBen Skeggs2-7/+12
This allows us to submit push buffers from any memtype to the hardware. We'll need this ability for VRAM index buffers at some point. Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: remove PUSHBUF_CAL macroBen Skeggs1-6/+4
Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nv50: switch to indirect push buffer controlsBen Skeggs6-15/+155
PFIFO on G80 and up has a new mode where the main ring buffer is simply a ring of pointers to indirect buffers containing the actual command/data packets. In order to be able to implement index buffers in the 3D driver we need to be able to submit data-only push buffers right after the cmd packet header, which is only possible using the new command submission method. This commit doesn't make it possible to implement index buffers yet, some userspace interface changes will be required, but it does allow for testing/debugging of the hardware-side support in the meantime. Signed-off-by: Ben Skeggs <[email protected]>
2010-02-25drm/nouveau: protect channel create/destroy and irq handler with a spinlockMaarten Maathuis7-1/+36
The nv50 pgraph handler (for example) could reenable pgraph fifo access and that would be bad when pgraph context is being unloaded (we need the guarantee a ctxprog isn't running). Signed-off-by: Maarten Maathuis <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-23drm/nv50: fix vram ptes on IGPs to point at stolen system memoryBen Skeggs1-1/+7
Signed-off-by: Ben Skeggs <[email protected]>
2010-02-23drm/nv50: fix instmem binding on IGPs to point at stolen system memoryBen Skeggs2-18/+41
This also modifies the unused PRAMIN PT entries to be all zeroes, can't really recall why I used 9/0 initially, just that it didn't work for some reason. It was likely masking a bug elsewhere that's since been fixed. Signed-off-by: Ben Skeggs <[email protected]>
2010-02-23drm/nv50: improve vram page table constructionBen Skeggs1-11/+33
This commit changes nouveau to construct PTEs which look very much like the ones the binary driver creates. I presume that filling multiple PTEs identically with length flags and the physical address of the start of a block of VRAM is a hint to the memory controller that it need not perform additional page table lookups for that range of addresses. Signed-off-by: Ben Skeggs <[email protected]>
2010-02-23drm/nv50: more efficient clearing of gpu page table entriesBen Skeggs1-24/+44
Signed-off-by: Ben Skeggs <[email protected]>
2010-02-23drm/nv50: make nv50_mem_vm_{bind,unbind} operate only on vramBen Skeggs1-30/+13
GART is handled elsewhere, no reason to have the code for it here too. Signed-off-by: Ben Skeggs <[email protected]>
2010-02-23drm/nouveau: Fix up pre-nv17 analog load detection.Francisco Jerez1-1/+5
Signed-off-by: Francisco Jerez <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-16drm/nouveau: Force TV encoder DPMS reinit after resume.Francisco Jerez1-0/+2
Signed-off-by: Francisco Jerez <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-16drm/nouveau: use mutex for vbios lockBen Skeggs2-5/+4
Signed-off-by: Ben Skeggs <[email protected]>
2010-02-11nouveau: fix state detection with switchable graphicsMatthew Garrett1-6/+6
Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-11drm/nouveau: move dereferences after null checksMarcin Slusarz4-11/+17
Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Marcin Slusarz <[email protected]> Signed-off-by: Maarten Maathuis <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-10drm/nv50: make the pgraph irq handler loop like the pre-nv50 versionMaarten Maathuis1-64/+77
Unset the bit that indicates that a ctxprog can continue at the end. Signed-off-by: Maarten Maathuis <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-10drm/nv50: delete ramfc object after disabling fifo, not beforeMaarten Maathuis1-3/+6
ramfc is zero'ed upon destruction, so it's safer to do things in the right order. Signed-off-by: Maarten Maathuis <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-10drm/nv50: avoid unloading pgraph context when ctxprog is runningMaarten Maathuis2-7/+10
- We need to disable pgraph fifo access before checking the current channel, otherwise we could still hit a running ctxprog. - The writes to 0x400500 are already handled by pgraph->fifo_access and are therefore redundant, moreover pgraph fifo access should not be reenabled before current context is set as invalid. So remove them altogether. Signed-off-by: Maarten Maathuis <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-10drm/nv50: align size of buffer object to the right boundaries.Maarten Maathuis1-5/+5
- In the current situation the padding that is added is dangerous to write to, userspace could potentially overwrite parts of another bo. - Depth and stencil buffers are supposed to be large enough in general so the waste of memory should be acceptable. - Alternatives are hiding the padding from users or splitting vram into 2 zones. Signed-off-by: Maarten Maathuis <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-10drm/nv50: disregard dac outputs in nv50_sor_dpms()Ben Skeggs1-0/+1
Fixes DVI+VGA on my 9400, and likely a lot of other configurations that got broken by the previos DVI-over-DP fix. Signed-off-by: Ben Skeggs <[email protected]>
2010-02-10drm/nv50: prevent multiple init tables being parsed at the same timeBen Skeggs2-8/+11
With DVI and DP plugged, the DVI clock change interrupts being run can cause DP link training to fail. This adds a spinlock around init table parsing to prevent this. Signed-off-by: Ben Skeggs <[email protected]>
2010-02-09drm/nouveau: make dp auxch xfer len check for reads onlyBen Skeggs1-5/+5
Writes don't return a count, and adding the check broke native DP. Signed-off-by: Ben Skeggs <[email protected]>
2010-02-09drm/nv40: make INIT_COMPUTE_MEM a NOP, just like nv50Ben Skeggs1-1/+1
It appears we aren't required to do memory sizing ourselves on nv40 either. NV40 init tables read a strap from PEXTDEV_BOOT_0 into a CRTC register, and then later use that value to select a memory configuration (written to PFB_CFG0, just like INIT_COMPUTE_MEM on earlier cards) with INIT_IO_RESTRICT_PROG. Signed-off-by: Ben Skeggs <[email protected]>
2010-02-09drm/nouveau: Add proper vgaarb support.Marcin Kościelnicki1-0/+8
Signed-off-by: Marcin Kościelnicki <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-09drm/nouveau: Fix fbcon on mixed pre-NV50 + NV50 multicard.Marcin Kościelnicki4-12/+42
We used single shared fbops struct and patched it at fb init time with pointers to the right variant. On mixed multicard, this meant that it was either sending NV50-style commands to all cards, or NV04-style commands to all cards. Signed-off-by: Marcin Kościelnicki <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-09drivers/gpu/drm/nouveau/nouveau_grctx.c: correct NULL testJulia Lawall1-2/+2
Test the just-allocated value for NULL rather than some other value. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression x,y; statement S; @@ x = \(kmalloc\|kcalloc\|kzalloc\)(...); ( if ((x) == NULL) S | if ( - y + x == NULL) S ) // </smpl> Signed-off-by: Julia Lawall <[email protected]> Cc: David Airlie <[email protected]> Cc: Ben Skeggs <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-09drm/nouveau: call ttm_bo_wait with the bo lock held to prevent hangLuca Barbieri1-0/+2
nouveau_gem_ioctl_cpu_prep calls ttm_bo_wait without the bo lock held. ttm_bo_wait unlocks that lock, and so must be called with it held. Currently this bug causes libdrm nouveau_bo_busy() to hang the machine. Signed-off-by: Luca Barbieri <luca at luca-barbieri.com> Acked-by: Maarten Maathuis <[email protected]> Signed-off-by: Francisco Jerez <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-09drm/nouveau: Fixup semaphores on pre-nv50 cards.Francisco Jerez1-0/+14
Apparently, they generate a PFIFO interrupt each time one of the semaphore methods is executed if its ctxdma wasn't manually marked as valid. This patch makes it flip the valid bit in response to the DMA_SEMAPHORE method (which triggers the IRQ even for a valid ctxdma). Signed-off-by: Francisco Jerez <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-09drm/nouveau: Add getparam to get available PGRAPH units.Marcin Kościelnicki3-0/+11
On nv50, this will be needed by applications using CUDA to know how much stack/local memory to allocate. Signed-off-by: Marcin Kościelnicki <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-09drm/nouveau: Add module options to disable acceleration.Marcin Kościelnicki4-15/+37
noaccel=1 disables all acceleration and doesn't even attempt initialising PGRAPH+PFIFO, nofbaccel=1 only makes fbcon unaccelerated. Signed-off-by: Marcin Kościelnicki <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-02-09drm/nouveau: fix non-vram notifier blocksBen Skeggs2-4/+11
Due to a thinko, these were previously forced to VRAM even if we allocated them in GART. This commit fixes that bug, but keeps the previous behaviour of using VRAM by default until it's been tested properly across more chipsets. Signed-off-by: Ben Skeggs <[email protected]>
2010-01-25drm/nv50: prevent switching off SOR when in use for DVI-over-DPBen Skeggs1-0/+13
Another hack because of us exposing each encoder block's function as an encoder rather than exposing a single encoder that deals with them all. A proper fix will come, it's just rather invasive so this hack will do until then. Signed-off-by: Ben Skeggs <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.