← Back to branch summary

~mir-team/mir/xf86-video-nouveau

« back to all changes in this revision

Viewing changes to src/nv_driver.c

  • Committer: Christopher James Halse Rogers
  • Date: 2013-07-09 04:13:56 UTC
  • Revision ID: raof@ubuntu.com-20130709041356-9l5h9rwdbji5vuc1
XMir: Update to match xmir_get_drm_fd changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nv_driver.c
805
805
                return TRUE;
806
806
        }
807
807
 
808
 
        if (!xorgMir) {
809
808
#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0)
810
 
                XNFasprintf(&busid, "pci:%04x:%02x:%02x.%d",
811
 
                            dev->domain, dev->bus, dev->dev, dev->func);
 
809
        XNFasprintf(&busid, "pci:%04x:%02x:%02x.%d",
 
810
                    dev->domain, dev->bus, dev->dev, dev->func);
812
811
#else
813
 
                busid = XNFprintf("pci:%04x:%02x:%02x.%d",
814
 
                                  dev->domain, dev->bus, dev->dev, dev->func);
 
812
        busid = XNFprintf("pci:%04x:%02x:%02x.%d",
 
813
                          dev->domain, dev->bus, dev->dev, dev->func);
815
814
#endif
 
815
        if (!xorgMir)
816
816
                ret = nouveau_device_open(busid, &pNv->dev);
817
 
        }
818
 
#ifdef XMIR
819
817
        else
820
 
                ret = nouveau_device_wrap(xmir_get_drm_fd(pNv->xmir), 0, &pNv->dev);
821
 
#endif
 
818
                ret = nouveau_device_wrap(xmir_get_drm_fd(busid), 0, &pNv->dev);
822
819
 
823
820
        if (ret) {
824
821
                xf86DrvMsg(pScrn->scrnIndex, X_ERROR,