Bug#679566: backport nouveau features from 3.4

[Sven Joachim <svenjoac@gmx.de>]

severity 679566 serious
thanks

On 2012-06-29 21:51 +0200, Sven Joachim wrote:

> Package: linux
> Version: 3.2.21-3
> Tags: patch
>
> Turning this feature request into a bug report.  Note that it blocks
> #679557 which I have just filed at RC severity.

Ping?  Note that while #679557 may seem to only affect unstable, we
really need this version of xserver-xorg-video-nouveau to go into wheezy
unless somebody comes up with a fix for #666468 -- and I don't expect
that to happen anytime soon.

Hence, upgrading the severity of this bug report to the same as #679557.

Cheers,
       Sven

> On 2012-06-16 14:16 +0200, Sven Joachim wrote:
>
>> On 2012-06-04 20:42 +0200, Julien Cristau wrote:
>> 
>>> We'll probably also need some nouveau updates to (at least) update to
>>> the 1.0.0 ABI,
>>
>> See commit ace77b6b1304 in xserver-xorg-video-nouveau for the reason:
>>
>> commit ace77b6b1304826f4004bde23809b55d476b0615
>> Author: Ben Skeggs <bskeggs@redhat.com>
>> Date:   Tue May 29 21:21:57 2012 +1000
>>
>>     disable fermi accel on 0.0.16 interface
>>     
>>     Kepler accel support broke some assumption made by the older kernel
>>     interface, and Fermi shares the same code.  It can't work (without
>>     some annoying hacks anyway) with the 0.0.16 kernel anymore.
>>
>> diff --git a/src/nv_dma.c b/src/nv_dma.c
>> index 3b75ca9..1757f4d 100644
>> --- a/src/nv_dma.c
>> +++ b/src/nv_dma.c
>> @@ -36,6 +36,12 @@ NVInitDma(ScrnInfoPtr pScrn)
>>  	int size, ret;
>>  	void *data;
>>  
>> +	if (pNv->dev->drm_version < 0x01000000 && pNv->dev->chipset >= 0xc0) {
>> +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
>> +			   "Fermi acceleration not supported on old kernel\n");
>> +		return FALSE;
>> +	}
>> +
>>  	if (pNv->Architecture < NV_ARCH_C0) {
>>  		data = &nv04_data;
>>  		size = sizeof(nv04_data);
>>
>>> I haven't had time to look at this at all, but I think
>>> Maarten had a backport at
>>> http://people.canonical.com/~mlankhorst/drm-abi-patches.tgz
>>
>> Note that this is actually an uncompressed tar archive.
>
> Attached is a compressed version of it.