drm/nouveau/core: uninline subdev/engine/device lookup functions (a38f37a7) · Commits · 戴 / test

drivers/gpu/drm/nouveau/core/core/engine.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,15 @@
		#include <core/engine.h>
		#include <core/option.h>

		struct nouveau_engine *
		nouveau_engine(void *obj, int sub)
		{
		struct nouveau_subdev *subdev = nouveau_subdev(obj, sub);
		if (subdev && nv_iclass(subdev, NV_ENGINE_CLASS))
		return nv_engine(subdev);
		return NULL;
		}

		int
		nouveau_engine_create_(struct nouveau_object *parent,
		struct nouveau_object *engobj,

+8 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,14 @@
		#include <core/device.h>
		#include <core/option.h>

		struct nouveau_subdev *
		nouveau_subdev(void *obj, int sub)
		{
		if (nv_device(obj)->subdev[sub])
		return nv_subdev(nv_device(obj)->subdev[sub]);
		return NULL;
		}

		void
		nouveau_subdev_reset(struct nouveau_object *subdev)
		{

+22 −0

Original line number	Diff line number	Diff line
		@@ -508,6 +508,28 @@ nouveau_devobj_ofuncs = {
		* nouveau_device: engine functions
		*****************************************************************************/

		struct nouveau_device *
		nv_device(void *obj)
		{
		struct nouveau_object *object = nv_object(obj);
		struct nouveau_object *device = object;

		if (device->engine)
		device = device->engine;
		if (device->parent)
		device = device->parent;

		#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
		if (unlikely(!nv_iclass(device, NV_SUBDEV_CLASS) \|\|
		(nv_hclass(device) & 0xff) != NVDEV_ENGINE_DEVICE)) {
		nv_assert("BAD CAST -> NvDevice, 0x%08x 0x%08x",
		nv_hclass(object), nv_hclass(device));
		}
		#endif

		return (void *)device;
		}

		static struct nouveau_oclass
		nouveau_device_sclass[] = {
		{ 0x0080, &nouveau_devobj_ofuncs },

+1 −38

Original line number	Diff line number	Diff line
		@@ -105,44 +105,7 @@ struct nouveau_device {

		int nouveau_device_list(u64 *name, int size);

		static inline struct nouveau_device *
		nv_device(void *obj)
		{
		struct nouveau_object *object = nv_object(obj);
		struct nouveau_object *device = object;

		if (device->engine)
		device = device->engine;
		if (device->parent)
		device = device->parent;

		#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
		if (unlikely(!nv_iclass(device, NV_SUBDEV_CLASS) \|\|
		(nv_hclass(device) & 0xff) != NVDEV_ENGINE_DEVICE)) {
		nv_assert("BAD CAST -> NvDevice, 0x%08x 0x%08x",
		nv_hclass(object), nv_hclass(device));
		}
		#endif

		return (void *)device;
		}

		static inline struct nouveau_subdev *
		nouveau_subdev(void *obj, int sub)
		{
		if (nv_device(obj)->subdev[sub])
		return nv_subdev(nv_device(obj)->subdev[sub]);
		return NULL;
		}

		static inline struct nouveau_engine *
		nouveau_engine(void *obj, int sub)
		{
		struct nouveau_subdev *subdev = nouveau_subdev(obj, sub);
		if (subdev && nv_iclass(subdev, NV_ENGINE_CLASS))
		return nv_engine(subdev);
		return NULL;
		}
		struct nouveau_device nv_device(void obj);

		static inline bool
		nv_device_match(struct nouveau_object *object, u16 dev, u16 ven, u16 sub)

+2 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,8 @@ nv_engidx(struct nouveau_object *object)
		return nv_subidx(object);
		}

		struct nouveau_engine nouveau_engine(void obj, int idx);

		#define nouveau_engine_create(p,e,c,d,i,f,r) \
		nouveau_engine_create_((p), (e), (c), (d), (i), (f), \
		sizeof(r),(void )r)