diff options
author | Christophe Fergeau <cfergeau@redhat.com> | 2018-11-20 11:20:02 -0500 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-11-21 03:12:45 -0500 |
commit | 76a57db4a867ade779fbe292112cb6d7f0762e4e (patch) | |
tree | 8ad5dc59c7b7f73843440d722f5c5aab31cc1fd7 /drivers/gpu | |
parent | a071a8ff1f5fd4aa6897c9260be548029b3acaff (diff) |
qxl: No need for NULL check before calling qxl_bo_unref()
qxl_bo_unref() is already performing a NULL check.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20181120162004.22807-1-cfergeau@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_display.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_draw.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_kms.c | 6 |
3 files changed, 4 insertions, 9 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index 2ce9a8dcec84..d491ba27bbc8 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c | |||
@@ -670,9 +670,7 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane, | |||
670 | qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false); | 670 | qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false); |
671 | qxl_release_fence_buffer_objects(release); | 671 | qxl_release_fence_buffer_objects(release); |
672 | 672 | ||
673 | if (old_cursor_bo) | 673 | qxl_bo_unref(&old_cursor_bo); |
674 | qxl_bo_unref(&old_cursor_bo); | ||
675 | |||
676 | qxl_bo_unref(&cursor_bo); | 674 | qxl_bo_unref(&cursor_bo); |
677 | 675 | ||
678 | return; | 676 | return; |
diff --git a/drivers/gpu/drm/qxl/qxl_draw.c b/drivers/gpu/drm/qxl/qxl_draw.c index c34e45662965..c408bb83c7a9 100644 --- a/drivers/gpu/drm/qxl/qxl_draw.c +++ b/drivers/gpu/drm/qxl/qxl_draw.c | |||
@@ -247,8 +247,7 @@ void qxl_draw_opaque_fb(const struct qxl_fb_image *qxl_fb_image, | |||
247 | qxl_release_fence_buffer_objects(release); | 247 | qxl_release_fence_buffer_objects(release); |
248 | 248 | ||
249 | out_free_palette: | 249 | out_free_palette: |
250 | if (palette_bo) | 250 | qxl_bo_unref(&palette_bo); |
251 | qxl_bo_unref(&palette_bo); | ||
252 | out_free_image: | 251 | out_free_image: |
253 | qxl_image_free_objects(qdev, dimage); | 252 | qxl_image_free_objects(qdev, dimage); |
254 | out_free_drawable: | 253 | out_free_drawable: |
diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index f6975d7c7d10..15238a413f9d 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c | |||
@@ -313,10 +313,8 @@ error: | |||
313 | 313 | ||
314 | void qxl_device_fini(struct qxl_device *qdev) | 314 | void qxl_device_fini(struct qxl_device *qdev) |
315 | { | 315 | { |
316 | if (qdev->current_release_bo[0]) | 316 | qxl_bo_unref(&qdev->current_release_bo[0]); |
317 | qxl_bo_unref(&qdev->current_release_bo[0]); | 317 | qxl_bo_unref(&qdev->current_release_bo[1]); |
318 | if (qdev->current_release_bo[1]) | ||
319 | qxl_bo_unref(&qdev->current_release_bo[1]); | ||
320 | flush_work(&qdev->gc_work); | 318 | flush_work(&qdev->gc_work); |
321 | qxl_ring_free(qdev->command_ring); | 319 | qxl_ring_free(qdev->command_ring); |
322 | qxl_ring_free(qdev->cursor_ring); | 320 | qxl_ring_free(qdev->cursor_ring); |