[Mesa-stable] [Mesa-dev] [PATCH] egl/x11: authenticate before doing chipset id ioctls

[Emil Velikov]

On 26 April 2016 at 11:26, Mark Kettenis <mark.kettenis at xs4all.nl> wrote:
>> From: Matt Turner <mattst88 at gmail.com>
>> Date: Mon, 25 Apr 2016 14:37:56 -0700
>>
>> On Tue, Apr 19, 2016 at 10:48 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>> > On 19 April 2016 at 03:29, Jonathan Gray <jsg at jsg.id.au> wrote:
>> >> For systems without udev or sysfs that use drm ioctls in the loader
>> >> drm authentication must take place earlier or the loader will fail
>> >> "MESA-LOADER: failed to get param for i915".
>> >>
>> >> Patch from Mark Kettenis.
>> >>
>> >> Cc: "11.2 11.1" <mesa-stable at lists.freedesktop.org>
>> >> Signed-off-by: Mark Kettenis <kettenis at openbsd.org>
>> >> Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
>> > Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
>> >
>> > I'll push this by end of tomorrow, unless we hear any objections.
>>
>> This patch added the following warning:
>>
>> ../../../mesa/src/egl/drivers/dri2/platform_x11.c:1140:4: warning:
>> initialization from incompatible pointer type
>>     .authenticate = dri2_x11_authenticate,
>>     ^
>> ../../../mesa/src/egl/drivers/dri2/platform_x11.c:1140:4: warning:
>> (near initialization for ‘dri2_x11_display_vtbl.authenticate’)
>>
>> I presume because the first parameter's type changed.
>
> Ouch.  Completely missed that that function was used in the vtbl.  How
> does the fix below look?
>
It looks/works like a charm.

For the future please send git format-patch/send-email formatted ones.
It makes things a bit easier to apply.

Thanks
Emil