summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix hardcoding of nvc0 wfb pathnvc0Ben Skeggs2011-01-171-4/+4
|
* general tidy-ups in preparation for merge to masterBen Skeggs2011-01-173-36/+20
|
* Merge branch 'master' into nvc0Ben Skeggs2011-01-173-9/+21
|\
| * nv50: fix pitch of linear scanout buffersBen Skeggs2011-01-071-7/+20
| | | | | | | | | | | | Un-breaks NoAccel on these chipsets. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * nv04/exa: kill useless WAIT_RINGXavier Chantry2010-12-251-2/+0
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * add back generic include of nouveau_pushbuf.hBen Skeggs2010-12-211-0/+1
| | | | | | | | | | | | So places that FIRE_RING() still work. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
* | nvc0: switch to "standard" RING macrosBen Skeggs2010-12-207-214/+212
| |
* | Merge branch 'master' into nvc0Ben Skeggs2010-12-2019-49/+32
|\ \ | |/ | | | | | | Conflicts: src/nv_dma.c
| * include nv04_pushbuf.h for ring macros, rather than nouveau_pushbuf.hBen Skeggs2010-12-2016-1/+20
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * kill NVSync(), it's rather uselessBen Skeggs2010-12-203-24/+0
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * nv50/xv: use mad in nv12 shader, rather than mul+addBen Skeggs2010-12-161-15/+12
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
* | nvc0/xv: use mad in nv12 shader, rather than mul+addBen Skeggs2010-12-171-25/+12
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
* | nvc0: fix offset of 17bc bufferChristoph Bumiller2010-12-161-1/+1
| | | | | | | | I had messed it up in 5e4da3451c3c0f645f98fea7fb0ce2629b1bfd2f.
* | nvc0/xv: bind textures for the FP, not the TEPChristoph Bumiller2010-12-161-2/+2
| |
* | nvc0: switch to rnn headersChristoph Bumiller2010-12-1612-1107/+1848
| |
* | nvc0/exa: fix m2mf dfsBen Skeggs2010-12-151-0/+1
| |
* | nvc0: add Xv implementationBen Skeggs2010-12-156-51/+521
| |
* | Merge branch 'master' into nvc0Ben Skeggs2010-12-157-61/+207
|\ \ | |/
| * set canDoBGNoneRoot if building against new enough serverBen Skeggs2010-12-142-21/+20
| |
| * nv50/xv: implement brightness/contrast/saturation/hue controlsBen Skeggs2010-12-144-32/+159
| | | | | | | | | | | | Adapted from the code in xf86-video-ati. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * nv50/xv: kick csc parameters out into a constant bufferBen Skeggs2010-12-142-30/+50
| | | | | | | | | | | | | | These were previously inlined into the shader, which is simple, but makes implementing brightness/contrast adjustments impossible. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
* | nvc0: call grobj_alloc for all used object classesBen Skeggs2010-12-091-14/+14
| | | | | | | | | | Though the hardware has no concept of object handles any more, the nouveau DRM still uses this call to know what engines are in use.
* | nvc0: don't try and create DmaNotifier0Ben Skeggs2010-12-091-22/+16
| |
* | nvc0: change tile_mode to contain 0xZYX instead of 0xZYChristoph Bumiller2010-12-094-12/+16
| | | | | | | | Warning: the kernel will not like that (EVO)
* | exa: don't fall back to nv04 m2mf if nvc0 m2mf failsChristoph Bumiller2010-12-091-12/+13
| |
* | nvc0/exa: remove noisy debug messagesChristoph Bumiller2010-12-091-45/+0
| |
* | nvc0/accel: remove unneeded scratch method 0x3420 initChristoph Bumiller2010-12-091-4/+0
| | | | | | | | | | It was intended be read by a MACRO method to get the address for constants upload.
* | Merge remote branch 'origin/master' into nvc0Christoph Bumiller2010-12-0922-322/+863
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/drmmode_display.c src/nouveau_exa.c src/nv_driver.c src/nv_type.h
| * dri2: fix certain clients blocking forever when sync-to-vblank unavailableBen Skeggs2010-11-301-1/+3
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * dri2: don't return failure from get_msc if sync-to-vblank isn't availableBen Skeggs2010-11-291-2/+5
| | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * dri2: Don't return failure from schedule_wait if sync-to-vblank is unavailable.Francisco Jerez2010-11-261-1/+1
| | | | | | | | | | Reported-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * Purge cvs tags.Jesse Adkins2010-10-302-4/+0
| | | | | | | | | | Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com> Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * dri2: Fix throttling on occluded drawables.Francisco Jerez2010-10-261-0/+7
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * kms: initial pass at supporting zaphod-modeBen Skeggs2010-10-255-6/+92
| | | | | | | | | | | | | | This works ok from some simple testing, there's undoubtedly things that will need polishing still however. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * dri2: Fix build on X server 1.8.Francisco Jerez2010-10-241-6/+6
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * Bump the required X server version to 1.8.Francisco Jerez2010-10-221-1/+1
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * dri2: Report damage on page-flipped drawables.Francisco Jerez2010-10-221-0/+2
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * Make the sync-to-vblank helpers take a box as argument.Francisco Jerez2010-10-228-26/+22
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * dri2: Implement the ScheduleWaitMSC/GetMSC hooks.Francisco Jerez2010-10-221-1/+69
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * dri2: Add pageflip/exchange support.Francisco Jerez2010-10-226-7/+104
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * Allocate a tiled scanout on pre-nv50 too.Francisco Jerez2010-10-221-5/+5
| | | | | | | | | | | | Pageflip between tiled and non-tiled surfaces isn't such a good idea. Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * dri2: Give out buffers ready for scanout.Francisco Jerez2010-10-221-0/+2
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * Restructure tiled pixmap allocation in a single place.Francisco Jerez2010-10-226-116/+104
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * dri2: Add sync-to-vblank support.Francisco Jerez2010-10-227-8/+202
| | | | | | | | | | | | | | Note that you need a recent enough kernel for it to work. Use the "GLXVBlank" option to enable it (it defaults to disabled for now). Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * nv04-nv40/exa: Make the copy hook blit downwards for non-overlapping regions.Francisco Jerez2010-10-211-0/+35
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * Make the sync-to-vblank helpers more consistent.Francisco Jerez2010-10-218-88/+71
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * kms: Register a wakeup handler to poll vblank/pageflip/udev events.Francisco Jerez2010-10-213-23/+65
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * Update to the last libdrm API.Francisco Jerez2010-10-125-10/+20
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * nv10-nv40/exa: Fix tiled pixmap pitch alignment calculation.Francisco Jerez2010-10-102-2/+8
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| * Fix for the last xserver ABI.Francisco Jerez2010-10-101-0/+2
| | | | | | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>