~ubuntu-branches/ubuntu/raring/xserver-xorg-video-nouveau/raring

Committer: Bazaar Package Importer
Author(s): Christopher James Halse Rogers
Date: 2009-07-08 08:31:59 UTC
mfrom: (1.1.6 upstream)
Revision ID: james.westby@ubuntu.com-20090708083159-43u08h03oku0d1h1

Tags: 1:0.0.10~git+20090708+ef3a386-0ubuntu1

* New upstream snapshot
+ Too many git commits to usefully list in changelog. Lots of fixes,
especially for nv5x and nv6x chips.

files added:
src/nouveau_ms.h

src/nouveau_wfb.c

files removed:
src/nv_dac.c

src/nv_hw.c

src/nv_pcicompat.h

files modified:
aclocal.m4

config.guess

config.sub

configure

configure.ac

debian/changelog

ltmain.sh

man/nouveau.man

snapshot-date

src/Makefile.am

src/Makefile.in

src/drmmode_display.c

src/nouveau_bios.h

src/nouveau_calc.c

src/nouveau_crtc.h

src/nouveau_dri2.c

src/nouveau_exa.c

src/nouveau_hw.c

src/nouveau_hw.h

src/nouveau_local.h

src/nouveau_xv.c

src/nv04_xv_ovl.c

src/nv10_xv_ovl.c

src/nv30_exa.c

src/nv30_xv_tex.c

src/nv40_exa.c

src/nv40_xv_tex.c

src/nv50_connector.c

src/nv50_crtc.c

src/nv50_exa.c

src/nv50_output.c

src/nv50_randr.c

src/nv50_sor.c

src/nv50_texture.h

src/nv50_xv.c

src/nv_bios.c

src/nv_const.h

src/nv_crtc.c

src/nv_cursor.c

src/nv_dma.c

src/nv_dri.c

src/nv_driver.c

src/nv_i2c.c

src/nv_include.h

src/nv_output.c

src/nv_proto.h

src/nv_setup.c

src/nv_type.h

src/nvreg.h

Show diffs side-by-side

added added

removed removed

src/nv30_exa.c

665

rankine = pNv->Nv3D;

666

667

if (!pNv->shader_mem) {

668

if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,

669

0, 0x1000, &pNv->shader_mem)) {

668

if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN |

669

NOUVEAU_BO_MAP, 0, 0x1000,

670

&pNv->shader_mem)) {

670

671

xf86DrvMsg(pScrn->scrnIndex, X_ERROR,

671

672

"Couldn't alloc fragprog buffer!\n");

672

673

nouveau_grobj_free(&pNv->Nv3D);

Older »