Re: grfcl breakage on current?

[Chuck Silvers <chuq%chuq.com@localhost>]

On Tue, Nov 06, 2012 at 01:09:34AM +0100, Radoslaw Kujawa wrote:
> Hi.
> 
> Can anyone confirm/deny breakage of grfcl driver with -current ? I have a 
> PicassoIV card, but now when trying to boot current kernel on A4000 it only 
> gives "CIRRUS" on top of the screen and that's it. NetBSD 6.0 kernel is 
> working correctly. I suspect that this driver got broken recently. 

hi,

it looks like this is due to my recent device/softc changes.
the amiga video drivers abuse the autoconf framework in horrible ways
and I had some trouble with updating them.  I could only test the grfcc driver
but I hoped that I got the others right too... alas, I didn't.
I think the attached patch will repair things, could you give it a try?

-Chuck

Index: src/sys/arch/amiga/dev/grf_cl.c
===================================================================
RCS file: /home/chs/netbsd/cvs/src/sys/arch/amiga/dev/grf_cl.c,v
retrieving revision 1.47
diff -u -p -r1.47 grf_cl.c
--- src/sys/arch/amiga/dev/grf_cl.c     27 Oct 2012 17:17:28 -0000      1.47
+++ src/sys/arch/amiga/dev/grf_cl.c     6 Nov 2012 14:09:42 -0000
@@ -391,7 +391,7 @@ grfclattach(device_t parent, device_t se
        /*
         * attach grf (once)
         */
-       if (amiga_config_found(cfdata, self, gp, grfclprint)) {
+       if (amiga_config_found(cfdata, gp->g_device, gp, grfclprint)) {
                attachflag = 1;
                printf("grfcl: %dMB ", cl_fbsize / 0x100000);
                switch (cltype) {
Index: src/sys/arch/amiga/dev/grf_cv.c
===================================================================
RCS file: /home/chs/netbsd/cvs/src/sys/arch/amiga/dev/grf_cv.c,v
retrieving revision 1.54
diff -u -p -r1.54 grf_cv.c
--- src/sys/arch/amiga/dev/grf_cv.c     27 Oct 2012 17:17:28 -0000      1.54
+++ src/sys/arch/amiga/dev/grf_cv.c     6 Nov 2012 14:11:54 -0000
@@ -555,7 +555,7 @@ grfcvattach(device_t parent, device_t se
        /*
         * attach grf
         */
-       if (amiga_config_found(cfdata, self, gp, grfcvprint)) {
+       if (amiga_config_found(cfdata, gp->g_device, gp, grfcvprint)) {
                if (self != NULL)
                        printf("grfcv: CyberVision64 with %dMB being used\n",
                            cv_fbsize/0x100000);
Index: src/sys/arch/amiga/dev/grf_cv3d.c
===================================================================
RCS file: /home/chs/netbsd/cvs/src/sys/arch/amiga/dev/grf_cv3d.c,v
retrieving revision 1.28
diff -u -p -r1.28 grf_cv3d.c
--- src/sys/arch/amiga/dev/grf_cv3d.c   27 Oct 2012 17:17:28 -0000      1.28
+++ src/sys/arch/amiga/dev/grf_cv3d.c   6 Nov 2012 14:12:04 -0000
@@ -506,7 +506,7 @@ grfcv3dattach(device_t parent, device_t 
        /*
         * attach grf
         */
-       if (amiga_config_found(cfdata, self, gp, grfcv3dprint)) {
+       if (amiga_config_found(cfdata, gp->g_device, gp, grfcv3dprint)) {
                if (self != NULL)
                        printf("%s: CyberVision64/3D with %dMB being used\n",
                            device_xname(self), cv3d_fbsize / 0x100000);
Index: src/sys/arch/amiga/dev/grf_et.c
===================================================================
RCS file: /home/chs/netbsd/cvs/src/sys/arch/amiga/dev/grf_et.c,v
retrieving revision 1.30
diff -u -p -r1.30 grf_et.c
--- src/sys/arch/amiga/dev/grf_et.c     27 Oct 2012 17:17:28 -0000      1.30
+++ src/sys/arch/amiga/dev/grf_et.c     6 Nov 2012 14:12:21 -0000
@@ -325,7 +325,7 @@ grfetattach(device_t parent, device_t se
        /*
         * attach grf (once)
         */
-       if (amiga_config_found(cfdata, self, gp, grfetprint)) {
+       if (amiga_config_found(cfdata, gp->g_device, gp, grfetprint)) {
                attachflag = 1;
                printf("grfet: %dMB ", et_fbsize / 0x100000);
                switch (ettype) {
Index: src/sys/arch/amiga/dev/grf_rh.c
===================================================================
RCS file: /home/chs/netbsd/cvs/src/sys/arch/amiga/dev/grf_rh.c,v
retrieving revision 1.55
diff -u -p -r1.55 grf_rh.c
--- src/sys/arch/amiga/dev/grf_rh.c     27 Oct 2012 17:17:29 -0000      1.55
+++ src/sys/arch/amiga/dev/grf_rh.c     6 Nov 2012 14:12:35 -0000
@@ -1617,7 +1617,7 @@ grfrhattach(device_t parent, device_t se
        /*
         * attach grf
         */
-       amiga_config_found(cfdata, self, gp, grfrhprint);
+       amiga_config_found(cfdata, gp->g_device, gp, grfrhprint);
 }
 
 int
Index: src/sys/arch/amiga/dev/grf_rt.c
===================================================================
RCS file: /home/chs/netbsd/cvs/src/sys/arch/amiga/dev/grf_rt.c,v
retrieving revision 1.56
diff -u -p -r1.56 grf_rt.c
--- src/sys/arch/amiga/dev/grf_rt.c     27 Oct 2012 17:17:29 -0000      1.56
+++ src/sys/arch/amiga/dev/grf_rt.c     6 Nov 2012 14:12:47 -0000
@@ -881,7 +881,7 @@ grfrtattach(device_t parent, device_t se
        /*
         * attach grf
         */
-       amiga_config_found(cfdata, self, gp, grfrtprint);
+       amiga_config_found(cfdata, gp->g_device, gp, grfrtprint);
 }
 
 int
Index: src/sys/arch/amiga/dev/grf_ul.c
===================================================================
RCS file: /home/chs/netbsd/cvs/src/sys/arch/amiga/dev/grf_ul.c,v
retrieving revision 1.48
diff -u -p -r1.48 grf_ul.c
--- src/sys/arch/amiga/dev/grf_ul.c     27 Oct 2012 17:17:29 -0000      1.48
+++ src/sys/arch/amiga/dev/grf_ul.c     6 Nov 2012 14:12:59 -0000
@@ -556,7 +556,7 @@ grfulattach(device_t parent, device_t se
        /*
         * attach grf
         */
-       amiga_config_found(cfdata, self, gp, grfulprint);
+       amiga_config_found(cfdata, gp->g_device, gp, grfulprint);
 }
 
 int