|
 |
60fd626 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
60fd626 |
From: Ben Skeggs <bskeggs@redhat.com>
|
|
|
60fd626 |
Date: Thu, 13 Feb 2020 09:39:34 +1000
|
|
|
60fd626 |
Subject: [PATCH] disp/gv100-: expose capabilities class
|
|
|
60fd626 |
|
|
|
60fd626 |
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
|
|
|
60fd626 |
---
|
|
|
60fd626 |
drivers/gpu/drm/nouveau/include/nvif/class.h | 2 +
|
|
|
60fd626 |
.../gpu/drm/nouveau/nvkm/engine/disp/Kbuild | 2 +
|
|
|
60fd626 |
.../drm/nouveau/nvkm/engine/disp/capsgv100.c | 60 +++++++++++++++++++
|
|
|
60fd626 |
.../drm/nouveau/nvkm/engine/disp/rootgv100.c | 1 +
|
|
|
60fd626 |
.../drm/nouveau/nvkm/engine/disp/rootnv50.h | 3 +
|
|
|
60fd626 |
.../drm/nouveau/nvkm/engine/disp/roottu102.c | 1 +
|
|
|
60fd626 |
6 files changed, 69 insertions(+)
|
|
|
60fd626 |
create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/capsgv100.c
|
|
|
60fd626 |
|
|
|
60fd626 |
diff --git a/drivers/gpu/drm/nouveau/include/nvif/class.h b/drivers/gpu/drm/nouveau/include/nvif/class.h
|
|
|
60fd626 |
index 30659747ffe8..2c79beb41126 100644
|
|
|
60fd626 |
--- a/drivers/gpu/drm/nouveau/include/nvif/class.h
|
|
|
60fd626 |
+++ b/drivers/gpu/drm/nouveau/include/nvif/class.h
|
|
|
60fd626 |
@@ -89,6 +89,8 @@
|
|
|
60fd626 |
#define GV100_DISP /* cl5070.h */ 0x0000c370
|
|
|
60fd626 |
#define TU102_DISP /* cl5070.h */ 0x0000c570
|
|
|
60fd626 |
|
|
|
60fd626 |
+#define GV100_DISP_CAPS 0x0000c373
|
|
|
60fd626 |
+
|
|
|
60fd626 |
#define NV31_MPEG 0x00003174
|
|
|
60fd626 |
#define G82_MPEG 0x00008274
|
|
|
60fd626 |
|
|
|
60fd626 |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
|
|
|
60fd626 |
index 0d584d0da59c..f7af648e0c17 100644
|
|
|
60fd626 |
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
|
|
|
60fd626 |
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
|
|
|
60fd626 |
@@ -74,6 +74,8 @@ nvkm-y += nvkm/engine/disp/rootgp102.o
|
|
|
60fd626 |
nvkm-y += nvkm/engine/disp/rootgv100.o
|
|
|
60fd626 |
nvkm-y += nvkm/engine/disp/roottu102.o
|
|
|
60fd626 |
|
|
|
60fd626 |
+nvkm-y += nvkm/engine/disp/capsgv100.o
|
|
|
60fd626 |
+
|
|
|
60fd626 |
nvkm-y += nvkm/engine/disp/channv50.o
|
|
|
60fd626 |
nvkm-y += nvkm/engine/disp/changf119.o
|
|
|
60fd626 |
nvkm-y += nvkm/engine/disp/changv100.o
|
|
|
60fd626 |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/capsgv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/capsgv100.c
|
|
|
60fd626 |
new file mode 100644
|
|
|
60fd626 |
index 000000000000..5026e530f4bb
|
|
|
60fd626 |
--- /dev/null
|
|
|
60fd626 |
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/capsgv100.c
|
|
|
60fd626 |
@@ -0,0 +1,60 @@
|
|
|
60fd626 |
+/*
|
|
|
60fd626 |
+ * Copyright 2020 Red Hat Inc.
|
|
|
60fd626 |
+ *
|
|
|
60fd626 |
+ * Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
60fd626 |
+ * copy of this software and associated documentation files (the "Software"),
|
|
|
60fd626 |
+ * to deal in the Software without restriction, including without limitation
|
|
|
60fd626 |
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
60fd626 |
+ * and/or sell copies of the Software, and to permit persons to whom the
|
|
|
60fd626 |
+ * Software is furnished to do so, subject to the following conditions:
|
|
|
60fd626 |
+ *
|
|
|
60fd626 |
+ * The above copyright notice and this permission notice shall be included in
|
|
|
60fd626 |
+ * all copies or substantial portions of the Software.
|
|
|
60fd626 |
+ *
|
|
|
60fd626 |
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
60fd626 |
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
60fd626 |
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
60fd626 |
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
|
60fd626 |
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
|
60fd626 |
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
|
60fd626 |
+ * OTHER DEALINGS IN THE SOFTWARE.
|
|
|
60fd626 |
+ */
|
|
|
60fd626 |
+#define gv100_disp_caps(p) container_of((p), struct gv100_disp_caps, object)
|
|
|
60fd626 |
+#include "rootnv50.h"
|
|
|
60fd626 |
+
|
|
|
60fd626 |
+struct gv100_disp_caps {
|
|
|
60fd626 |
+ struct nvkm_object object;
|
|
|
60fd626 |
+ struct nv50_disp *disp;
|
|
|
60fd626 |
+};
|
|
|
60fd626 |
+
|
|
|
60fd626 |
+static int
|
|
|
60fd626 |
+gv100_disp_caps_map(struct nvkm_object *object, void *argv, u32 argc,
|
|
|
60fd626 |
+ enum nvkm_object_map *type, u64 *addr, u64 *size)
|
|
|
60fd626 |
+{
|
|
|
60fd626 |
+ struct gv100_disp_caps *caps = gv100_disp_caps(object);
|
|
|
60fd626 |
+ struct nvkm_device *device = caps->disp->base.engine.subdev.device;
|
|
|
60fd626 |
+ *type = NVKM_OBJECT_MAP_IO;
|
|
|
60fd626 |
+ *addr = 0x640000 + device->func->resource_addr(device, 0);
|
|
|
60fd626 |
+ *size = 0x1000;
|
|
|
60fd626 |
+ return 0;
|
|
|
60fd626 |
+}
|
|
|
60fd626 |
+
|
|
|
60fd626 |
+static const struct nvkm_object_func
|
|
|
60fd626 |
+gv100_disp_caps = {
|
|
|
60fd626 |
+ .map = gv100_disp_caps_map,
|
|
|
60fd626 |
+};
|
|
|
60fd626 |
+
|
|
|
60fd626 |
+int
|
|
|
60fd626 |
+gv100_disp_caps_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,
|
|
|
60fd626 |
+ struct nv50_disp *disp, struct nvkm_object **pobject)
|
|
|
60fd626 |
+{
|
|
|
60fd626 |
+ struct gv100_disp_caps *caps;
|
|
|
60fd626 |
+
|
|
|
60fd626 |
+ if (!(caps = kzalloc(sizeof(*caps), GFP_KERNEL)))
|
|
|
60fd626 |
+ return -ENOMEM;
|
|
|
60fd626 |
+ *pobject = &caps->object;
|
|
|
60fd626 |
+
|
|
|
60fd626 |
+ nvkm_object_ctor(&gv100_disp_caps, oclass, &caps->object);
|
|
|
60fd626 |
+ caps->disp = disp;
|
|
|
60fd626 |
+ return 0;
|
|
|
60fd626 |
+}
|
|
|
60fd626 |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgv100.c
|
|
|
60fd626 |
index 9c658d632d37..47efb48d769a 100644
|
|
|
60fd626 |
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgv100.c
|
|
|
60fd626 |
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgv100.c
|
|
|
60fd626 |
@@ -27,6 +27,7 @@
|
|
|
60fd626 |
static const struct nv50_disp_root_func
|
|
|
60fd626 |
gv100_disp_root = {
|
|
|
60fd626 |
.user = {
|
|
|
60fd626 |
+ {{-1,-1,GV100_DISP_CAPS }, gv100_disp_caps_new },
|
|
|
60fd626 |
{{0,0,GV100_DISP_CURSOR }, gv100_disp_curs_new },
|
|
|
60fd626 |
{{0,0,GV100_DISP_WINDOW_IMM_CHANNEL_DMA}, gv100_disp_wimm_new },
|
|
|
60fd626 |
{{0,0,GV100_DISP_CORE_CHANNEL_DMA }, gv100_disp_core_new },
|
|
|
60fd626 |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h
|
|
|
60fd626 |
index a1f942793f98..7070f5408d92 100644
|
|
|
60fd626 |
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h
|
|
|
60fd626 |
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h
|
|
|
60fd626 |
@@ -24,6 +24,9 @@ int nv50_disp_root_new_(const struct nv50_disp_root_func *, struct nvkm_disp *,
|
|
|
60fd626 |
const struct nvkm_oclass *, void *data, u32 size,
|
|
|
60fd626 |
struct nvkm_object **);
|
|
|
60fd626 |
|
|
|
60fd626 |
+int gv100_disp_caps_new(const struct nvkm_oclass *, void *, u32,
|
|
|
60fd626 |
+ struct nv50_disp *, struct nvkm_object **);
|
|
|
60fd626 |
+
|
|
|
60fd626 |
extern const struct nvkm_disp_oclass nv50_disp_root_oclass;
|
|
|
60fd626 |
extern const struct nvkm_disp_oclass g84_disp_root_oclass;
|
|
|
60fd626 |
extern const struct nvkm_disp_oclass g94_disp_root_oclass;
|
|
|
60fd626 |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/roottu102.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/roottu102.c
|
|
|
60fd626 |
index 579a5d02308a..d8719d38b98a 100644
|
|
|
60fd626 |
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/roottu102.c
|
|
|
60fd626 |
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/roottu102.c
|
|
|
60fd626 |
@@ -27,6 +27,7 @@
|
|
|
60fd626 |
static const struct nv50_disp_root_func
|
|
|
60fd626 |
tu102_disp_root = {
|
|
|
60fd626 |
.user = {
|
|
|
60fd626 |
+ {{-1,-1,GV100_DISP_CAPS }, gv100_disp_caps_new },
|
|
|
60fd626 |
{{0,0,TU102_DISP_CURSOR }, gv100_disp_curs_new },
|
|
|
60fd626 |
{{0,0,TU102_DISP_WINDOW_IMM_CHANNEL_DMA}, gv100_disp_wimm_new },
|
|
|
60fd626 |
{{0,0,TU102_DISP_CORE_CHANNEL_DMA }, gv100_disp_core_new },
|
|
|
60fd626 |
--
|
|
|
60fd626 |
2.26.2
|
|
|
60fd626 |
|