diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv04/overlay.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/dispnv04/overlay.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv04/overlay.c b/drivers/gpu/drm/nouveau/dispnv04/overlay.c index ab03f7719d2d..fa69ef011992 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/overlay.c +++ b/drivers/gpu/drm/nouveau/dispnv04/overlay.c | |||
@@ -256,7 +256,7 @@ static const struct drm_plane_funcs nv10_plane_funcs = { | |||
256 | static void | 256 | static void |
257 | nv10_overlay_init(struct drm_device *device) | 257 | nv10_overlay_init(struct drm_device *device) |
258 | { | 258 | { |
259 | struct nouveau_device *dev = nouveau_dev(device); | 259 | struct nouveau_drm *drm = nouveau_drm(device); |
260 | struct nouveau_plane *plane = kzalloc(sizeof(struct nouveau_plane), GFP_KERNEL); | 260 | struct nouveau_plane *plane = kzalloc(sizeof(struct nouveau_plane), GFP_KERNEL); |
261 | int num_formats = ARRAY_SIZE(formats); | 261 | int num_formats = ARRAY_SIZE(formats); |
262 | int ret; | 262 | int ret; |
@@ -264,7 +264,7 @@ nv10_overlay_init(struct drm_device *device) | |||
264 | if (!plane) | 264 | if (!plane) |
265 | return; | 265 | return; |
266 | 266 | ||
267 | switch (dev->chipset) { | 267 | switch (nv_device(drm->device)->chipset) { |
268 | case 0x10: | 268 | case 0x10: |
269 | case 0x11: | 269 | case 0x11: |
270 | case 0x15: | 270 | case 0x15: |
@@ -333,7 +333,7 @@ cleanup: | |||
333 | drm_plane_cleanup(&plane->base); | 333 | drm_plane_cleanup(&plane->base); |
334 | err: | 334 | err: |
335 | kfree(plane); | 335 | kfree(plane); |
336 | nv_error(dev, "Failed to create plane\n"); | 336 | NV_ERROR(drm, "Failed to create plane\n"); |
337 | } | 337 | } |
338 | 338 | ||
339 | static int | 339 | static int |
@@ -447,7 +447,7 @@ static const struct drm_plane_funcs nv04_plane_funcs = { | |||
447 | static void | 447 | static void |
448 | nv04_overlay_init(struct drm_device *device) | 448 | nv04_overlay_init(struct drm_device *device) |
449 | { | 449 | { |
450 | struct nouveau_device *dev = nouveau_dev(device); | 450 | struct nouveau_drm *drm = nouveau_drm(device); |
451 | struct nouveau_plane *plane = kzalloc(sizeof(struct nouveau_plane), GFP_KERNEL); | 451 | struct nouveau_plane *plane = kzalloc(sizeof(struct nouveau_plane), GFP_KERNEL); |
452 | int ret; | 452 | int ret; |
453 | 453 | ||
@@ -483,7 +483,7 @@ cleanup: | |||
483 | drm_plane_cleanup(&plane->base); | 483 | drm_plane_cleanup(&plane->base); |
484 | err: | 484 | err: |
485 | kfree(plane); | 485 | kfree(plane); |
486 | nv_error(dev, "Failed to create plane\n"); | 486 | NV_ERROR(drm, "Failed to create plane\n"); |
487 | } | 487 | } |
488 | 488 | ||
489 | void | 489 | void |