| Message ID | 1391224618-3794-13-git-send-email-acourbot@nvidia.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Sat, Feb 01, 2014 at 12:16:54PM +0900, Alexandre Courbot wrote: > GK20A's FIFO is compatible with NVE0, but only features 128 channels and > 1 runlist. > > Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> > --- > drivers/gpu/drm/nouveau/Makefile | 1 + > drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h | 1 + > drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c | 27 ++++++++++++++++++++++ > drivers/gpu/drm/nouveau/core/include/engine/fifo.h | 1 + > 4 files changed, 30 insertions(+) > create mode 100644 drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c > > diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile > index e88145b..6c4b76d 100644 > --- a/drivers/gpu/drm/nouveau/Makefile > +++ b/drivers/gpu/drm/nouveau/Makefile > @@ -236,6 +236,7 @@ nouveau-y += core/engine/fifo/nv50.o > nouveau-y += core/engine/fifo/nv84.o > nouveau-y += core/engine/fifo/nvc0.o > nouveau-y += core/engine/fifo/nve0.o > +nouveau-y += core/engine/fifo/nvea.o > nouveau-y += core/engine/fifo/nv108.o > nouveau-y += core/engine/graph/ctxnv40.o > nouveau-y += core/engine/graph/ctxnv50.o > diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h > index 014344e..e96b32b 100644 > --- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h > +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h > @@ -8,6 +8,7 @@ int nve0_fifo_ctor(struct nouveau_object *, struct nouveau_object *, > struct nouveau_object **); > void nve0_fifo_dtor(struct nouveau_object *); > int nve0_fifo_init(struct nouveau_object *); > +int nve0_fifo_fini(struct nouveau_object *, bool); > > struct nve0_fifo_impl { > struct nouveau_oclass base; > diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c > new file mode 100644 > index 0000000..16f8905 > --- /dev/null > +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c > @@ -0,0 +1,27 @@ > +/* > + * Copyright (c) 2014, NVIDIA Corporation. All rights reserved. > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. Just stumbled over this lincense header: Generally drm is mit/gpl dual lincensed. The important part for me is the drm core, but due to all the refactoring we tend to do and code extraction from drivers those are rather relevant imo, too. Was this just an oversight or are you still working with your legap people on this? -Daniel
Hi Daniel, On 02/04/2014 06:15 PM, Daniel Vetter wrote: > On Sat, Feb 01, 2014 at 12:16:54PM +0900, Alexandre Courbot wrote: >> GK20A's FIFO is compatible with NVE0, but only features 128 channels and >> 1 runlist. >> >> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> >> --- >> drivers/gpu/drm/nouveau/Makefile | 1 + >> drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h | 1 + >> drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c | 27 ++++++++++++++++++++++ >> drivers/gpu/drm/nouveau/core/include/engine/fifo.h | 1 + >> 4 files changed, 30 insertions(+) >> create mode 100644 drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c >> >> diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile >> index e88145b..6c4b76d 100644 >> --- a/drivers/gpu/drm/nouveau/Makefile >> +++ b/drivers/gpu/drm/nouveau/Makefile >> @@ -236,6 +236,7 @@ nouveau-y += core/engine/fifo/nv50.o >> nouveau-y += core/engine/fifo/nv84.o >> nouveau-y += core/engine/fifo/nvc0.o >> nouveau-y += core/engine/fifo/nve0.o >> +nouveau-y += core/engine/fifo/nvea.o >> nouveau-y += core/engine/fifo/nv108.o >> nouveau-y += core/engine/graph/ctxnv40.o >> nouveau-y += core/engine/graph/ctxnv50.o >> diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h >> index 014344e..e96b32b 100644 >> --- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h >> +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h >> @@ -8,6 +8,7 @@ int nve0_fifo_ctor(struct nouveau_object *, struct nouveau_object *, >> struct nouveau_object **); >> void nve0_fifo_dtor(struct nouveau_object *); >> int nve0_fifo_init(struct nouveau_object *); >> +int nve0_fifo_fini(struct nouveau_object *, bool); >> >> struct nve0_fifo_impl { >> struct nouveau_oclass base; >> diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c >> new file mode 100644 >> index 0000000..16f8905 >> --- /dev/null >> +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c >> @@ -0,0 +1,27 @@ >> +/* >> + * Copyright (c) 2014, NVIDIA Corporation. All rights reserved. >> + * >> + * This program is free software; you can redistribute it and/or modify it >> + * under the terms and conditions of the GNU General Public License, >> + * version 2, as published by the Free Software Foundation. > > Just stumbled over this lincense header: Generally drm is mit/gpl dual > lincensed. The important part for me is the drm core, but due to all the > refactoring we tend to do and code extraction from drivers those are > rather relevant imo, too. Was this just an oversight or are you still > working with your legap people on this? Thanks for pointing this out. This was an oversight on my part indeed. The following revisions will use the correct MIT copyright header. In case someone wants to contribute significant fixes to this patchset, please be aware that MIT is the license that will apply from now on. Thanks, Alex. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile index e88145b..6c4b76d 100644 --- a/drivers/gpu/drm/nouveau/Makefile +++ b/drivers/gpu/drm/nouveau/Makefile @@ -236,6 +236,7 @@ nouveau-y += core/engine/fifo/nv50.o nouveau-y += core/engine/fifo/nv84.o nouveau-y += core/engine/fifo/nvc0.o nouveau-y += core/engine/fifo/nve0.o +nouveau-y += core/engine/fifo/nvea.o nouveau-y += core/engine/fifo/nv108.o nouveau-y += core/engine/graph/ctxnv40.o nouveau-y += core/engine/graph/ctxnv50.o diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h index 014344e..e96b32b 100644 --- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h @@ -8,6 +8,7 @@ int nve0_fifo_ctor(struct nouveau_object *, struct nouveau_object *, struct nouveau_object **); void nve0_fifo_dtor(struct nouveau_object *); int nve0_fifo_init(struct nouveau_object *); +int nve0_fifo_fini(struct nouveau_object *, bool); struct nve0_fifo_impl { struct nouveau_oclass base; diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c new file mode 100644 index 0000000..16f8905 --- /dev/null +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2014, NVIDIA Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + */ + +#include "nve0.h" + +struct nouveau_oclass * +nvea_fifo_oclass = &(struct nve0_fifo_impl) { + .base.handle = NV_ENGINE(FIFO, 0xea), + .base.ofuncs = &(struct nouveau_ofuncs) { + .ctor = nve0_fifo_ctor, + .dtor = nve0_fifo_dtor, + .init = nve0_fifo_init, + .fini = nve0_fifo_fini, + }, + .channels = 128, +}.base; diff --git a/drivers/gpu/drm/nouveau/core/include/engine/fifo.h b/drivers/gpu/drm/nouveau/core/include/engine/fifo.h index 26b6b2b..823356f 100644 --- a/drivers/gpu/drm/nouveau/core/include/engine/fifo.h +++ b/drivers/gpu/drm/nouveau/core/include/engine/fifo.h @@ -109,6 +109,7 @@ extern struct nouveau_oclass *nv50_fifo_oclass; extern struct nouveau_oclass *nv84_fifo_oclass; extern struct nouveau_oclass *nvc0_fifo_oclass; extern struct nouveau_oclass *nve0_fifo_oclass; +extern struct nouveau_oclass *nvea_fifo_oclass; extern struct nouveau_oclass *nv108_fifo_oclass; void nv04_fifo_intr(struct nouveau_subdev *);
GK20A's FIFO is compatible with NVE0, but only features 128 channels and 1 runlist. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> --- drivers/gpu/drm/nouveau/Makefile | 1 + drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h | 1 + drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c | 27 ++++++++++++++++++++++ drivers/gpu/drm/nouveau/core/include/engine/fifo.h | 1 + 4 files changed, 30 insertions(+) create mode 100644 drivers/gpu/drm/nouveau/core/engine/fifo/nvea.c