* [PATCH] drm/nouveau: remove >1 sclass support from nouveau_parent_create_
@ 2012-10-07 22:49 Marcin Slusarz
[not found] ` <1349650171-25045-4-git-send-email-marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: Marcin Slusarz @ 2012-10-07 22:49 UTC (permalink / raw)
To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
It's unused (only one codepath passes sclass at all and it's always one),
broken (overwrites the same field, leaking previous one) and confusing.
Signed-off-by: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/gpu/drm/nouveau/core/core/client.c | 2 +-
drivers/gpu/drm/nouveau/core/core/parent.c | 3 +--
drivers/gpu/drm/nouveau/core/include/subdev/device.h | 2 +-
drivers/gpu/drm/nouveau/core/subdev/device/base.c | 6 +++---
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/core/core/client.c b/drivers/gpu/drm/nouveau/core/core/client.c
index c617f04..87850ec 100644
--- a/drivers/gpu/drm/nouveau/core/core/client.c
+++ b/drivers/gpu/drm/nouveau/core/core/client.c
@@ -58,7 +58,7 @@ nouveau_client_create_(const char *name, u64 devname, const char *cfg,
return -ENODEV;
ret = nouveau_namedb_create_(NULL, NULL, &nouveau_client_oclass,
- NV_CLIENT_CLASS, nouveau_device_sclass,
+ NV_CLIENT_CLASS, &nouveau_device_sclass,
0, length, pobject);
client = *pobject;
if (ret)
diff --git a/drivers/gpu/drm/nouveau/core/core/parent.c b/drivers/gpu/drm/nouveau/core/core/parent.c
index 0e7733c..1a48e58 100644
--- a/drivers/gpu/drm/nouveau/core/core/parent.c
+++ b/drivers/gpu/drm/nouveau/core/core/parent.c
@@ -85,7 +85,7 @@ nouveau_parent_create_(struct nouveau_object *parent,
if (ret)
return ret;
- while (sclass && sclass->ofuncs) {
+ if (sclass && sclass->ofuncs) {
nclass = kzalloc(sizeof(*nclass), GFP_KERNEL);
if (!nclass)
return -ENOMEM;
@@ -94,7 +94,6 @@ nouveau_parent_create_(struct nouveau_object *parent,
object->sclass = nclass;
nclass->engine = engine ? nv_engine(engine) : NULL;
nclass->oclass = sclass;
- sclass++;
}
object->engine = engcls;
diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/device.h b/drivers/gpu/drm/nouveau/core/include/subdev/device.h
index c9e4c4a..0966f33 100644
--- a/drivers/gpu/drm/nouveau/core/include/subdev/device.h
+++ b/drivers/gpu/drm/nouveau/core/include/subdev/device.h
@@ -18,7 +18,7 @@ int nv50_identify(struct nouveau_device *);
int nvc0_identify(struct nouveau_device *);
int nve0_identify(struct nouveau_device *);
-extern struct nouveau_oclass nouveau_device_sclass[];
+extern struct nouveau_oclass nouveau_device_sclass;
struct nouveau_device *nouveau_device_find(u64 name);
#endif
diff --git a/drivers/gpu/drm/nouveau/core/subdev/device/base.c b/drivers/gpu/drm/nouveau/core/subdev/device/base.c
index 2cec8a8..352a940 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/device/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/device/base.c
@@ -409,9 +409,9 @@ nouveau_devobj_ofuncs = {
* nouveau_device: engine functions
*****************************************************************************/
struct nouveau_oclass
-nouveau_device_sclass[] = {
- { 0x0080, &nouveau_devobj_ofuncs },
- {}
+nouveau_device_sclass = {
+ .handle = 0x0080,
+ .ofuncs = &nouveau_devobj_ofuncs,
};
static void
--
1.7.12
^ permalink raw reply related [flat|nested] 4+ messages in thread[parent not found: <1349650171-25045-4-git-send-email-marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH] drm/nouveau: remove >1 sclass support from nouveau_parent_create_ [not found] ` <1349650171-25045-4-git-send-email-marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2012-10-08 1:06 ` Ben Skeggs [not found] ` <20121008010646.GB4197-6RkuLLNOGXsZ315U/fw+0NvLeJWuRmrY@public.gmane.org> 0 siblings, 1 reply; 4+ messages in thread From: Ben Skeggs @ 2012-10-08 1:06 UTC (permalink / raw) To: Marcin Slusarz; +Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW On Mon, Oct 08, 2012 at 12:49:30AM +0200, Marcin Slusarz wrote: > It's unused (only one codepath passes sclass at all and it's always one), > broken (overwrites the same field, leaking previous one) and confusing. It's only *currently* unused, I have WIP code in branches that uses it, otherwise it wouldn't still exist :) I will take a look today at the claims it's broken, it wasn't at some point but may have got busted along the way somehow. Thanks! Ben. > > Signed-off-by: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > --- > drivers/gpu/drm/nouveau/core/core/client.c | 2 +- > drivers/gpu/drm/nouveau/core/core/parent.c | 3 +-- > drivers/gpu/drm/nouveau/core/include/subdev/device.h | 2 +- > drivers/gpu/drm/nouveau/core/subdev/device/base.c | 6 +++--- > 4 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/core/core/client.c b/drivers/gpu/drm/nouveau/core/core/client.c > index c617f04..87850ec 100644 > --- a/drivers/gpu/drm/nouveau/core/core/client.c > +++ b/drivers/gpu/drm/nouveau/core/core/client.c > @@ -58,7 +58,7 @@ nouveau_client_create_(const char *name, u64 devname, const char *cfg, > return -ENODEV; > > ret = nouveau_namedb_create_(NULL, NULL, &nouveau_client_oclass, > - NV_CLIENT_CLASS, nouveau_device_sclass, > + NV_CLIENT_CLASS, &nouveau_device_sclass, > 0, length, pobject); > client = *pobject; > if (ret) > diff --git a/drivers/gpu/drm/nouveau/core/core/parent.c b/drivers/gpu/drm/nouveau/core/core/parent.c > index 0e7733c..1a48e58 100644 > --- a/drivers/gpu/drm/nouveau/core/core/parent.c > +++ b/drivers/gpu/drm/nouveau/core/core/parent.c > @@ -85,7 +85,7 @@ nouveau_parent_create_(struct nouveau_object *parent, > if (ret) > return ret; > > - while (sclass && sclass->ofuncs) { > + if (sclass && sclass->ofuncs) { > nclass = kzalloc(sizeof(*nclass), GFP_KERNEL); > if (!nclass) > return -ENOMEM; > @@ -94,7 +94,6 @@ nouveau_parent_create_(struct nouveau_object *parent, > object->sclass = nclass; > nclass->engine = engine ? nv_engine(engine) : NULL; > nclass->oclass = sclass; > - sclass++; > } > > object->engine = engcls; > diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/device.h b/drivers/gpu/drm/nouveau/core/include/subdev/device.h > index c9e4c4a..0966f33 100644 > --- a/drivers/gpu/drm/nouveau/core/include/subdev/device.h > +++ b/drivers/gpu/drm/nouveau/core/include/subdev/device.h > @@ -18,7 +18,7 @@ int nv50_identify(struct nouveau_device *); > int nvc0_identify(struct nouveau_device *); > int nve0_identify(struct nouveau_device *); > > -extern struct nouveau_oclass nouveau_device_sclass[]; > +extern struct nouveau_oclass nouveau_device_sclass; > struct nouveau_device *nouveau_device_find(u64 name); > > #endif > diff --git a/drivers/gpu/drm/nouveau/core/subdev/device/base.c b/drivers/gpu/drm/nouveau/core/subdev/device/base.c > index 2cec8a8..352a940 100644 > --- a/drivers/gpu/drm/nouveau/core/subdev/device/base.c > +++ b/drivers/gpu/drm/nouveau/core/subdev/device/base.c > @@ -409,9 +409,9 @@ nouveau_devobj_ofuncs = { > * nouveau_device: engine functions > *****************************************************************************/ > struct nouveau_oclass > -nouveau_device_sclass[] = { > - { 0x0080, &nouveau_devobj_ofuncs }, > - {} > +nouveau_device_sclass = { > + .handle = 0x0080, > + .ofuncs = &nouveau_devobj_ofuncs, > }; > > static void > -- > 1.7.12 > > _______________________________________________ > Nouveau mailing list > Nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > http://lists.freedesktop.org/mailman/listinfo/nouveau ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <20121008010646.GB4197-6RkuLLNOGXsZ315U/fw+0NvLeJWuRmrY@public.gmane.org>]
* Re: [PATCH] drm/nouveau: remove >1 sclass support from nouveau_parent_create_ [not found] ` <20121008010646.GB4197-6RkuLLNOGXsZ315U/fw+0NvLeJWuRmrY@public.gmane.org> @ 2012-10-08 23:02 ` Marcin Slusarz [not found] ` <20121008230208.GE3103-OI9uyE9O0yo@public.gmane.org> 0 siblings, 1 reply; 4+ messages in thread From: Marcin Slusarz @ 2012-10-08 23:02 UTC (permalink / raw) To: Ben Skeggs; +Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW On Mon, Oct 08, 2012 at 11:06:46AM +1000, Ben Skeggs wrote: > On Mon, Oct 08, 2012 at 12:49:30AM +0200, Marcin Slusarz wrote: > > It's unused (only one codepath passes sclass at all and it's always one), > > broken (overwrites the same field, leaking previous one) and confusing. > It's only *currently* unused, I have WIP code in branches that uses it, > otherwise it wouldn't still exist :) Yeah, like _nouveau_parent_ctor :P > I will take a look today at the claims it's broken, it wasn't at some > point but may have got busted along the way somehow. Oh, it chains them in list... /me hides. Marcin ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <20121008230208.GE3103-OI9uyE9O0yo@public.gmane.org>]
* Re: [PATCH] drm/nouveau: remove >1 sclass support from nouveau_parent_create_ [not found] ` <20121008230208.GE3103-OI9uyE9O0yo@public.gmane.org> @ 2012-10-09 0:05 ` Ben Skeggs 0 siblings, 0 replies; 4+ messages in thread From: Ben Skeggs @ 2012-10-09 0:05 UTC (permalink / raw) To: Marcin Slusarz; +Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW On Tue, Oct 09, 2012 at 01:02:08AM +0200, Marcin Slusarz wrote: > On Mon, Oct 08, 2012 at 11:06:46AM +1000, Ben Skeggs wrote: > > On Mon, Oct 08, 2012 at 12:49:30AM +0200, Marcin Slusarz wrote: > > > It's unused (only one codepath passes sclass at all and it's always one), > > > broken (overwrites the same field, leaking previous one) and confusing. > > It's only *currently* unused, I have WIP code in branches that uses it, > > otherwise it wouldn't still exist :) > > Yeah, like _nouveau_parent_ctor :P Point taken :P > > > I will take a look today at the claims it's broken, it wasn't at some > > point but may have got busted along the way somehow. > > Oh, it chains them in list... > > /me hides. Hehe :) Ben. > > Marcin ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-09 0:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-07 22:49 [PATCH] drm/nouveau: remove >1 sclass support from nouveau_parent_create_ Marcin Slusarz
[not found] ` <1349650171-25045-4-git-send-email-marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-10-08 1:06 ` Ben Skeggs
[not found] ` <20121008010646.GB4197-6RkuLLNOGXsZ315U/fw+0NvLeJWuRmrY@public.gmane.org>
2012-10-08 23:02 ` Marcin Slusarz
[not found] ` <20121008230208.GE3103-OI9uyE9O0yo@public.gmane.org>
2012-10-09 0:05 ` Ben Skeggs
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.