Nouveau - Jun 2014 - [Mesa-dev] [PATCH v3 1/4] nvc0/ir: clear subop when folding constant expressions

Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
writes:
> Some operations (e.g. OP_MUL/OP_MAD/OP_EXTBF might have a subop set.
> After folding, make sure that it is cleared
>
> Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann at
mni.thm.de>
> Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>

Hi Tobias and Ilia,

This patch isn't picking cleanly over to the 10.1 branch.

Can you give me some guidance here? Either of the following replies
would be great:

	Don't worry about this for 10.1 because...

	Here's a backported patch for 10.1...

Thanks!

-Carl

-- 
carl.d.worth at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL:
<http://lists.freedesktop.org/archives/nouveau/attachments/20140623/060f9933/attachment.sig>

On Mon, Jun 23, 2014 at 7:25 PM, Carl Worth <cworth at cworth.org>
wrote:
> Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de> writes:
>> Some operations (e.g. OP_MUL/OP_MAD/OP_EXTBF might have a subop set.
>> After folding, make sure that it is cleared
>>
>> Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann at
mni.thm.de>
>> Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
> Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
>
> Hi Tobias and Ilia,
>
> This patch isn't picking cleanly over to the 10.1 branch.
>
> Can you give me some guidance here? Either of the following replies
> would be great:
>
>         Don't worry about this for 10.1 because...
>
>         Here's a backported patch for 10.1...
Here's a backported patch for 10.1...

  -ilia
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-nv50-ir-clear-subop-when-folding-constant-expression.patch
Type: text/x-patch
Size: 1057 bytes
Desc: not available
URL:
<http://lists.freedesktop.org/archives/nouveau/attachments/20140623/e5db344f/attachment-0001.bin>

Ilia Mirkin <imirkin at alum.mit.edu> writes:
> Here's a backported patch for 10.1...
Thanks, Ilia!

Comparing that patch to the original, I'm fairly embarrassed that I
didn't come up with that myself.

It's one of those cases where a tiny bit of altered context made the git
conflict display look quite excessive.

-Carl

-- 
carl.d.worth at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL:
<http://lists.freedesktop.org/archives/nouveau/attachments/20140624/15d62329/attachment.sig>