CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: riastradh Date: Sat Mar 19 11:37:17 UTC 2022 Modified Files: src/sys/arch/arm/nvidia: tegra124_car.c Log Message: tegra124_car(4): Attach rndsource synchronously. It looks like the original motivation for deferring to config_interrupts was to wait until softint_establish worked. But this no longer needs to use softints to deliver the entropy, so that's moot. Doing this synchronously gives us a better chance for more entropy earlier. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/nvidia/tegra124_car.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/nvidia/tegra124_car.c diff -u src/sys/arch/arm/nvidia/tegra124_car.c:1.23 src/sys/arch/arm/nvidia/tegra124_car.c:1.24 --- src/sys/arch/arm/nvidia/tegra124_car.c:1.23 Sat Mar 19 11:36:53 2022 +++ src/sys/arch/arm/nvidia/tegra124_car.c Sat Mar 19 11:37:17 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra124_car.c,v 1.23 2022/03/19 11:36:53 riastradh Exp $ */ +/* $NetBSD: tegra124_car.c,v 1.24 2022/03/19 11:37:17 riastradh Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.23 2022/03/19 11:36:53 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.24 2022/03/19 11:37:17 riastradh Exp $"); #include #include @@ -785,7 +785,7 @@ tegra124_car_attach(device_t parent, dev tegra124_car_init(sc); - config_interrupts(self, tegra124_car_rnd_attach); + tegra124_car_rnd_attach(self); } static void
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: riastradh Date: Sat Mar 19 11:37:17 UTC 2022 Modified Files: src/sys/arch/arm/nvidia: tegra124_car.c Log Message: tegra124_car(4): Attach rndsource synchronously. It looks like the original motivation for deferring to config_interrupts was to wait until softint_establish worked. But this no longer needs to use softints to deliver the entropy, so that's moot. Doing this synchronously gives us a better chance for more entropy earlier. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/nvidia/tegra124_car.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: riastradh
Date: Sat Mar 19 11:36:53 UTC 2022
Modified Files:
src/sys/arch/arm/nvidia: tegra124_car.c
Log Message:
tegra124_car(4): No need for rnd lock -- delete it.
This only ever reads from a single device register, so no need to
serialize access.
XXX This should really have a hardware-specific health test, but I
can't find any documentation on the underlying physical entropy
source.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/nvidia/tegra124_car.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra124_car.c
diff -u src/sys/arch/arm/nvidia/tegra124_car.c:1.22 src/sys/arch/arm/nvidia/tegra124_car.c:1.23
--- src/sys/arch/arm/nvidia/tegra124_car.c:1.22 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/nvidia/tegra124_car.c Sat Mar 19 11:36:53 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra124_car.c,v 1.22 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: tegra124_car.c,v 1.23 2022/03/19 11:36:53 riastradh Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.22 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.23 2022/03/19 11:36:53 riastradh Exp $");
#include
#include
@@ -708,7 +708,6 @@ struct tegra124_car_softc {
u_int sc_clock_cells;
u_int sc_reset_cells;
- kmutex_t sc_rndlock;
krndsource_t sc_rndsource;
};
@@ -917,7 +916,6 @@ tegra124_car_rnd_attach(device_t self)
{
struct tegra124_car_softc * const sc = device_private(self);
- mutex_init(&sc->sc_rndlock, MUTEX_DEFAULT, IPL_VM);
rndsource_setcb(&sc->sc_rndsource, tegra124_car_rnd_callback, sc);
rnd_attach_source(&sc->sc_rndsource, device_xname(sc->sc_dev),
RND_TYPE_RNG, RND_FLAG_COLLECT_VALUE|RND_FLAG_HASCB);
@@ -930,7 +928,6 @@ tegra124_car_rnd_callback(size_t bytes_w
uint16_t buf[512];
uint32_t cnt;
- mutex_enter(&sc->sc_rndlock);
while (bytes_wanted) {
const u_int nbytes = MIN(bytes_wanted, 1024);
for (cnt = 0; cnt < bytes_wanted / 2; cnt++) {
@@ -942,7 +939,6 @@ tegra124_car_rnd_callback(size_t bytes_w
bytes_wanted -= MIN(bytes_wanted, nbytes);
}
explicit_memset(buf, 0, sizeof(buf));
- mutex_exit(&sc->sc_rndlock);
}
static struct tegra_clk *
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: riastradh Date: Sat Mar 19 11:36:53 UTC 2022 Modified Files: src/sys/arch/arm/nvidia: tegra124_car.c Log Message: tegra124_car(4): No need for rnd lock -- delete it. This only ever reads from a single device register, so no need to serialize access. XXX This should really have a hardware-specific health test, but I can't find any documentation on the underlying physical entropy source. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/nvidia/tegra124_car.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Sun Feb 6 15:40:55 UTC 2022
Modified Files:
src/sys/arch/arm/nvidia: tegra_sdhc.c
Log Message:
sdhc: tegra: Set SDHC_FLAG_BROKEN_ADMA2_ZEROLEN quirk flag.
The Tegra SDHCI implementation apparently treats ADMA2 descriptors with
length of 0 incorrectly.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/nvidia/tegra_sdhc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_sdhc.c
diff -u src/sys/arch/arm/nvidia/tegra_sdhc.c:1.30 src/sys/arch/arm/nvidia/tegra_sdhc.c:1.31
--- src/sys/arch/arm/nvidia/tegra_sdhc.c:1.30 Sat Jan 22 15:10:30 2022
+++ src/sys/arch/arm/nvidia/tegra_sdhc.c Sun Feb 6 15:40:55 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_sdhc.c,v 1.30 2022/01/22 15:10:30 skrll Exp $ */
+/* $NetBSD: tegra_sdhc.c,v 1.31 2022/02/06 15:40:55 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -31,7 +31,7 @@
#include "locators.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_sdhc.c,v 1.30 2022/01/22 15:10:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_sdhc.c,v 1.31 2022/02/06 15:40:55 jmcneill Exp $");
#include
#include
@@ -130,7 +130,8 @@ tegra_sdhc_attach(device_t parent, devic
SDHC_FLAG_SINGLE_POWER_WRITE |
SDHC_FLAG_NO_HS_BIT |
SDHC_FLAG_USE_DMA |
- SDHC_FLAG_USE_ADMA2;
+ SDHC_FLAG_USE_ADMA2 |
+ SDHC_FLAG_BROKEN_ADMA2_ZEROLEN;
if (bus_width == 8) {
sc->sc.sc_flags |= SDHC_FLAG_8BIT_MODE;
}
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: jmcneill Date: Sun Feb 6 15:40:55 UTC 2022 Modified Files: src/sys/arch/arm/nvidia: tegra_sdhc.c Log Message: sdhc: tegra: Set SDHC_FLAG_BROKEN_ADMA2_ZEROLEN quirk flag. The Tegra SDHCI implementation apparently treats ADMA2 descriptors with length of 0 incorrectly. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/nvidia/tegra_sdhc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 12:44:50 UTC 2021
Modified Files:
src/sys/arch/arm/nvidia: tegra_drm.c tegra_drm.h tegra_fb.c
Log Message:
drm: Do the attach task dance for tegra drm.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/nvidia/tegra_drm.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/nvidia/tegra_drm.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/tegra_fb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_drm.c
diff -u src/sys/arch/arm/nvidia/tegra_drm.c:1.13 src/sys/arch/arm/nvidia/tegra_drm.c:1.14
--- src/sys/arch/arm/nvidia/tegra_drm.c:1.13 Sun Dec 19 12:44:14 2021
+++ src/sys/arch/arm/nvidia/tegra_drm.c Sun Dec 19 12:44:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm.c,v 1.13 2021/12/19 12:44:14 riastradh Exp $ */
+/* $NetBSD: tegra_drm.c,v 1.14 2021/12/19 12:44:50 riastradh Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_drm.c,v 1.13 2021/12/19 12:44:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm.c,v 1.14 2021/12/19 12:44:50 riastradh Exp $");
#include
#include
@@ -55,6 +55,8 @@ static void tegra_drm_attach(device_t, d
static int tegra_drm_load(struct drm_device *, unsigned long);
static void tegra_drm_unload(struct drm_device *);
+static void tegra_drm_task_work(struct work *, void *);
+
static struct drm_driver tegra_drm_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM,
.dev_priv_size = 0,
@@ -123,6 +125,14 @@ tegra_drm_attach(device_t parent, device
sc->sc_dmat = faa->faa_dmat;
sc->sc_bst = faa->faa_bst;
sc->sc_phandle = faa->faa_phandle;
+ sc->sc_task_thread = NULL;
+ SIMPLEQ_INIT(&sc->sc_tasks);
+ if (workqueue_create(&sc->sc_task_wq, "tegradrm",
+ &tegra_drm_task_work, NULL, PRI_NONE, IPL_NONE, WQ_MPSAFE)) {
+ aprint_error_dev(self, "unable to create workqueue\n");
+ sc->sc_task_wq = NULL;
+ return;
+ }
aprint_naive("\n");
aprint_normal("\n");
@@ -204,19 +214,43 @@ tegra_drm_attach(device_t parent, device
sc->sc_ddev->dmat = sc->sc_ddev->bus_dmat;
sc->sc_ddev->dmat_subregion_p = false;
+ /*
+ * Cause any tasks issued synchronously during attach to be
+ * processed at the end of this function.
+ */
+ sc->sc_task_thread = curlwp;
+
error = -drm_dev_register(sc->sc_ddev, 0);
if (error) {
drm_dev_put(sc->sc_ddev);
+ sc->sc_ddev = NULL;
aprint_error_dev(self, "couldn't register DRM device: %d\n",
error);
- return;
+ goto out;
}
+ sc->sc_dev_registered = true;
aprint_normal_dev(self, "initialized %s %d.%d.%d %s on minor %d\n",
driver->name, driver->major, driver->minor, driver->patchlevel,
driver->date, sc->sc_ddev->primary->index);
- return;
+ /*
+ * Process asynchronous tasks queued synchronously during
+ * attach. This will be for display detection to attach a
+ * framebuffer, so we have the opportunity for a console device
+ * to attach before autoconf has completed, in time for init(8)
+ * to find that console without panicking.
+ */
+ while (!SIMPLEQ_EMPTY(&sc->sc_tasks)) {
+ struct tegra_drm_task *const task =
+ SIMPLEQ_FIRST(&sc->sc_tasks);
+
+ SIMPLEQ_REMOVE_HEAD(&sc->sc_tasks, tdt_u.queue);
+ (*task->tdt_fn)(task);
+ }
+
+out: /* Cause any subesquent tasks to be processed by the workqueue. */
+ atomic_store_relaxed(&sc->sc_task_thread, NULL);
}
static int
@@ -246,3 +280,31 @@ tegra_drm_unload(struct drm_device *ddev
drm_mode_config_cleanup(ddev);
}
+
+static void
+tegra_drm_task_work(struct work *work, void *cookie)
+{
+ struct tegra_drm_task *task = container_of(work, struct tegra_drm_task,
+ tdt_u.work);
+
+ (*task->tdt_fn)(task);
+}
+
+void
+tegra_task_init(struct tegra_drm_task *task,
+void (*fn)(struct tegra_drm_task *))
+{
+
+ task->tdt_fn = fn;
+}
+
+void
+tegra_task_schedule(device_t self, struct tegra_drm_task *task)
+{
+ struct tegra_drm_softc *sc = device_private(self);
+
+ if (atomic_load_relaxed(&sc->sc_task_thread) == curlwp)
+ SIMPLEQ_INSERT_TAIL(&sc->sc_tasks, task, tdt_u.queue);
+ else
+ workqueue_enqueue(sc->sc_task_wq, &task->tdt_u.work, NULL);
+}
Index: src/sys/arch/arm/nvidia/tegra_drm.h
diff -u src/sys/arch/arm/nvidia/tegra_drm.h:1.10 src/sys/arch/arm/nvidia/tegra_drm.h:1.11
--- src/sys/arch/arm/nvidia/tegra_drm.h:1.10 Sun Dec 19 12:44:14 2021
+++ src/sys/arch/arm/nvidia/tegra_drm.h Sun Dec 19 12:44:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm.h,v 1.10 2021/12/19 12:44:14 riastradh Exp $ */
+/* $NetBSD: tegra_drm.h,v 1.11 2021/12/19 12:44:50 riastradh Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -29,6 +29,8 @@
#ifndef _ARM_TEGRA_DRM_H
#define _ARM_TEGRA_DRM_H
+#include
+
#include
#include
#include
@@ -54,6 +56,12 @@ struct tegra_drm_softc {
int sc_phandle;
+ struct lwp *sc_task_thread;
+ SIMPLEQ_HEAD(, t
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: riastradh Date: Sun Dec 19 12:44:50 UTC 2021 Modified Files: src/sys/arch/arm/nvidia: tegra_drm.c tegra_drm.h tegra_fb.c Log Message: drm: Do the attach task dance for tegra drm. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/nvidia/tegra_drm.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/nvidia/tegra_drm.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/tegra_fb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: riastradh Date: Sun Dec 19 12:44:14 UTC 2021 Modified Files: src/sys/arch/arm/nvidia: tegra_drm.c tegra_drm.h tegra_drm_fb.c tegra_drm_mode.c tegra_fb.c Log Message: drm: Make tegra drm build again. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/nvidia/tegra_drm.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_drm.h \ src/sys/arch/arm/nvidia/tegra_drm_fb.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/nvidia/tegra_drm_mode.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra_fb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 12:44:14 UTC 2021
Modified Files:
src/sys/arch/arm/nvidia: tegra_drm.c tegra_drm.h tegra_drm_fb.c
tegra_drm_mode.c tegra_fb.c
Log Message:
drm: Make tegra drm build again.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/nvidia/tegra_drm.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_drm.h \
src/sys/arch/arm/nvidia/tegra_drm_fb.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/nvidia/tegra_drm_mode.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra_fb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_drm.c
diff -u src/sys/arch/arm/nvidia/tegra_drm.c:1.12 src/sys/arch/arm/nvidia/tegra_drm.c:1.13
--- src/sys/arch/arm/nvidia/tegra_drm.c:1.12 Sun Dec 19 11:01:21 2021
+++ src/sys/arch/arm/nvidia/tegra_drm.c Sun Dec 19 12:44:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm.c,v 1.12 2021/12/19 11:01:21 riastradh Exp $ */
+/* $NetBSD: tegra_drm.c,v 1.13 2021/12/19 12:44:14 riastradh Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_drm.c,v 1.12 2021/12/19 11:01:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm.c,v 1.13 2021/12/19 12:44:14 riastradh Exp $");
#include
#include
@@ -40,7 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: tegra_drm.c,
#include
#include
-#include
+#include
+#include
#include
#include
@@ -51,10 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: tegra_drm.c,
static int tegra_drm_match(device_t, cfdata_t, void *);
static void tegra_drm_attach(device_t, device_t, void *);
-static int tegra_drm_set_busid(struct drm_device *, struct drm_master *);
-
static int tegra_drm_load(struct drm_device *, unsigned long);
-static int tegra_drm_unload(struct drm_device *);
+static void tegra_drm_unload(struct drm_device *);
static struct drm_driver tegra_drm_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM,
@@ -67,8 +66,6 @@ static struct drm_driver tegra_drm_drive
.gem_uvm_ops = &drm_gem_cma_uvm_ops,
.dumb_create = drm_gem_cma_dumb_create,
- .dumb_map_offset = drm_gem_cma_dumb_map_offset,
- .dumb_destroy = drm_gem_dumb_destroy,
.get_vblank_counter = tegra_drm_get_vblank_counter,
.enable_vblank = tegra_drm_enable_vblank,
@@ -80,8 +77,6 @@ static struct drm_driver tegra_drm_drive
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
-
- .set_busid = tegra_drm_set_busid,
};
CFATTACH_DECL_NEW(tegra_drm, sizeof(struct tegra_drm_softc),
@@ -211,7 +206,7 @@ tegra_drm_attach(device_t parent, device
error = -drm_dev_register(sc->sc_ddev, 0);
if (error) {
- drm_dev_unref(sc->sc_ddev);
+ drm_dev_put(sc->sc_ddev);
aprint_error_dev(self, "couldn't register DRM device: %d\n",
error);
return;
@@ -225,21 +220,6 @@ tegra_drm_attach(device_t parent, device
}
static int
-tegra_drm_set_busid(struct drm_device *ddev, struct drm_master *master)
-{
- const char *id = "platform:tegra:0";
-
- master->unique = kzalloc(strlen(id) + 1, GFP_KERNEL);
- if (master->unique == NULL)
- return -ENOMEM;
- strcpy(master->unique, id);
- master->unique_len = strlen(master->unique);
-
- return 0;
-}
-
-
-static int
tegra_drm_load(struct drm_device *ddev, unsigned long flags)
{
int error;
@@ -260,10 +240,9 @@ drmerr:
return error;
}
-static int
+static void
tegra_drm_unload(struct drm_device *ddev)
{
- drm_mode_config_cleanup(ddev);
- return 0;
+ drm_mode_config_cleanup(ddev);
}
Index: src/sys/arch/arm/nvidia/tegra_drm.h
diff -u src/sys/arch/arm/nvidia/tegra_drm.h:1.9 src/sys/arch/arm/nvidia/tegra_drm.h:1.10
--- src/sys/arch/arm/nvidia/tegra_drm.h:1.9 Mon Aug 27 15:31:51 2018
+++ src/sys/arch/arm/nvidia/tegra_drm.h Sun Dec 19 12:44:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm.h,v 1.9 2018/08/27 15:31:51 riastradh Exp $ */
+/* $NetBSD: tegra_drm.h,v 1.10 2021/12/19 12:44:14 riastradh Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -29,6 +29,7 @@
#ifndef _ARM_TEGRA_DRM_H
#define _ARM_TEGRA_DRM_H
+#include
#include
#include
Index: src/sys/arch/arm/nvidia/tegra_drm_fb.c
diff -u src/sys/arch/arm/nvidia/tegra_drm_fb.c:1.9 src/sys/arch/arm/nvidia/tegra_drm_fb.c:1.10
--- src/sys/arch/arm/nvidia/tegra_drm_fb.c:1.9 Sat Aug 7 16:18:44 2021
+++ src/sys/arch/arm/nvidia/tegra_drm_fb.c Sun Dec 19 12:44:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm_fb.c,v 1.9 2021/08/07 16:18:44 thorpej Exp $ */
+/* $NetBSD: tegra_drm_fb.c,v 1.10 2021/12/19 12:44:14 riastradh Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,12 +27,13 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_drm_fb.c,v 1.9 2021/08/07 16:18:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm_fb.c,v 1.10 2021/12/19 12:44:14 riastradh Exp $");
-#include
#include
-#include
#include
+#include
+#include
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: skrll
Date: Sun Oct 13 06:11:31 UTC 2019
Modified Files:
src/sys/arch/arm/nvidia: tegra124_car.c tegra124_xusbpad.c
tegra210_car.c tegra210_xusbpad.c tegra_apbdma.c tegra_cec.c
tegra_com.c tegra_fuse.c tegra_gpio.c tegra_hdaudio.c tegra_mc.c
tegra_pinmux.c tegra_pmc.c tegra_rtc.c tegra_sdhc.c
tegra_soctherm.c tegra_timer.c tegra_usbphy.c tegra_xusb.c
Log Message:
Restore %# for PRIxBUSADDR
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/nvidia/tegra124_car.c \
src/sys/arch/arm/nvidia/tegra_xusb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nvidia/tegra124_xusbpad.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/nvidia/tegra210_car.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/nvidia/tegra210_xusbpad.c \
src/sys/arch/arm/nvidia/tegra_hdaudio.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_apbdma.c \
src/sys/arch/arm/nvidia/tegra_rtc.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/tegra_cec.c \
src/sys/arch/arm/nvidia/tegra_pinmux.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/nvidia/tegra_com.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nvidia/tegra_fuse.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/nvidia/tegra_gpio.c \
src/sys/arch/arm/nvidia/tegra_timer.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_mc.c \
src/sys/arch/arm/nvidia/tegra_usbphy.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/nvidia/tegra_pmc.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/nvidia/tegra_sdhc.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/nvidia/tegra_soctherm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra124_car.c
diff -u src/sys/arch/arm/nvidia/tegra124_car.c:1.18 src/sys/arch/arm/nvidia/tegra124_car.c:1.19
--- src/sys/arch/arm/nvidia/tegra124_car.c:1.18 Sun Oct 13 05:57:14 2019
+++ src/sys/arch/arm/nvidia/tegra124_car.c Sun Oct 13 06:11:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra124_car.c,v 1.18 2019/10/13 05:57:14 skrll Exp $ */
+/* $NetBSD: tegra124_car.c,v 1.19 2019/10/13 06:11:31 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.18 2019/10/13 05:57:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.19 2019/10/13 06:11:31 skrll Exp $");
#include
#include
@@ -758,7 +758,7 @@ tegra124_car_attach(device_t parent, dev
sc->sc_bst = faa->faa_bst;
error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
if (error) {
- aprint_error(": couldn't map %" PRIxBUSADDR ": %d", addr, error);
+ aprint_error(": couldn't map %#" PRIxBUSADDR ": %d", addr, error);
return;
}
if (of_getprop_uint32(phandle, "#clock-cells", &sc->sc_clock_cells))
Index: src/sys/arch/arm/nvidia/tegra_xusb.c
diff -u src/sys/arch/arm/nvidia/tegra_xusb.c:1.18 src/sys/arch/arm/nvidia/tegra_xusb.c:1.19
--- src/sys/arch/arm/nvidia/tegra_xusb.c:1.18 Sun Oct 13 05:57:14 2019
+++ src/sys/arch/arm/nvidia/tegra_xusb.c Sun Oct 13 06:11:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_xusb.c,v 1.18 2019/10/13 05:57:14 skrll Exp $ */
+/* $NetBSD: tegra_xusb.c,v 1.19 2019/10/13 06:11:31 skrll Exp $ */
/*
* Copyright (c) 2016 Jonathan A. Kollasch
@@ -30,7 +30,7 @@
#include "opt_tegra.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.18 2019/10/13 05:57:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.19 2019/10/13 06:11:31 skrll Exp $");
#include
#include
@@ -223,7 +223,7 @@ tegra_xusb_attach(device_t parent, devic
}
error = bus_space_map(sc->sc_iot, addr, size, 0, &sc->sc_ioh);
if (error) {
- aprint_error(": couldn't map %" PRIxBUSADDR ": %d", addr, error);
+ aprint_error(": couldn't map %#" PRIxBUSADDR ": %d", addr, error);
return;
}
DPRINTF(sc->sc_dev, "mapped %#" PRIxBUSADDR "\n", addr);
@@ -234,7 +234,7 @@ tegra_xusb_attach(device_t parent, devic
}
error = bus_space_map(sc->sc_iot, addr, size, 0, &psc->sc_bsh_fpci);
if (error) {
- aprint_error(": couldn't map %" PRIxBUSADDR ": %d", addr, error);
+ aprint_error(": couldn't map %#" PRIxBUSADDR ": %d", addr, error);
return;
}
DPRINTF(sc->sc_dev, "mapped %#" PRIxBUSADDR "\n", addr);
@@ -245,7 +245,7 @@ tegra_xusb_attach(device_t parent, devic
}
error = bus_space_map(sc->sc_iot, addr, size, 0, &psc->sc_bsh_ipfs);
if (error) {
- aprint_error(": couldn't map %" PRIxBUSADDR ": %d", addr, error);
+ aprint_error(": couldn't map %#" PRIxBUSADDR ": %d", addr, error);
return;
}
DPRINTF(sc->sc_dev, "mapped %#" PRIxBUSADDR "\n", addr);
Index: src/sys/arch/arm/nvidia/tegra124_xusbpad.c
diff -u src/sys/arch/arm/nvidia/tegra124_xusbpad.c:1.3 src/sys/arch/arm/nvidia/tegra124_xusbpad.c:1.4
--- src/sys/arch/arm/nvidia/tegra124_xusbpad.c:1.3 Sun Oct 13 05:57:14 2019
+++ src/sys/arch/arm/nvidia/tegra124_xusbpad.c Sun Oct 13 06:11:31 2019
@@ -1,4 +
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: skrll Date: Sun Oct 13 06:11:31 UTC 2019 Modified Files: src/sys/arch/arm/nvidia: tegra124_car.c tegra124_xusbpad.c tegra210_car.c tegra210_xusbpad.c tegra_apbdma.c tegra_cec.c tegra_com.c tegra_fuse.c tegra_gpio.c tegra_hdaudio.c tegra_mc.c tegra_pinmux.c tegra_pmc.c tegra_rtc.c tegra_sdhc.c tegra_soctherm.c tegra_timer.c tegra_usbphy.c tegra_xusb.c Log Message: Restore %# for PRIxBUSADDR To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/nvidia/tegra124_car.c \ src/sys/arch/arm/nvidia/tegra_xusb.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nvidia/tegra124_xusbpad.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/nvidia/tegra210_car.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/nvidia/tegra210_xusbpad.c \ src/sys/arch/arm/nvidia/tegra_hdaudio.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_apbdma.c \ src/sys/arch/arm/nvidia/tegra_rtc.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/tegra_cec.c \ src/sys/arch/arm/nvidia/tegra_pinmux.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/nvidia/tegra_com.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nvidia/tegra_fuse.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/nvidia/tegra_gpio.c \ src/sys/arch/arm/nvidia/tegra_timer.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_mc.c \ src/sys/arch/arm/nvidia/tegra_usbphy.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/nvidia/tegra_pmc.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/nvidia/tegra_sdhc.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/nvidia/tegra_soctherm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: skrll
Date: Sun Oct 13 05:57:14 UTC 2019
Modified Files:
src/sys/arch/arm/nvidia: tegra124_car.c tegra124_xusbpad.c
tegra210_car.c tegra210_xusbpad.c tegra_apbdma.c tegra_cec.c
tegra_com.c tegra_fuse.c tegra_gpio.c tegra_hdaudio.c tegra_mc.c
tegra_pinmux.c tegra_pmc.c tegra_rtc.c tegra_sdhc.c
tegra_soctherm.c tegra_timer.c tegra_usbphy.c tegra_xusb.c
Log Message:
Use PRIxBUSADDR
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/nvidia/tegra124_car.c \
src/sys/arch/arm/nvidia/tegra_xusb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra124_xusbpad.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/nvidia/tegra210_car.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/nvidia/tegra210_xusbpad.c \
src/sys/arch/arm/nvidia/tegra_hdaudio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/tegra_apbdma.c \
src/sys/arch/arm/nvidia/tegra_rtc.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra_cec.c \
src/sys/arch/arm/nvidia/tegra_pinmux.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/nvidia/tegra_com.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_fuse.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_gpio.c \
src/sys/arch/arm/nvidia/tegra_timer.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/nvidia/tegra_mc.c \
src/sys/arch/arm/nvidia/tegra_usbphy.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/nvidia/tegra_pmc.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/nvidia/tegra_sdhc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nvidia/tegra_soctherm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra124_car.c
diff -u src/sys/arch/arm/nvidia/tegra124_car.c:1.17 src/sys/arch/arm/nvidia/tegra124_car.c:1.18
--- src/sys/arch/arm/nvidia/tegra124_car.c:1.17 Sat Mar 9 19:41:26 2019
+++ src/sys/arch/arm/nvidia/tegra124_car.c Sun Oct 13 05:57:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra124_car.c,v 1.17 2019/03/09 19:41:26 jakllsch Exp $ */
+/* $NetBSD: tegra124_car.c,v 1.18 2019/10/13 05:57:14 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.17 2019/03/09 19:41:26 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.18 2019/10/13 05:57:14 skrll Exp $");
#include
#include
@@ -758,7 +758,7 @@ tegra124_car_attach(device_t parent, dev
sc->sc_bst = faa->faa_bst;
error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
if (error) {
- aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
+ aprint_error(": couldn't map %" PRIxBUSADDR ": %d", addr, error);
return;
}
if (of_getprop_uint32(phandle, "#clock-cells", &sc->sc_clock_cells))
Index: src/sys/arch/arm/nvidia/tegra_xusb.c
diff -u src/sys/arch/arm/nvidia/tegra_xusb.c:1.17 src/sys/arch/arm/nvidia/tegra_xusb.c:1.18
--- src/sys/arch/arm/nvidia/tegra_xusb.c:1.17 Tue Jan 8 18:04:00 2019
+++ src/sys/arch/arm/nvidia/tegra_xusb.c Sun Oct 13 05:57:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_xusb.c,v 1.17 2019/01/08 18:04:00 jakllsch Exp $ */
+/* $NetBSD: tegra_xusb.c,v 1.18 2019/10/13 05:57:14 skrll Exp $ */
/*
* Copyright (c) 2016 Jonathan A. Kollasch
@@ -30,7 +30,7 @@
#include "opt_tegra.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.17 2019/01/08 18:04:00 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.18 2019/10/13 05:57:14 skrll Exp $");
#include
#include
@@ -223,11 +223,10 @@ tegra_xusb_attach(device_t parent, devic
}
error = bus_space_map(sc->sc_iot, addr, size, 0, &sc->sc_ioh);
if (error) {
- aprint_error(": couldn't map %#" PRIx64 ": %d",
- (uint64_t)addr, error);
+ aprint_error(": couldn't map %" PRIxBUSADDR ": %d", addr, error);
return;
}
- DPRINTF(sc->sc_dev, "mapped %#" PRIx64 "\n", (uint64_t)addr);
+ DPRINTF(sc->sc_dev, "mapped %#" PRIxBUSADDR "\n", addr);
if (fdtbus_get_reg_byname(faa->faa_phandle, "fpci", &addr, &size) != 0) {
aprint_error(": couldn't get registers\n");
@@ -235,11 +234,10 @@ tegra_xusb_attach(device_t parent, devic
}
error = bus_space_map(sc->sc_iot, addr, size, 0, &psc->sc_bsh_fpci);
if (error) {
- aprint_error(": couldn't map %#" PRIx64 ": %d",
- (uint64_t)addr, error);
+ aprint_error(": couldn't map %" PRIxBUSADDR ": %d", addr, error);
return;
}
- DPRINTF(sc->sc_dev, "mapped %#" PRIx64 "\n", (uint64_t)addr);
+ DPRINTF(sc->sc_dev, "mapped %#" PRIxBUSADDR "\n", addr);
if (fdtbus_get_reg_byname(faa->faa_phandle, "ipfs", &addr, &size) != 0) {
aprint_error(": couldn't get registers\n");
@@ -247,11 +245,10 @@ tegra_xusb_attach(device_t parent, devic
}
error = bus_space_map(sc->sc_iot, addr, size, 0, &psc->sc_bsh_ipfs);
if (error) {
- aprint_error(": couldn't map %#" PRIx64 ": %d",
- (uint64_t)addr, error);
+ aprint_error(": couldn't map %" P
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: skrll Date: Sun Oct 13 05:57:14 UTC 2019 Modified Files: src/sys/arch/arm/nvidia: tegra124_car.c tegra124_xusbpad.c tegra210_car.c tegra210_xusbpad.c tegra_apbdma.c tegra_cec.c tegra_com.c tegra_fuse.c tegra_gpio.c tegra_hdaudio.c tegra_mc.c tegra_pinmux.c tegra_pmc.c tegra_rtc.c tegra_sdhc.c tegra_soctherm.c tegra_timer.c tegra_usbphy.c tegra_xusb.c Log Message: Use PRIxBUSADDR To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/nvidia/tegra124_car.c \ src/sys/arch/arm/nvidia/tegra_xusb.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra124_xusbpad.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/nvidia/tegra210_car.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/nvidia/tegra210_xusbpad.c \ src/sys/arch/arm/nvidia/tegra_hdaudio.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/tegra_apbdma.c \ src/sys/arch/arm/nvidia/tegra_rtc.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra_cec.c \ src/sys/arch/arm/nvidia/tegra_pinmux.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/nvidia/tegra_com.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_fuse.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_gpio.c \ src/sys/arch/arm/nvidia/tegra_timer.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/nvidia/tegra_mc.c \ src/sys/arch/arm/nvidia/tegra_usbphy.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/nvidia/tegra_pmc.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/nvidia/tegra_sdhc.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nvidia/tegra_soctherm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: skrll Date: Sun Oct 13 05:56:52 UTC 2019 Modified Files: src/sys/arch/arm/nvidia: tegra_drm_mode.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/nvidia/tegra_drm_mode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: skrll
Date: Sun Oct 13 05:56:52 UTC 2019
Modified Files:
src/sys/arch/arm/nvidia: tegra_drm_mode.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/nvidia/tegra_drm_mode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_drm_mode.c
diff -u src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.18 src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.19
--- src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.18 Sun Jul 7 10:27:41 2019
+++ src/sys/arch/arm/nvidia/tegra_drm_mode.c Sun Oct 13 05:56:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm_mode.c,v 1.18 2019/07/07 10:27:41 jmcneill Exp $ */
+/* $NetBSD: tegra_drm_mode.c,v 1.19 2019/10/13 05:56:52 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_drm_mode.c,v 1.18 2019/07/07 10:27:41 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm_mode.c,v 1.19 2019/10/13 05:56:52 skrll Exp $");
#include
#include
@@ -699,7 +699,7 @@ tegra_crtc_mode_set_base(struct drm_crtc
struct drm_framebuffer *old_fb)
{
struct tegra_crtc *tegra_crtc = to_tegra_crtc(crtc);
-
+
tegra_crtc_do_set_base(crtc, old_fb, x, y, 0);
/* Commit settings */
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: skrll Date: Sat Sep 28 07:42:47 UTC 2019 Modified Files: src/sys/arch/arm/nvidia: tegra210_pinmux.c tegra_pinmux.c tegra_pinmux.h Log Message: Update tegra_pinmux to support all bindings (pins and pin groups) Update tegra210_pinmux.c with all defined pins and groups. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra210_pinmux.c \ src/sys/arch/arm/nvidia/tegra_pinmux.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra_pinmux.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: skrll
Date: Sat Sep 28 07:42:47 UTC 2019
Modified Files:
src/sys/arch/arm/nvidia: tegra210_pinmux.c tegra_pinmux.c
tegra_pinmux.h
Log Message:
Update tegra_pinmux to support all bindings (pins and pin groups)
Update tegra210_pinmux.c with all defined pins and groups.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra210_pinmux.c \
src/sys/arch/arm/nvidia/tegra_pinmux.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra_pinmux.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra210_pinmux.c
diff -u src/sys/arch/arm/nvidia/tegra210_pinmux.c:1.1 src/sys/arch/arm/nvidia/tegra210_pinmux.c:1.2
--- src/sys/arch/arm/nvidia/tegra210_pinmux.c:1.1 Fri Sep 22 14:36:22 2017
+++ src/sys/arch/arm/nvidia/tegra210_pinmux.c Sat Sep 28 07:42:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra210_pinmux.c,v 1.1 2017/09/22 14:36:22 jmcneill Exp $ */
+/* $NetBSD: tegra210_pinmux.c,v 1.2 2019/09/28 07:42:47 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra210_pinmux.c,v 1.1 2017/09/22 14:36:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra210_pinmux.c,v 1.2 2019/09/28 07:42:47 skrll Exp $");
#include
#include
@@ -36,171 +36,222 @@ __KERNEL_RCSID(0, "$NetBSD: tegra210_pin
#include
+#define TEGRA_PIN(n, r, f1, f2, f3, f4) \
+ {\
+ .tpp_name = n, \
+ .tpp_reg = (r), \
+ .tpp_type = TEGRA_PINMUX,\
+ .tpp_functions = { \
+ f1, f2, f3, f4 \
+ } \
+ }
+
+#define TEGRA_PINGROUP(n, r, drvdn_m, drvup_m, slwrr_m, slwrf_m) \
+ {\
+ .tpp_name = "drive_" n, \
+ .tpp_reg = (r) - 0x8d4, \
+ .tpp_type = TEGRA_PADCTRL,\
+ .tpp_dg = { \
+ .drvdn_mask = drvdn_m,\
+ .drvup_mask = drvup_m,\
+ .slwrr_mask = slwrr_m,\
+ .slwrf_mask = slwrf_m\
+ } \
+ }
+
+// 9.15 Pinmux registers
static const struct tegra_pinmux_pins tegra210_pins[] = {
- { "sdmmc1_clk_pm0", 0x00, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc1_cmd_pm1", 0x04, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc1_dat3_pm2", 0x08, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc1_dat2_pm3", 0x0c, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc1_dat1_pm4", 0x10, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc1_dat0_pm5", 0x14, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc3_clk_pp0", 0x1c, { "sdmmc3", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc3_cmd_pp1", 0x20, { "sdmmc3", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc3_dat0_pp5", 0x24, { "sdmmc3", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc3_dat1_pp4", 0x28, { "sdmmc3", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc3_dat2_pp3", 0x2c, { "sdmmc3", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc3_dat3_pp2", 0x30, { "sdmmc3", "rsvd1", "rsvd2", "rsvd3" } },
- { "pex_l0_rst_n_pa0", 0x38, { "pe0", "rsvd1", "rsvd2", "rsvd3" } },
- { "pex_l0_clkreq_n_pa1", 0x3c, { "pe0", "rsvd1", "rsvd2", "rsvd3" } },
- { "pex_wake_n_pa2", 0x40, { "pe", "rsvd1", "rsvd2", "rsvd3" } },
- { "pex_l1_rst_n_pa3", 0x44, { "pe1", "rsvd1", "rsvd2", "rsvd3" } },
- { "pex_l1_clkreq_n_pa4", 0x48, { "pe1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sata_led_active_pa5", 0x4c, { "sata", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi1_mosi_pc0", 0x50, { "spi1", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi1_miso_pc1", 0x54, { "spi1", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi1_sck_pc2", 0x58, { "spi1", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi1_cs0_pc3", 0x5c, { "spi1", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi1_cs1_pc4", 0x60, { "spi1", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi2_mosi_pb4", 0x64, { "spi2", "dtv", "rsvd2", "rsvd3" } },
- { "spi2_miso_pb5", 0x68, { "spi2", "dtv", "rsvd2", "rsvd3" } },
- { "spi2_sck_pb6", 0x6c, { "spi2", "dtv", "rsvd2", "rsvd3" } },
- { "spi2_cs0_pb7", 0x70, { "spi2", "dtv", "rsvd2", "rsvd3" } },
- { "spi2_cs1_pdd0", 0x74, { "spi2", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi4_mosi_pc7", 0x78, { "spi4", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi4_miso_pd0", 0x7c, { "spi4", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi4_sck_pc5", 0x80, { "spi4", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi4_cs0_pc6", 0x84, { "spi4", "rsvd1", "rsvd2", "rsvd3" } },
- { "qspi_sck_pee0", 0x88, { "qspi", "rsvd1", "rsvd2", "rsvd3" } },
- { "qspi_cs_n_pee1", 0x8c, { "qspi", "rsvd1", "rsvd2", "rsvd3" } },
- { "qspi_io0_pee2", 0x90, { "qspi", "rsvd1", "rsvd2", "rsvd3" } },
- { "qspi_io1_pee3", 0x94, { "qspi", "rsvd1", "rsvd2", "rsvd3" } },
- { "qspi_io2_pee4", 0x98, { "qspi", "rsvd1", "rsvd2", "rsvd3" } },
- { "qspi_io3_pee5", 0x9c, { "qspi", "rsvd1", "rsvd2", "rsvd3" } },
- { "dmic1_clk_pe0", 0xa4, { "dmic1", "i2s3", "rsvd2", "rsvd3" } },
- { "dmic1_dat_pe1", 0xa8, { "dmic1", "i2s3", "rsvd2", "rsvd3" } },
- { "dmic2_clk_pe2", 0xac, { "dmic2", "i
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: skrll Date: Sat Jul 27 14:05:04 UTC 2019 Modified Files: src/sys/arch/arm/nvidia: files.tegra Log Message: Remove unused needs-flag To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/arch/arm/nvidia/files.tegra Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: skrll Date: Sat Jul 27 14:05:04 UTC 2019 Modified Files: src/sys/arch/arm/nvidia: files.tegra Log Message: Remove unused needs-flag To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/arch/arm/nvidia/files.tegra Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/nvidia/files.tegra diff -u src/sys/arch/arm/nvidia/files.tegra:1.49 src/sys/arch/arm/nvidia/files.tegra:1.50 --- src/sys/arch/arm/nvidia/files.tegra:1.49 Sun Jul 8 11:37:50 2018 +++ src/sys/arch/arm/nvidia/files.tegra Sat Jul 27 14:05:04 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.tegra,v 1.49 2018/07/08 11:37:50 jmcneill Exp $ +# $NetBSD: files.tegra,v 1.50 2019/07/27 14:05:04 skrll Exp $ # # Configuration info for NVIDIA Tegra ARM Peripherals # @@ -83,7 +83,7 @@ file arch/arm/nvidia/tegra210_xusbpad.c # UART attach com at fdt with tegra_com -file arch/arm/nvidia/tegra_com.c tegra_com needs-flag +file arch/arm/nvidia/tegra_com.c tegra_com # I2C device tegrai2c: i2cbus, i2cexec
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Sun Jul 7 10:27:41 UTC 2019
Modified Files:
src/sys/arch/arm/nvidia: tegra_drm_mode.c
Log Message:
Register userspace interfaces for our connector
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/nvidia/tegra_drm_mode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_drm_mode.c
diff -u src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.17 src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.18
--- src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.17 Mon Aug 27 15:31:51 2018
+++ src/sys/arch/arm/nvidia/tegra_drm_mode.c Sun Jul 7 10:27:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm_mode.c,v 1.17 2018/08/27 15:31:51 riastradh Exp $ */
+/* $NetBSD: tegra_drm_mode.c,v 1.18 2019/07/07 10:27:41 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_drm_mode.c,v 1.17 2018/08/27 15:31:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm_mode.c,v 1.18 2019/07/07 10:27:41 jmcneill Exp $");
#include
#include
@@ -1191,7 +1191,7 @@ tegra_connector_init(struct drm_device *
if (!connector->ddc)
DRM_ERROR("failed to find ddc device for connector\n");
- return 0;
+ return drm_connector_register(&connector->base);
}
static void
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: jmcneill Date: Sun Jul 7 10:27:41 UTC 2019 Modified Files: src/sys/arch/arm/nvidia: tegra_drm_mode.c Log Message: Register userspace interfaces for our connector To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/nvidia/tegra_drm_mode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
