Commit 832ca2ac authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: pass handle of vmm object to channel allocation ioctls 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 3c502639

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

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ struct nv50_channel_dma_v0 { 
	__u8  version;

	__u8  chid;

	__u8  pad02[6];

	__u64 vm;

	__u64 vmm;

	__u64 pushbuf;

	__u64 offset;

};

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

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ struct nv50_channel_gpfifo_v0 { 
	__u32 ilength;

	__u64 ioffset;

	__u64 pushbuf;

	__u64 vm;

	__u64 vmm;

};

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ struct g82_channel_dma_v0 { 
	__u8  version;

	__u8  chid;

	__u8  pad02[6];

	__u64 vm;

	__u64 vmm;

	__u64 pushbuf;

	__u64 offset;

};

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

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ struct g82_channel_gpfifo_v0 { 
	__u32 ilength;

	__u64 ioffset;

	__u64 pushbuf;

	__u64 vm;

	__u64 vmm;

};



#define NV826F_V0_NTFY_NON_STALL_INTERRUPT                                 0x00

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ struct fermi_channel_gpfifo_v0 { 
	__u8  pad02[2];

	__u32 ilength;

	__u64 ioffset;

	__u64 vm;

	__u64 vmm;

};



#define NV906F_V0_NTFY_NON_STALL_INTERRUPT                                 0x00