mirror of
https://github.com/torvalds/linux.git
synced 2026-05-02 05:22:49 -04:00
9a0c32d698
nouveau_abi16_ioctl_channel_alloc() and nouveau_cli_init() simply call
their corresponding *_fini() counterpart. This can lead to
nouveau_sched_fini() being called without struct nouveau_sched ever
being initialized in the first place.
Instead of embedding struct nouveau_sched into struct nouveau_cli and
struct nouveau_chan_abi16, allocate struct nouveau_sched separately,
such that we can check for the corresponding pointer to be NULL in the
particular *_fini() functions.
It makes sense to allocate struct nouveau_sched separately anyway, since
in a subsequent commit we can also avoid to allocate a struct
nouveau_sched in nouveau_abi16_ioctl_channel_alloc() at all, if the
VM_BIND uAPI has been disabled due to the legacy uAPI being used.
Fixes: 5f03a507b2 ("drm/nouveau: implement 1:1 scheduler - entity relationship")
Reported-by: Timur Tabi <ttabi@nvidia.com>
Tested-by: Timur Tabi <ttabi@nvidia.com>
Closes: https://lore.kernel.org/nouveau/20240131213917.1545604-1-ttabi@nvidia.com/
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Danilo Krummrich <dakr@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240202000606.3526-1-dakr@redhat.com
76 lines
2.2 KiB
C
76 lines
2.2 KiB
C
/* SPDX-License-Identifier: MIT */
|
|
#ifndef __NOUVEAU_ABI16_H__
|
|
#define __NOUVEAU_ABI16_H__
|
|
|
|
#define ABI16_IOCTL_ARGS \
|
|
struct drm_device *dev, void *data, struct drm_file *file_priv
|
|
|
|
int nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS);
|
|
int nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS);
|
|
int nouveau_abi16_ioctl_channel_free(ABI16_IOCTL_ARGS);
|
|
int nouveau_abi16_ioctl_grobj_alloc(ABI16_IOCTL_ARGS);
|
|
int nouveau_abi16_ioctl_notifierobj_alloc(ABI16_IOCTL_ARGS);
|
|
int nouveau_abi16_ioctl_gpuobj_free(ABI16_IOCTL_ARGS);
|
|
|
|
struct nouveau_abi16_ntfy {
|
|
struct nvif_object object;
|
|
struct list_head head;
|
|
struct nvkm_mm_node *node;
|
|
};
|
|
|
|
struct nouveau_abi16_chan {
|
|
struct list_head head;
|
|
struct nouveau_channel *chan;
|
|
struct nvif_object ce;
|
|
struct list_head notifiers;
|
|
struct nouveau_bo *ntfy;
|
|
struct nouveau_vma *ntfy_vma;
|
|
struct nvkm_mm heap;
|
|
struct nouveau_sched *sched;
|
|
};
|
|
|
|
struct nouveau_abi16 {
|
|
struct nvif_device device;
|
|
struct list_head channels;
|
|
u64 handles;
|
|
};
|
|
|
|
struct nouveau_abi16 *nouveau_abi16_get(struct drm_file *);
|
|
int nouveau_abi16_put(struct nouveau_abi16 *, int);
|
|
void nouveau_abi16_fini(struct nouveau_abi16 *);
|
|
s32 nouveau_abi16_swclass(struct nouveau_drm *);
|
|
int nouveau_abi16_usif(struct drm_file *, void *data, u32 size);
|
|
|
|
#define NOUVEAU_GEM_DOMAIN_VRAM (1 << 1)
|
|
#define NOUVEAU_GEM_DOMAIN_GART (1 << 2)
|
|
|
|
struct drm_nouveau_grobj_alloc {
|
|
int channel;
|
|
uint32_t handle;
|
|
int class;
|
|
};
|
|
|
|
struct drm_nouveau_notifierobj_alloc {
|
|
uint32_t channel;
|
|
uint32_t handle;
|
|
uint32_t size;
|
|
uint32_t offset;
|
|
};
|
|
|
|
struct drm_nouveau_gpuobj_free {
|
|
int channel;
|
|
uint32_t handle;
|
|
};
|
|
|
|
struct drm_nouveau_setparam {
|
|
uint64_t param;
|
|
uint64_t value;
|
|
};
|
|
|
|
#define DRM_IOCTL_NOUVEAU_SETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_SETPARAM, struct drm_nouveau_setparam)
|
|
#define DRM_IOCTL_NOUVEAU_GROBJ_ALLOC DRM_IOW (DRM_COMMAND_BASE + DRM_NOUVEAU_GROBJ_ALLOC, struct drm_nouveau_grobj_alloc)
|
|
#define DRM_IOCTL_NOUVEAU_NOTIFIEROBJ_ALLOC DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_NOTIFIEROBJ_ALLOC, struct drm_nouveau_notifierobj_alloc)
|
|
#define DRM_IOCTL_NOUVEAU_GPUOBJ_FREE DRM_IOW (DRM_COMMAND_BASE + DRM_NOUVEAU_GPUOBJ_FREE, struct drm_nouveau_gpuobj_free)
|
|
|
|
#endif
|