Commit 59f216cf authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: rip out nvkm_client.super 



No longer required now that userspace can't touch anything that might
need it, and should fix DRM MM operations racing with each other, and
the random hangs/crashes that come with that.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 148a8653

drivers/gpu/drm/nouveau/include/nvif/client.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ struct nvif_client { 
	const struct nvif_driver *driver;

	u64 version;

	u8 route;

	bool super;

};



int  nvif_client_ctor(struct nvif_client *parent, const char *name, u64 device,

drivers/gpu/drm/nouveau/include/nvif/driver.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ struct nvif_driver { 
	void (*fini)(void *priv);

	int (*suspend)(void *priv);

	int (*resume)(void *priv);

	int (*ioctl)(void *priv, bool super, void *data, u32 size, void **hack);

	int (*ioctl)(void *priv, void *data, u32 size, void **hack);

	void __iomem *(*map)(void *priv, u64 handle, u32 size);

	void (*unmap)(void *priv, void __iomem *ptr, u32 size);

	bool keep;

drivers/gpu/drm/nouveau/include/nvkm/core/client.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ struct nvkm_client { 
	struct nvkm_client_notify *notify[32];

	struct rb_root objroot;



	bool super;

	void *data;

	int (*ntfy)(const void *, u32, const void *, u32);

drivers/gpu/drm/nouveau/include/nvkm/core/ioctl.h

+1 −1
Original line number Diff line number Diff line
@@ -4,5 +4,5 @@ 
#include <core/os.h>

struct nvkm_client;



int nvkm_ioctl(struct nvkm_client *, bool, void *, u32, void **);

int nvkm_ioctl(struct nvkm_client *, void *, u32, void **);

#endif

drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ struct nvkm_vma { 
	u8   refd:3; /* Current page type (index, or NONE for unreferenced). */

	bool used:1; /* Region allocated. */

	bool part:1; /* Region was split from an allocated region by map(). */

	bool user:1; /* Region user-allocated. */

	bool busy:1; /* Region busy (for temporarily preventing user access). */

	bool mapped:1; /* Region contains valid pages. */

	struct nvkm_memory *memory; /* Memory currently mapped into VMA. */