[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xorg-devel
Subject:    Re: [PATCH xserver 2/2] glamor: Propagate glamor_fds_from_pixmap error in glamor_fd_from_pixmap
From:       Michel_Dänzer <michel () daenzer ! net>
Date:       2018-05-28 15:27:14
Message-ID: baa91df7-72d4-9c5e-6c19-b9bb38a3ff6f () daenzer ! net
[Download RAW message or body]

On 2018-05-23 05:57 PM, Emil Velikov wrote:
> On 23 May 2018 at 10:43, Michel Dänzer <michel@daenzer.net> wrote:
>> From: Michel Dänzer <michel.daenzer@amd.com>
>>
>> glamor_fds_from_pixmap returns 0 on error, but we were treating that as
>> success, continuing with uninitialized stride and fd values.
>>
>> Also bail if the offset isn't 0, same as in dri3_fd_from_pixmap.
>>
>> Fixes: c8c276c9569b "glamor: Implement PixmapFromBuffers and
>>                      BuffersFromPixmap"
>> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
> 
> I would suggest a one-liner as below. Smaller patch, plus is reads
> easier on my end ;-)
> 
> -    if (ret > 1) {
> +    if (ret != 1 || offsets[0] != 0) {

Thanks for the suggestion.


> Regardless, the series is on point and is
> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

Pushed both fixes (with the above incorporated), thanks!


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
[prev in list] [next in list] [prev in thread] [next in thread]