← Back to branch summary

~ubuntu-branches/ubuntu/natty/xserver-xorg-video-nv/natty

« back to all changes in this revision

Viewing changes to src/riva_driver.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-12-07 17:48:09 UTC
  • mfrom: (1.1.18 upstream) (14.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20091207174809-qp9mqpx55qkidw08
Tags: 1:2.1.15-1ubuntu1
* Merge from Debian experimental, remaining changes:
  - Re-enabled the patch system, we need that. Add quilt in build-deps.
  - 100_fedora-panel-fix.patch:
    Don't discard EDID blocks just because their input type bit
    disagrees with the hardware connection sensing; this usually
    just means the block is lying. (cf. LP: 188549).
  - 105_gf7025_gf7050.patch:
    Fedora patch to add support for 7025/7050 IGP chipsets.
    (LP: 220364)
  - 0001-Move-the-logic-for-matching-devices-out-of-probe-rou.patch
    + Disable the logic for matching devices in the probe routine.
    + Instead match explicitly on pci_id_match (LP: 385658)
  - 0002-Run-the-parsing-script-to-generate-an-initial-list-o.patch
    + Generate the list of devices to match once

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/riva_driver.c
396
396
#endif
397
397
    }
398
398
   
 
399
#ifndef XSERVER_LIBPCIACCESS
399
400
    xf86SetOperatingState(resVgaIo, pRiva->pEnt->index, ResUnusedOpr);
400
401
    xf86SetOperatingState(resVgaMem, pRiva->pEnt->index, ResDisableOpr);
 
402
#endif
401
403
 
402
404
    /* Set pScrn->monitor */
403
405
    pScrn->monitor = pScrn->confScreen->monitor;
633
635
    xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n",
634
636
               (unsigned long)pRiva->IOAddress);
635
637
     
 
638
#ifndef XSERVER_LIBPCIACCESS
636
639
    if (xf86RegisterResources(pRiva->pEnt->index, NULL, ResExclusive)) {
637
640
        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
638
641
                "xf86RegisterResources() found resource conflicts\n");
640
643
        RivaFreeRec(pScrn);
641
644
        return FALSE;
642
645
    }
643
 
 
 
646
#endif
644
647
    Riva3Setup(pScrn);
645
648
 
646
649
    /*