[PATCH 4.5/10] fixup! avivotool, radeonreg: completely skip early cards with --skip

Jonathan Nieder jrnieder at gmail.com
Fri Feb 24 19:54:01 PST 2012


Jonathan Nieder wrote:

> If only one card is present but --skip=n was supplied, it is more
> intuitive to error out than to guess which earlier card the user
> meant.

Oops, sent the wrong version of this patch.  Please squash in the
following for sanity.  Later patches assume the following has been
applied already.

diff --git i/avivotool.c w/avivotool.c
index 438354e8..ab41286b 100644
--- i/avivotool.c
+++ w/avivotool.c
@@ -1862,6 +1862,7 @@ static int map_radeon_mem(void)
                 fb_region = i;
         }
         avivo_device = device;
+        break;
     }
 
     if (!avivo_device){
diff --git i/radeonreg.c w/radeonreg.c
index 92ba949f..14e8b0a7 100644
--- i/radeonreg.c
+++ w/radeonreg.c
@@ -407,6 +407,7 @@ static int map_radeon_mem(void)
         fb_region = 0;
         ctrl_region = 2;
         avivo_device = device;
+        break;
     }
 
     if (!avivo_device){


More information about the xorg-driver-ati mailing list