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

« back to all changes in this revision

Viewing changes to src/g80_output.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Potyra
  • Date: 2008-06-15 15:03:42 UTC
  • mfrom: (1.1.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20080615150342-ke266hqt4p7m8qyd
Tags: 1:2.1.9-1ubuntu1
* Merge from unstable (LP: #240034), remaining changes:
  + debian/patches/100_fedora-panel-fix.patch from Timo Aaltonen:
    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).
  + debian/control: update Maintainer field as per spec.

Show diffs side-by-side

added added

removed removed

Lines of Context:
106
106
        port = (b >> 4) & 0xf;
107
107
        or = ffs((b >> 24) & 0xf) - 1;
108
108
 
 
109
        if(b & 0x300000)
 
110
            /* Can't handle this type of output yet */
 
111
            continue;
 
112
 
109
113
        if(type == 0xe) break;
110
114
 
111
115
        switch(type) {