From 5309859a16a1e88217407f7d9ee2a81e86662f4f Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 7 Nov 2012 16:16:41 +1000 Subject: [PATCH] --- yaml --- r: 345415 b: refs/heads/master c: cbe7270d48670889a88705478a68d000b0bc3f6e h: refs/heads/master i: 345413: 55a65a15ddb80df1f5006d95ace3949a510e7e4e 345411: f2fbde31b19656190fb689f102cfdfc35126cd2e 345407: 08977de7741161b8154cb4c6423b57d9ab6eebee v: v3 --- [refs] | 2 +- .../drivers/gpu/drm/nouveau/core/include/core/object.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0925e93d0cbe..09c909bdc7c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65c78660fbbdac1e4f1d35fad1164d4536463189 +refs/heads/master: cbe7270d48670889a88705478a68d000b0bc3f6e diff --git a/trunk/drivers/gpu/drm/nouveau/core/include/core/object.h b/trunk/drivers/gpu/drm/nouveau/core/include/core/object.h index 48834a9c0f00..eee1c7bca0a3 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/include/core/object.h +++ b/trunk/drivers/gpu/drm/nouveau/core/include/core/object.h @@ -109,19 +109,25 @@ int nouveau_object_del(struct nouveau_object *, u32 parent, u32 handle); void nouveau_object_debug(void); static inline int -nv_call(void *obj, u32 mthd, u32 data) +nv_exec(void *obj, u32 mthd, void *data, u32 size) { struct nouveau_omthds *method = nv_oclass(obj)->omthds; while (method && method->call) { if (method->method == mthd) - return method->call(obj, mthd, &data, sizeof(data)); + return method->call(obj, mthd, data, size); method++; } return -EINVAL; } +static inline int +nv_call(void *obj, u32 mthd, u32 data) +{ + return nv_exec(obj, mthd, &data, sizeof(data)); +} + static inline u8 nv_ro08(void *obj, u64 addr) {