Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/nvif: extend nop ioctl to return nvif version identifier

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:16 +10:00
parent bf81df9be2
commit 99d4d36ad6
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/include/nvif/client.h
View File

@ -6,6 +6,7 @@
struct nvif_client {
struct nvif_object object;
const struct nvif_driver *driver;
u64 version;
u8 route;
bool super;
};

5
drivers/gpu/drm/nouveau/include/nvif/ioctl.h
View File

@ -1,6 +1,8 @@
#ifndef __NVIF_IOCTL_H__
#define __NVIF_IOCTL_H__
#define NVIF_VERSION_LATEST 0x0000000000000000ULL
struct nvif_ioctl_v0 {
__u8 version;
#define NVIF_IOCTL_V0_NOP 0x00
@ -29,7 +31,8 @@ struct nvif_ioctl_v0 {
__u8 data[]; /* ioctl data (below) */
};
struct nvif_ioctl_nop {
struct nvif_ioctl_nop_v0 {
__u64 version;
};
struct nvif_ioctl_sclass_v0 {

9
drivers/gpu/drm/nouveau/nvif/client.c
View File

@ -71,6 +71,10 @@ int
nvif_client_init(const char *driver, const char *name, u64 device,
const char *cfg, const char *dbg, struct nvif_client *client)
{
struct {
struct nvif_ioctl_v0 ioctl;
struct nvif_ioctl_nop_v0 nop;
} args = {};
int ret, i;
ret = nvif_object_init(NULL, 0, 0, NULL, 0, &client->object);
@ -91,6 +95,11 @@ nvif_client_init(const char *driver, const char *name, u64 device,
}
}
if (ret == 0) {
ret = nvif_client_ioctl(client, &args, sizeof(args));
client->version = args.nop.version;
}
if (ret)
nvif_client_fini(client);
return ret;

7
drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
View File

@ -35,13 +35,14 @@ nvkm_ioctl_nop(struct nvkm_handle *handle, void *data, u32 size)
{
struct nvkm_object *object = handle->object;
union {
struct nvif_ioctl_nop none;
struct nvif_ioctl_nop_v0 v0;
} *args = data;
int ret;
nvif_ioctl(object, "nop size %d\n", size);
if (nvif_unvers(args->none)) {
nvif_ioctl(object, "nop\n");
if (nvif_unpack(args->v0, 0, 0, false)) {
nvif_ioctl(object, "nop vers %lld\n", args->v0.version);
args->v0.version = NVIF_VERSION_LATEST;
}
return ret;