Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/sunxi Remove NAWIN_MP blocks (this code was exp...



details:   https://anonhg.NetBSD.org/src/rev/16ea7854e1fc
branches:  trunk
changeset: 831544:16ea7854e1fc
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Apr 05 10:19:25 2018 +0000

description:
Remove NAWIN_MP blocks (this code was experimental in the original driver and is not worth porting over)

diffstat:

 sys/arch/arm/sunxi/sunxi_debe.c |  30 ++----------------------------
 1 files changed, 2 insertions(+), 28 deletions(-)

diffs (86 lines):

diff -r dae121d92f33 -r 16ea7854e1fc sys/arch/arm/sunxi/sunxi_debe.c
--- a/sys/arch/arm/sunxi/sunxi_debe.c   Thu Apr 05 08:43:07 2018 +0000
+++ b/sys/arch/arm/sunxi/sunxi_debe.c   Thu Apr 05 10:19:25 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_debe.c,v 1.5 2018/04/03 16:17:59 bouyer Exp $ */
+/* $NetBSD: sunxi_debe.c,v 1.6 2018/04/05 10:19:25 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 Manuel Bouyer <bouyer%antioche.eu.org@localhost>
@@ -38,7 +38,7 @@
 #define SUNXI_DEBE_CURMAX      64
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_debe.c,v 1.5 2018/04/03 16:17:59 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_debe.c,v 1.6 2018/04/05 10:19:25 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -148,9 +148,6 @@
        bus_addr_t addr;
        bus_size_t size;
        struct fdtbus_reset *rst;
-#if NAWIN_MP > 0
-       device_t mpdev;
-#endif
 #ifdef AWIN_DEBE_FWINIT
        struct videomode mode;
 #endif
@@ -263,15 +260,6 @@
                return;
        }
 
-#if NAWIN_MP > 0
-       mpdev = device_find_by_driver_unit("sunximp", 0);
-       if (mpdev) {
-               paddr_t pa = sc->sc_dmamap->dm_segs[0].ds_addr;
-               if (pa >= SUNXI_SDRAM_PBASE)
-                       pa -= SUNXI_SDRAM_PBASE;
-               sunxi_mp_setbase(mpdev, pa, sc->sc_dmasize);
-       }
-#endif
        sc->sc_unit = -1;
        sc->sc_ports.dp_ep_connect = sunxi_debe_ep_connect;
        sc->sc_ports.dp_ep_enable = sunxi_debe_ep_enable;
@@ -699,7 +687,6 @@
 struct sunxi_befb_softc {
        struct genfb_softc sc_gen;
        device_t sc_debedev;
-       device_t sc_mpdev;
 
        bus_dma_tag_t sc_dmat;
        bus_dma_segment_t *sc_dmasegs;
@@ -740,7 +727,6 @@
        sc->sc_dmat = afb->afb_dmat;
        sc->sc_dmasegs = afb->afb_dmasegs;
        sc->sc_ndmasegs = afb->afb_ndmasegs;
-       sc->sc_mpdev = device_find_by_driver_unit("sunximp", 0);
 
        prop_dictionary_set_uint32(cfg, "width", afb->afb_width);
        prop_dictionary_set_uint32(cfg, "height", afb->afb_height);
@@ -800,10 +786,6 @@
                if (error == 0) {
                        fbi->fbi_flags |= WSFB_VRAM_IS_RAM;
                        fbi->fbi_fbsize = sc->sc_dmasegs[0].ds_len;
-#if NAWIN_MP > 0
-                       if (sc->sc_mpdev)
-                               fbi->fbi_flags |= WSFB_ACCEL;
-#endif
                }
                return error;
        case WSDISPLAYIO_SVIDEO:
@@ -813,14 +795,6 @@
        case WSDISPLAYIO_GCURMAX:
        case WSDISPLAYIO_SCURSOR:
                return sunxi_debe_ioctl(sc->sc_debedev, cmd, data);
-#if NAWIN_MP > 0
-       case WSDISPLAYIO_FILL:
-       case WSDISPLAYIO_COPY:
-       case WSDISPLAYIO_SYNC:
-               if (sc->sc_mpdev == NULL)
-                       return EPASSTHROUGH;
-               return sunxi_mp_ioctl(sc->sc_mpdev, cmd, data);
-#endif
        default:
                return EPASSTHROUGH;
        }



Home | Main Index | Thread Index | Old Index