diff options
author | Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com> | 2018-02-22 19:00:00 -0500 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-02-27 02:40:37 -0500 |
commit | 9d492b6bece4ecce096894153005fa2bb31f911f (patch) | |
tree | c3f35bd1eeef8fc06b9329427c8ac9b7249417a5 | |
parent | 1858b85606ccf6705018452873600f3aa2948906 (diff) |
drm/virtio: Add blank line after variable declarations
This patch fixes the checkpatch.pl warnings:
virtgpu_drv.c:57: WARNING: Missing a blank line after declarations
virtgpu_display.c:99: WARNING: Missing a blank line after declarations
...
Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/41767852ff9dc584c825e32db6222b9a311603b9.1519343668.git.rodrigosiqueiramelo@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_display.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_drv.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_fb.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_gem.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_vq.c | 3 |
6 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c index 22513d7f895c..2d1b25630c0e 100644 --- a/drivers/gpu/drm/virtio/virtgpu_display.c +++ b/drivers/gpu/drm/virtio/virtgpu_display.c | |||
@@ -96,6 +96,7 @@ virtio_gpu_framebuffer_init(struct drm_device *dev, | |||
96 | { | 96 | { |
97 | int ret; | 97 | int ret; |
98 | struct virtio_gpu_object *bo; | 98 | struct virtio_gpu_object *bo; |
99 | |||
99 | vgfb->obj = obj; | 100 | vgfb->obj = obj; |
100 | 101 | ||
101 | bo = gem_to_virtio_gpu_obj(obj); | 102 | bo = gem_to_virtio_gpu_obj(obj); |
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index 49a3d8d5a249..5d21433b1cdf 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c | |||
@@ -54,6 +54,7 @@ static int virtio_gpu_probe(struct virtio_device *vdev) | |||
54 | static void virtio_gpu_remove(struct virtio_device *vdev) | 54 | static void virtio_gpu_remove(struct virtio_device *vdev) |
55 | { | 55 | { |
56 | struct drm_device *dev = vdev->priv; | 56 | struct drm_device *dev = vdev->priv; |
57 | |||
57 | drm_put_dev(dev); | 58 | drm_put_dev(dev); |
58 | } | 59 | } |
59 | 60 | ||
diff --git a/drivers/gpu/drm/virtio/virtgpu_fb.c b/drivers/gpu/drm/virtio/virtgpu_fb.c index 15d18fd0c64b..b933cbba0685 100644 --- a/drivers/gpu/drm/virtio/virtgpu_fb.c +++ b/drivers/gpu/drm/virtio/virtgpu_fb.c | |||
@@ -127,6 +127,7 @@ int virtio_gpu_surface_dirty(struct virtio_gpu_framebuffer *vgfb, | |||
127 | int left, right, top, bottom; | 127 | int left, right, top, bottom; |
128 | int i; | 128 | int i; |
129 | int inc = 1; | 129 | int inc = 1; |
130 | |||
130 | if (!num_clips) { | 131 | if (!num_clips) { |
131 | num_clips = 1; | 132 | num_clips = 1; |
132 | clips = &norect; | 133 | clips = &norect; |
@@ -172,6 +173,7 @@ static void virtio_gpu_3d_fillrect(struct fb_info *info, | |||
172 | const struct fb_fillrect *rect) | 173 | const struct fb_fillrect *rect) |
173 | { | 174 | { |
174 | struct virtio_gpu_fbdev *vfbdev = info->par; | 175 | struct virtio_gpu_fbdev *vfbdev = info->par; |
176 | |||
175 | drm_fb_helper_sys_fillrect(info, rect); | 177 | drm_fb_helper_sys_fillrect(info, rect); |
176 | virtio_gpu_dirty_update(&vfbdev->vgfb, true, rect->dx, rect->dy, | 178 | virtio_gpu_dirty_update(&vfbdev->vgfb, true, rect->dx, rect->dy, |
177 | rect->width, rect->height); | 179 | rect->width, rect->height); |
@@ -182,6 +184,7 @@ static void virtio_gpu_3d_copyarea(struct fb_info *info, | |||
182 | const struct fb_copyarea *area) | 184 | const struct fb_copyarea *area) |
183 | { | 185 | { |
184 | struct virtio_gpu_fbdev *vfbdev = info->par; | 186 | struct virtio_gpu_fbdev *vfbdev = info->par; |
187 | |||
185 | drm_fb_helper_sys_copyarea(info, area); | 188 | drm_fb_helper_sys_copyarea(info, area); |
186 | virtio_gpu_dirty_update(&vfbdev->vgfb, true, area->dx, area->dy, | 189 | virtio_gpu_dirty_update(&vfbdev->vgfb, true, area->dx, area->dy, |
187 | area->width, area->height); | 190 | area->width, area->height); |
@@ -192,6 +195,7 @@ static void virtio_gpu_3d_imageblit(struct fb_info *info, | |||
192 | const struct fb_image *image) | 195 | const struct fb_image *image) |
193 | { | 196 | { |
194 | struct virtio_gpu_fbdev *vfbdev = info->par; | 197 | struct virtio_gpu_fbdev *vfbdev = info->par; |
198 | |||
195 | drm_fb_helper_sys_imageblit(info, image); | 199 | drm_fb_helper_sys_imageblit(info, image); |
196 | virtio_gpu_dirty_update(&vfbdev->vgfb, true, image->dx, image->dy, | 200 | virtio_gpu_dirty_update(&vfbdev->vgfb, true, image->dx, image->dy, |
197 | image->width, image->height); | 201 | image->width, image->height); |
diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c index 92fb27753b9e..0f2768eacaee 100644 --- a/drivers/gpu/drm/virtio/virtgpu_gem.c +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c | |||
@@ -124,6 +124,7 @@ int virtio_gpu_mode_dumb_mmap(struct drm_file *file_priv, | |||
124 | { | 124 | { |
125 | struct drm_gem_object *gobj; | 125 | struct drm_gem_object *gobj; |
126 | struct virtio_gpu_object *obj; | 126 | struct virtio_gpu_object *obj; |
127 | |||
127 | BUG_ON(!offset_p); | 128 | BUG_ON(!offset_p); |
128 | gobj = drm_gem_object_lookup(file_priv, handle); | 129 | gobj = drm_gem_object_lookup(file_priv, handle); |
129 | if (gobj == NULL) | 130 | if (gobj == NULL) |
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c index 355569a9b5cb..7fe04537fb8c 100644 --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c | |||
@@ -83,6 +83,7 @@ static void virtio_gpu_unref_list(struct list_head *head) | |||
83 | struct ttm_validate_buffer *buf; | 83 | struct ttm_validate_buffer *buf; |
84 | struct ttm_buffer_object *bo; | 84 | struct ttm_buffer_object *bo; |
85 | struct virtio_gpu_object *qobj; | 85 | struct virtio_gpu_object *qobj; |
86 | |||
86 | list_for_each_entry(buf, head, head) { | 87 | list_for_each_entry(buf, head, head) { |
87 | bo = buf->bo; | 88 | bo = buf->bo; |
88 | qobj = container_of(bo, struct virtio_gpu_object, tbo); | 89 | qobj = container_of(bo, struct virtio_gpu_object, tbo); |
@@ -478,6 +479,7 @@ static int virtio_gpu_get_caps_ioctl(struct drm_device *dev, | |||
478 | int ret; | 479 | int ret; |
479 | struct virtio_gpu_drv_cap_cache *cache_ent; | 480 | struct virtio_gpu_drv_cap_cache *cache_ent; |
480 | void *ptr; | 481 | void *ptr; |
482 | |||
481 | if (vgdev->num_capsets == 0) | 483 | if (vgdev->num_capsets == 0) |
482 | return -ENOSYS; | 484 | return -ENOSYS; |
483 | 485 | ||
diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c index 9eb96fb2c147..16c05bc34bef 100644 --- a/drivers/gpu/drm/virtio/virtgpu_vq.c +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c | |||
@@ -62,6 +62,7 @@ void virtio_gpu_ctrl_ack(struct virtqueue *vq) | |||
62 | { | 62 | { |
63 | struct drm_device *dev = vq->vdev->priv; | 63 | struct drm_device *dev = vq->vdev->priv; |
64 | struct virtio_gpu_device *vgdev = dev->dev_private; | 64 | struct virtio_gpu_device *vgdev = dev->dev_private; |
65 | |||
65 | schedule_work(&vgdev->ctrlq.dequeue_work); | 66 | schedule_work(&vgdev->ctrlq.dequeue_work); |
66 | } | 67 | } |
67 | 68 | ||
@@ -69,6 +70,7 @@ void virtio_gpu_cursor_ack(struct virtqueue *vq) | |||
69 | { | 70 | { |
70 | struct drm_device *dev = vq->vdev->priv; | 71 | struct drm_device *dev = vq->vdev->priv; |
71 | struct virtio_gpu_device *vgdev = dev->dev_private; | 72 | struct virtio_gpu_device *vgdev = dev->dev_private; |
73 | |||
72 | schedule_work(&vgdev->cursorq.dequeue_work); | 74 | schedule_work(&vgdev->cursorq.dequeue_work); |
73 | } | 75 | } |
74 | 76 | ||
@@ -852,6 +854,7 @@ int virtio_gpu_object_attach(struct virtio_gpu_device *vgdev, | |||
852 | 854 | ||
853 | if (!obj->pages) { | 855 | if (!obj->pages) { |
854 | int ret; | 856 | int ret; |
857 | |||
855 | ret = virtio_gpu_object_get_sg_table(vgdev, obj); | 858 | ret = virtio_gpu_object_get_sg_table(vgdev, obj); |
856 | if (ret) | 859 | if (ret) |
857 | return ret; | 860 | return ret; |