diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvc0_fbcon.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvc0_fbcon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvc0_fbcon.c b/drivers/gpu/drm/nouveau/nvc0_fbcon.c index cc88f3649909..9dcd30f3e1e0 100644 --- a/drivers/gpu/drm/nouveau/nvc0_fbcon.c +++ b/drivers/gpu/drm/nouveau/nvc0_fbcon.c | |||
@@ -30,7 +30,7 @@ int | |||
30 | nvc0_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect) | 30 | nvc0_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect) |
31 | { | 31 | { |
32 | struct nouveau_fbdev *nfbdev = info->par; | 32 | struct nouveau_fbdev *nfbdev = info->par; |
33 | struct nouveau_drm *drm = nouveau_newpriv(nfbdev->dev); | 33 | struct nouveau_drm *drm = nouveau_drm(nfbdev->dev); |
34 | struct nouveau_channel *chan = drm->channel; | 34 | struct nouveau_channel *chan = drm->channel; |
35 | int ret; | 35 | int ret; |
36 | 36 | ||
@@ -65,7 +65,7 @@ int | |||
65 | nvc0_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *region) | 65 | nvc0_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *region) |
66 | { | 66 | { |
67 | struct nouveau_fbdev *nfbdev = info->par; | 67 | struct nouveau_fbdev *nfbdev = info->par; |
68 | struct nouveau_drm *drm = nouveau_newpriv(nfbdev->dev); | 68 | struct nouveau_drm *drm = nouveau_drm(nfbdev->dev); |
69 | struct nouveau_channel *chan = drm->channel; | 69 | struct nouveau_channel *chan = drm->channel; |
70 | int ret; | 70 | int ret; |
71 | 71 | ||
@@ -93,7 +93,7 @@ int | |||
93 | nvc0_fbcon_imageblit(struct fb_info *info, const struct fb_image *image) | 93 | nvc0_fbcon_imageblit(struct fb_info *info, const struct fb_image *image) |
94 | { | 94 | { |
95 | struct nouveau_fbdev *nfbdev = info->par; | 95 | struct nouveau_fbdev *nfbdev = info->par; |
96 | struct nouveau_drm *drm = nouveau_newpriv(nfbdev->dev); | 96 | struct nouveau_drm *drm = nouveau_drm(nfbdev->dev); |
97 | struct nouveau_channel *chan = drm->channel; | 97 | struct nouveau_channel *chan = drm->channel; |
98 | uint32_t width, dwords, *data = (uint32_t *)image->data; | 98 | uint32_t width, dwords, *data = (uint32_t *)image->data; |
99 | uint32_t mask = ~(~0 >> (32 - info->var.bits_per_pixel)); | 99 | uint32_t mask = ~(~0 >> (32 - info->var.bits_per_pixel)); |
@@ -152,7 +152,7 @@ nvc0_fbcon_accel_init(struct fb_info *info) | |||
152 | struct nouveau_fbdev *nfbdev = info->par; | 152 | struct nouveau_fbdev *nfbdev = info->par; |
153 | struct drm_device *dev = nfbdev->dev; | 153 | struct drm_device *dev = nfbdev->dev; |
154 | struct nouveau_framebuffer *fb = &nfbdev->nouveau_fb; | 154 | struct nouveau_framebuffer *fb = &nfbdev->nouveau_fb; |
155 | struct nouveau_drm *drm = nouveau_newpriv(dev); | 155 | struct nouveau_drm *drm = nouveau_drm(dev); |
156 | struct nouveau_channel *chan = drm->channel; | 156 | struct nouveau_channel *chan = drm->channel; |
157 | struct nouveau_object *object; | 157 | struct nouveau_object *object; |
158 | int ret, format; | 158 | int ret, format; |