[git pull] 1.14 gpu fixes backport

[Dave Airlie]

On Tue, Jul 23, 2013 at 10:28 AM, Sérgio Basto <sergio at serjux.com> wrote:
> On Ter, 2013-07-23 at 10:00 +1000, Dave Airlie wrote:
>> On Tue, Jul 23, 2013 at 9:56 AM, Peter Hutterer
>> <peter.hutterer at who-t.net> wrote:
>> > On Thu, Jul 18, 2013 at 02:24:30AM +0100, Sérgio Basto wrote:
>> >> On Ter, 2013-07-16 at 11:56 -0600, Matt Dew wrote:
>> >> > On 07/13/2013 05:10 AM, Sérgio Basto wrote:
>> >> > > On Sex, 2013-07-12 at 11:36 +1000, Dave Airlie wrote:
>> >> > >> Hi Matt,
>> >> > >>
>> >> > >> all backports from master, all shipped in Fedora, all making Peter
>> >> > >> angry because he had to rebase
>> >> > >> them.
>> >> > >
>> >> > > Hi,
>> >> > > with Fedora 19, we have a mass test of 1.14, so some bugs was found we
>> >> > > have other 2 patches floating around .
>> >> > > https://bugzilla.redhat.com/show_bug.cgi?id=976995
>> >> > > with patch
>> >> > > https://bugzilla.redhat.com/attachment.cgi?id=772539
>> >> > >
>> >> > > https://bugs.freedesktop.org/show_bug.cgi?id=66851
>> >> > > with patch
>> >> > > https://bugs.freedesktop.org/attachment.cgi?id=82364
>> >> > >
>> >> > > both seems easy patches ,
>> >> > >
>> >> > >
>> >> >
>> >> >
>> >> > Does anyone have these in a branch I can either pull or cherry-pick?
>> >>
>> >> Hi, trying to help here ,
>> >> I follow the bugs of xorg-x11-server on F19
>> >> https://bugzilla.redhat.com/buglist.cgi?component=xorg-x11-server&list_id=1540048&product=Fedora
>> >>
>> >> and what is upstream source:
>> >> http://cgit.freedesktop.org/xorg/xserver/?h=server-1.14-branch
>> >>
>> >> I'm following this, since release 3 with VirtualBox fix (upstreamed):
>> >> https://admin.fedoraproject.org/updates/FEDORA-2013-12681/xorg-x11-server-1.14.2-3.fc19
>> >
>> > waiting in a pull request, will be upstream soon.
>> >
>> >> next on release 4, Dave patch (upstreamed)
>> >> https://admin.fedoraproject.org/updates/FEDORA-2013-12886/xorg-x11-server-1.14.2-4.fc19
>> >
>> > punted to dave.
>> >
>> >> and now release 5, other fixes
>> >> https://admin.fedoraproject.org/updates/FEDORA-2013-12995/xorg-x11-server-1.14.2-5.fc19
>> >
>> > these will be merged to 1.14 asap
>> >
>> >> Now it seems that almost all bugs are fixed, but still left this 2
>> >> patches, one in https://bugzilla.redhat.com/show_bug.cgi?id=976995
>> >
>> > first half is I think the same as -4 above, punted to dave.
>> > Xephyr flag which is 1.15.
>> >
>> >> reporter says that still need it, easy to see that don't harm , so I
>> >> think that Dave could decide and upstream it (or not). Same for other
>> >> patch which is in https://bugs.freedesktop.org/show_bug.cgi?id=66851
>> >
>>
>> I don't think that'll ever be 1.14 material, I've no way to know what
>> regressions it'll cause at this point,
>>
>> Validating changes like that that seem simple is really messy to get
>> done, so I tend to bail on the side of assuming they'll break
>> everything.
>>
>> Is that patch posted to the list for master?
>
> Good question, I don't know.
>
>> I'm not really in a
>> position to work on the server at the moment.
>
> Hi,
> just to clarify, my email is about 2 mini patches:
> Patch 1 - https://bugzilla.redhat.com/attachment.cgi?id=772539
>
> - formats[i].visual_class = visual_info->class;
> -        XFree(visual_info);
> + if (visual_info) {
> +            formats[i].visual_class = visual_info->class;
> +            XFree(visual_info);
> +        }
>
> On RedHat bugzilla [1], Alphonse Steiner wrote: "This problem is related
> to Xephyr. The function 'XGetVisualInfo' returns a NULL pointer, leading
> to the segfault"

yeah that one is probably fine,

>
> Patch 2 - https://bugs.freedesktop.org/attachment.cgi?id=82364
>
> - if (ServerIsNotSeat0())
> +    if (ServerIsNotSeat0() && foundScreen)
> and
> -    if (ServerIsNotSeat0())
> +    if (ServerIsNotSeat0() && xf86_num_platform_devices > 0)

this one looks simple, but looks can be deceiving, and I've gotten bitten
by applying patches in this area without through testing on a few platforms!

Dave.