diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-11-15 04:35:09 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-12-02 13:02:07 +1000 |
| commit | af5b0afbb362d211ea4fd20af08cc0a66719c8fa (patch) | |
| tree | 6f907b7c1c9e6bdf892d721128ec310e57dc2238 | |
| parent | 430bbdb303e9ae9407a1b34508326691dc578a1e (diff) | |
fix some warnings
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_fb.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_gem.c | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_kms.c | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_fb.c b/drivers/gpu/drm/virtio/virtgpu_fb.c index 3cc749d884a9..5b870d959dda 100644 --- a/drivers/gpu/drm/virtio/virtgpu_fb.c +++ b/drivers/gpu/drm/virtio/virtgpu_fb.c @@ -25,7 +25,7 @@ static int virtgpu_dirty_update(struct virtgpu_framebuffer *fb, bool store, int x2, y2; unsigned long flags; struct virtgpu_object *obj = gem_to_virtgpu_obj(fb->obj); - int size; + aligned_x = DL_ALIGN_DOWN(x, sizeof(unsigned long)); width = DL_ALIGN_UP(width + (x-aligned_x), sizeof(unsigned long)); x = aligned_x; diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c index 8aad97574efb..015f96e5d811 100644 --- a/drivers/gpu/drm/virtio/virtgpu_gem.c +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c @@ -3,6 +3,8 @@ #include <linux/shmem_fs.h> #include "virtgpu_drv.h" +static void virtgpu_free_mmap_offset(struct virtgpu_object *obj); + static void *virtgpu_gem_object_alloc(struct drm_device *dev) { return kzalloc(sizeof(struct virtgpu_object), GFP_KERNEL); @@ -25,6 +27,8 @@ void virtgpu_gem_free_object(struct drm_gem_object *gem_obj) /* put pages */ drm_gem_object_release(&obj->gem_base); + + virtgpu_free_mmap_offset(obj); virtgpu_gem_object_free(obj); } @@ -86,7 +90,6 @@ virtgpu_gem_create(struct drm_file *file, int virtgpu_gem_object_get_pages(struct virtgpu_object *obj) { - struct virtgpu_device *vgdev = obj->gem_base.dev->dev_private; int page_count, i; struct address_space *mapping; struct sg_table *st; @@ -187,7 +190,7 @@ static int virtgpu_create_mmap_offset(struct virtgpu_object *obj) return 0; } -static int virtgpu_free_mmap_offset(struct virtgpu_object *obj) +static void virtgpu_free_mmap_offset(struct virtgpu_object *obj) { if (!obj->gem_base.map_list.map) return; @@ -202,7 +205,6 @@ int virtgpu_mode_dumb_create(struct drm_file *file_priv, struct virtgpu_device *vgdev = dev->dev_private; struct drm_gem_object *gobj; struct virtgpu_object *obj; - uint32_t handle; int ret; uint32_t pitch; uint32_t resid; diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c index 5937d7ae1a77..12d4db030f86 100644 --- a/drivers/gpu/drm/virtio/virtgpu_kms.c +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c @@ -80,7 +80,6 @@ int virtgpu_driver_load(struct drm_device *dev, unsigned long flags) int virtgpu_driver_unload(struct drm_device *dev) { struct virtgpu_device *vgdev = dev->dev_private; - int ret; virtgpu_modeset_fini(vgdev); |