Comment 158 for bug 304871

(In reply to comment #26)
> Eric had some half-finished patches for this which I finished and pushed (see
> below).

Here's the "see below" part I forgot to add with the last comment.

-Carl

commit 8e942b70cb9a784b3f1311affd6fc74c4bcf68bb
Author: Carl Worth <email address hidden>
Date: Thu May 21 13:12:52 2009 -0700

    Revert "Rely on BO pixmaps being present in acceleration paths."

    This reverts commit 4653a7db622ad54a3182d93c81331765d930db34.

    Eric was getting a little too ambitious about our brave, new world.
    We do still want the driver to work with old, non-GEM kernels
    after all.

commit 1a039f4371bec455cad43f0fb7b329f2ee09a974
Author: Eric Anholt <email address hidden>
Date: Mon Apr 27 17:45:02 2009 -0700

    Fold GEM detection into DRM master open.

    We don't have anything to do with the DRM unless it's GEM-enabled, unless
    we were to support GEM-but-not-DRI2, which doesn't seem useful.

    Compilation fixes by Carl Worth <email address hidden>

commit a04a51c9bb6066454e0fda3c7897f97dab436358
Author: Eric Anholt <email address hidden>
Date: Mon Apr 27 17:29:36 2009 -0700

    Open the DRM and keep the handle throughout server startup to finish.

    This will let us configure the server from start to finish with the
    most pertinent information available (KMS vs UMS, DRI2 vs non-DRI). Also,
    we now close the DRI2 fd at terminate, which we didn't before.

    This duplicates some code from DRI1 for getting a master FD like I'd done in
    DRI2, but given that we weren't loading DRI1 ourselves, this is also a
    bogosity cleanup, and avoids allocating the extra DRI1 private.