Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/nvidia provide dma tag and copy of our struct d...



details:   https://anonhg.NetBSD.org/src/rev/99a56ce83f5f
branches:  trunk
changeset: 811244:99a56ce83f5f
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Oct 18 14:04:32 2015 +0000

description:
provide dma tag and copy of our struct device (eww)

diffstat:

 sys/arch/arm/nvidia/tegra_nouveau.c |  15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (56 lines):

diff -r 20925e3f948c -r 99a56ce83f5f sys/arch/arm/nvidia/tegra_nouveau.c
--- a/sys/arch/arm/nvidia/tegra_nouveau.c       Sun Oct 18 14:04:03 2015 +0000
+++ b/sys/arch/arm/nvidia/tegra_nouveau.c       Sun Oct 18 14:04:32 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_nouveau.c,v 1.2 2015/10/18 00:39:14 jmcneill Exp $ */
+/* $NetBSD: tegra_nouveau.c,v 1.3 2015/10/18 14:04:32 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_nouveau.c,v 1.2 2015/10/18 00:39:14 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_nouveau.c,v 1.3 2015/10/18 14:04:32 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -54,6 +54,7 @@
 
 struct tegra_nouveau_softc {
        device_t                sc_dev;
+       bus_dma_tag_t           sc_dmat;
        struct drm_device       *sc_drm_dev;
        struct platform_device  sc_platform_dev;
        struct nouveau_device   *sc_nv_dev;
@@ -94,18 +95,14 @@
 tegra_nouveau_attach(device_t parent, device_t self, void *aux)
 {
        struct tegra_nouveau_softc * const sc = device_private(self);
+       struct tegraio_attach_args * const tio = aux;
 #if notyet
-       struct tegraio_attach_args * const tio = aux;
        const struct tegra_locators * const loc = &tio->tio_loc;
 #endif
        int error;
 
        sc->sc_dev = self;
-#if notyet
-       sc->sc_bst = tio->tio_bst;
-       bus_space_subregion(tio->tio_bst, tio->tio_bsh,
-           loc->loc_offset, loc->loc_size, &sc->sc_bsh);
-#endif
+       sc->sc_dmat = tio->tio_dmat;
 
        aprint_naive("\n");
        aprint_normal(": GPU\n");
@@ -145,6 +142,8 @@
        dev->platformdev = &sc->sc_platform_dev;
 
        dev->platformdev->id = -1;
+       dev->platformdev->dev = *sc->sc_dev;    /* XXX */
+       dev->platformdev->dmat = sc->sc_dmat;
        dev->platformdev->nresource = 2;
        dev->platformdev->resource[0].tag = bst;
        dev->platformdev->resource[0].start = TEGRA_GPU_BASE;



Home | Main Index | Thread Index | Old Index