diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-11-24 21:39:01 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-11-25 00:31:21 -0500 |
commit | 0d7fc24616d3aa7b6d4aad03bac25ec23a74b9a6 (patch) | |
tree | fe8398cde8ff7f57f01e6f20aa7a305bcb437f06 | |
parent | 2fb2b3c6e49a9dc1ed39631ae977b62a273b5a57 (diff) |
drm/nouveau/gr/gf100-: fix oops when calling zbc methods
Somehow missed these two when removing dodgy void casts during the
rework.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c index 7cdea770fc4c..9f5dfc85147a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | |||
@@ -143,7 +143,7 @@ gf100_gr_zbc_depth_get(struct gf100_gr *gr, int format, | |||
143 | static int | 143 | static int |
144 | gf100_fermi_mthd_zbc_color(struct nvkm_object *object, void *data, u32 size) | 144 | gf100_fermi_mthd_zbc_color(struct nvkm_object *object, void *data, u32 size) |
145 | { | 145 | { |
146 | struct gf100_gr *gr = (void *)object->engine; | 146 | struct gf100_gr *gr = gf100_gr(nvkm_gr(object->engine)); |
147 | union { | 147 | union { |
148 | struct fermi_a_zbc_color_v0 v0; | 148 | struct fermi_a_zbc_color_v0 v0; |
149 | } *args = data; | 149 | } *args = data; |
@@ -189,7 +189,7 @@ gf100_fermi_mthd_zbc_color(struct nvkm_object *object, void *data, u32 size) | |||
189 | static int | 189 | static int |
190 | gf100_fermi_mthd_zbc_depth(struct nvkm_object *object, void *data, u32 size) | 190 | gf100_fermi_mthd_zbc_depth(struct nvkm_object *object, void *data, u32 size) |
191 | { | 191 | { |
192 | struct gf100_gr *gr = (void *)object->engine; | 192 | struct gf100_gr *gr = gf100_gr(nvkm_gr(object->engine)); |
193 | union { | 193 | union { |
194 | struct fermi_a_zbc_depth_v0 v0; | 194 | struct fermi_a_zbc_depth_v0 v0; |
195 | } *args = data; | 195 | } *args = data; |