From: Vince Hsu <vinceh@nvidia.com>
To: thierry.reding@gmail.com, swarren@wwwdotorg.org,
gnurou@gmail.com, bskeggs@redhat.com, martin.peres@free.fr,
seven@nimrod-online.com, samuel.pitoiset@gmail.com
Cc: nouveau@lists.freedesktop.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org, Vince Hsu <vinceh@nvidia.com>
Subject: [PATCH nouveau 08/11] instmem: add dummy support for GK20A
Date: Tue, 23 Dec 2014 18:40:01 +0800 [thread overview]
Message-ID: <1419331204-26679-9-git-send-email-vinceh@nvidia.com> (raw)
In-Reply-To: <1419331204-26679-1-git-send-email-vinceh@nvidia.com>
This is a workaround to avoid the instmem backup/restore during the suspend
and resume process in nv50 instemem driver.
Signed-off-by: Vince Hsu <vinceh@nvidia.com>
---
drm/Kbuild | 1 +
nvkm/engine/device/nve0.c | 2 +-
nvkm/include/subdev/instmem.h | 1 +
nvkm/subdev/instmem/gk20a.c | 70 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 73 insertions(+), 1 deletion(-)
create mode 100644 nvkm/subdev/instmem/gk20a.c
diff --git a/drm/Kbuild b/drm/Kbuild
index 6461e3565afe..ea40cd653c7c 100644
--- a/drm/Kbuild
+++ b/drm/Kbuild
@@ -176,6 +176,7 @@ nouveau-y += core/subdev/instmem/base.o
nouveau-y += core/subdev/instmem/nv04.o
nouveau-y += core/subdev/instmem/nv40.o
nouveau-y += core/subdev/instmem/nv50.o
+nouveau-y += core/subdev/instmem/gk20a.o
nouveau-y += core/subdev/ltc/base.o
nouveau-y += core/subdev/ltc/gf100.o
nouveau-y += core/subdev/ltc/gk104.o
diff --git a/nvkm/engine/device/nve0.c b/nvkm/engine/device/nve0.c
index 732922690653..fcbdc5259c7c 100644
--- a/nvkm/engine/device/nve0.c
+++ b/nvkm/engine/device/nve0.c
@@ -170,7 +170,7 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_FB ] = gk20a_fb_oclass;
device->oclass[NVDEV_SUBDEV_LTC ] = gk104_ltc_oclass;
device->oclass[NVDEV_SUBDEV_IBUS ] = &gk20a_ibus_oclass;
- device->oclass[NVDEV_SUBDEV_INSTMEM] = nv50_instmem_oclass;
+ device->oclass[NVDEV_SUBDEV_INSTMEM] = gk20a_instmem_oclass;
device->oclass[NVDEV_SUBDEV_VM ] = &nvc0_vmmgr_oclass;
device->oclass[NVDEV_SUBDEV_BAR ] = &gk20a_bar_oclass;
device->oclass[NVDEV_ENGINE_DMAOBJ ] = nvd0_dmaeng_oclass;
diff --git a/nvkm/include/subdev/instmem.h b/nvkm/include/subdev/instmem.h
index c1df26f3230c..6264660bedce 100644
--- a/nvkm/include/subdev/instmem.h
+++ b/nvkm/include/subdev/instmem.h
@@ -48,5 +48,6 @@ nouveau_instmem(void *obj)
extern struct nouveau_oclass *nv04_instmem_oclass;
extern struct nouveau_oclass *nv40_instmem_oclass;
extern struct nouveau_oclass *nv50_instmem_oclass;
+extern struct nouveau_oclass *gk20a_instmem_oclass;
#endif
diff --git a/nvkm/subdev/instmem/gk20a.c b/nvkm/subdev/instmem/gk20a.c
new file mode 100644
index 000000000000..5e072d6e743f
--- /dev/null
+++ b/nvkm/subdev/instmem/gk20a.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "nv50.h"
+#include "priv.h"
+
+static int
+gk20a_instmem_fini(struct nouveau_object *object, bool suspend)
+{
+ struct nouveau_instmem *imem = (void *)object;
+
+ return nouveau_subdev_fini(&imem->base, suspend);
+}
+
+static int
+gk20a_instmem_init(struct nouveau_object *object)
+{
+ struct nouveau_instmem *imem = (void *)object;
+
+ return nouveau_subdev_init(&imem->base);
+}
+
+static int
+gk20a_instmem_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
+ struct nouveau_oclass *oclass, void *data, u32 size,
+ struct nouveau_object **pobject)
+{
+ struct nv50_instmem_priv *priv;
+ int ret;
+
+ ret = nouveau_instmem_create(parent, engine, oclass, &priv);
+ *pobject = nv_object(priv);
+ if (ret)
+ return ret;
+
+ spin_lock_init(&priv->lock);
+ return 0;
+}
+
+struct nouveau_oclass *
+gk20a_instmem_oclass = &(struct nouveau_instmem_impl) {
+ .base.handle = NV_SUBDEV(INSTMEM, 0x50),
+ .base.ofuncs = &(struct nouveau_ofuncs) {
+ .ctor = gk20a_instmem_ctor,
+ .dtor = _nouveau_instmem_dtor,
+ .init = gk20a_instmem_init,
+ .fini = gk20a_instmem_fini,
+ },
+ .instobj = &nv50_instobj_oclass.base,
+}.base;
--
1.9.1
next prev parent reply other threads:[~2014-12-23 10:40 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-23 10:39 [PATCH 0/11] Add suspend/resume support for GK20A Vince Hsu
2014-12-23 10:39 ` [PATCH 1/11] ARM: tegra: add function to control the GPU rail clamp Vince Hsu
2014-12-24 13:16 ` Lucas Stach
2014-12-25 2:28 ` Vince Hsu
2014-12-25 20:34 ` Lucas Stach
2014-12-29 2:49 ` Vince Hsu
2014-12-30 16:42 ` Lucas Stach
2015-01-05 6:55 ` Vince Hsu
2015-01-05 15:09 ` Thierry Reding
2015-01-06 2:11 ` Vince Hsu
2015-01-06 11:15 ` Thierry Reding
2015-01-06 12:03 ` Vince Hsu
2015-01-06 13:29 ` Thierry Reding
2015-01-06 13:51 ` Vince Hsu
2015-01-06 14:23 ` Thierry Reding
2015-01-07 10:19 ` Peter De Schrijver
2015-01-07 10:49 ` Vince Hsu
2015-01-07 13:27 ` Thierry Reding
2015-01-07 14:08 ` Peter De Schrijver
2015-01-07 14:28 ` Vince Hsu
2015-01-07 14:48 ` Thierry Reding
2015-01-08 4:25 ` Vince Hsu
2015-01-08 8:03 ` Thierry Reding
2015-01-07 14:12 ` Peter De Schrijver
2015-01-07 14:19 ` Vince Hsu
2015-01-07 15:12 ` Thierry Reding
2015-01-08 4:23 ` Vince Hsu
2015-01-08 9:32 ` Peter De Schrijver
2015-01-08 11:41 ` Thierry Reding
2015-01-08 12:41 ` Peter De Schrijver
2015-01-08 9:39 ` Peter De Schrijver
2015-01-08 11:44 ` Thierry Reding
2014-12-24 13:52 ` Dmitry Osipenko
2014-12-25 2:05 ` Vince Hsu
2014-12-23 10:39 ` [PATCH 2/11] memory: tegra: add mc flush support Vince Hsu
2015-01-06 14:18 ` Thierry Reding
2015-01-07 10:08 ` Peter De Schrijver
2015-01-07 13:34 ` Thierry Reding
2014-12-23 10:39 ` [PATCH 3/11] memory: tegra: add flush operation for Tegra124 memory clients Vince Hsu
2015-01-06 14:30 ` Thierry Reding
2015-01-06 15:07 ` Vince Hsu
2015-01-06 15:27 ` Thierry Reding
2015-01-06 15:53 ` Vince Hsu
2014-12-23 10:39 ` [PATCH 4/11] ARM: tegra: add mc node for Tegra124 GPU Vince Hsu
2014-12-23 10:39 ` [PATCH nouveau 05/11] platform: switch to the new gpu rail clamping function Vince Hsu
2014-12-23 10:39 ` [PATCH nouveau 06/11] platform: complete the power up/down sequence Vince Hsu
2014-12-24 13:23 ` Lucas Stach
2014-12-25 2:42 ` Vince Hsu
2015-01-05 15:25 ` Thierry Reding
2015-01-06 9:34 ` Vince Hsu
2015-01-06 11:36 ` Thierry Reding
2015-01-06 12:13 ` Vince Hsu
2015-01-06 13:55 ` Thierry Reding
2015-01-06 14:19 ` Vince Hsu
2015-01-06 14:24 ` Thierry Reding
2014-12-23 10:40 ` [PATCH nouveau 07/11] instmem: make nv50_instmem_priv public Vince Hsu
2014-12-23 10:40 ` Vince Hsu [this message]
2014-12-23 16:39 ` [Nouveau] [PATCH nouveau 08/11] instmem: add dummy support for GK20A Ilia Mirkin
2014-12-24 2:44 ` Vince Hsu
2014-12-23 10:40 ` [PATCH nouveau 09/11] drm: export some variable and functions to resue the PM functions Vince Hsu
2014-12-30 2:34 ` [Nouveau] " Emil Velikov
2014-12-30 3:18 ` Vince Hsu
2015-01-05 15:32 ` Thierry Reding
2015-01-05 19:50 ` Alexandre Courbot
2015-01-06 9:36 ` Vince Hsu
2015-01-06 11:49 ` Thierry Reding
2015-01-06 12:27 ` Vince Hsu
2015-01-06 14:37 ` Thierry Reding
2015-01-06 14:44 ` Ilia Mirkin
2015-01-06 14:50 ` Thierry Reding
2015-01-06 15:03 ` Ilia Mirkin
2015-01-06 15:35 ` Thierry Reding
2014-12-23 10:40 ` [PATCH nouveau 10/11] platform: add suspend/resume support Vince Hsu
2014-12-23 10:40 ` [PATCH nouveau 11/11] platform: add PM runtime " Vince Hsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1419331204-26679-9-git-send-email-vinceh@nvidia.com \
--to=vinceh@nvidia.com \
--cc=bskeggs@redhat.com \
--cc=gnurou@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=martin.peres@free.fr \
--cc=nouveau@lists.freedesktop.org \
--cc=samuel.pitoiset@gmail.com \
--cc=seven@nimrod-online.com \
--cc=swarren@wwwdotorg.org \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).