Mon Aug 27 07:49:47 2018 UTC ()
Mark unused variable.


(riastradh)
diff -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_object.c
cvs diff -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_object.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_object.c 2018/08/27 04:58:36 1.4
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_object.c 2018/08/27 07:49:47 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: radeon_object.c,v 1.4 2018/08/27 04:58:36 riastradh Exp $ */ 1/* $NetBSD: radeon_object.c,v 1.5 2018/08/27 07:49:47 riastradh Exp $ */
2 2
3/* 3/*
4 * Copyright 2009 Jerome Glisse. 4 * Copyright 2009 Jerome Glisse.
5 * All Rights Reserved. 5 * All Rights Reserved.
6 * 6 *
7 * Permission is hereby granted, free of charge, to any person obtaining a 7 * Permission is hereby granted, free of charge, to any person obtaining a
8 * copy of this software and associated documentation files (the 8 * copy of this software and associated documentation files (the
9 * "Software"), to deal in the Software without restriction, including 9 * "Software"), to deal in the Software without restriction, including
10 * without limitation the rights to use, copy, modify, merge, publish, 10 * without limitation the rights to use, copy, modify, merge, publish,
11 * distribute, sub license, and/or sell copies of the Software, and to 11 * distribute, sub license, and/or sell copies of the Software, and to
12 * permit persons to whom the Software is furnished to do so, subject to 12 * permit persons to whom the Software is furnished to do so, subject to
13 * the following conditions: 13 * the following conditions:
14 * 14 *
@@ -22,27 +22,27 @@ @@ -22,27 +22,27 @@
22 * 22 *
23 * The above copyright notice and this permission notice (including the 23 * The above copyright notice and this permission notice (including the
24 * next paragraph) shall be included in all copies or substantial portions 24 * next paragraph) shall be included in all copies or substantial portions
25 * of the Software. 25 * of the Software.
26 * 26 *
27 */ 27 */
28/* 28/*
29 * Authors: 29 * Authors:
30 * Jerome Glisse <glisse@freedesktop.org> 30 * Jerome Glisse <glisse@freedesktop.org>
31 * Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> 31 * Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
32 * Dave Airlie 32 * Dave Airlie
33 */ 33 */
34#include <sys/cdefs.h> 34#include <sys/cdefs.h>
35__KERNEL_RCSID(0, "$NetBSD: radeon_object.c,v 1.4 2018/08/27 04:58:36 riastradh Exp $"); 35__KERNEL_RCSID(0, "$NetBSD: radeon_object.c,v 1.5 2018/08/27 07:49:47 riastradh Exp $");
36 36
37#include <linux/list.h> 37#include <linux/list.h>
38#include <linux/slab.h> 38#include <linux/slab.h>
39#include <drm/drmP.h> 39#include <drm/drmP.h>
40#include <drm/radeon_drm.h> 40#include <drm/radeon_drm.h>
41#include <drm/drm_cache.h> 41#include <drm/drm_cache.h>
42#include "radeon.h" 42#include "radeon.h"
43#include "radeon_trace.h" 43#include "radeon_trace.h"
44 44
45 45
46int radeon_ttm_init(struct radeon_device *rdev); 46int radeon_ttm_init(struct radeon_device *rdev);
47void radeon_ttm_fini(struct radeon_device *rdev); 47void radeon_ttm_fini(struct radeon_device *rdev);
48static void radeon_bo_clear_surface_reg(struct radeon_bo *bo); 48static void radeon_bo_clear_surface_reg(struct radeon_bo *bo);
@@ -315,27 +315,27 @@ void radeon_bo_kunmap(struct radeon_bo * @@ -315,27 +315,27 @@ void radeon_bo_kunmap(struct radeon_bo *
315 315
316struct radeon_bo *radeon_bo_ref(struct radeon_bo *bo) 316struct radeon_bo *radeon_bo_ref(struct radeon_bo *bo)
317{ 317{
318 if (bo == NULL) 318 if (bo == NULL)
319 return NULL; 319 return NULL;
320 320
321 ttm_bo_reference(&bo->tbo); 321 ttm_bo_reference(&bo->tbo);
322 return bo; 322 return bo;
323} 323}
324 324
325void radeon_bo_unref(struct radeon_bo **bo) 325void radeon_bo_unref(struct radeon_bo **bo)
326{ 326{
327 struct ttm_buffer_object *tbo; 327 struct ttm_buffer_object *tbo;
328 struct radeon_device *rdev; 328 struct radeon_device *rdev __unused;
329 329
330 if ((*bo) == NULL) 330 if ((*bo) == NULL)
331 return; 331 return;
332 rdev = (*bo)->rdev; 332 rdev = (*bo)->rdev;
333 tbo = &((*bo)->tbo); 333 tbo = &((*bo)->tbo);
334 ttm_bo_unref(&tbo); 334 ttm_bo_unref(&tbo);
335 if (tbo == NULL) 335 if (tbo == NULL)
336 *bo = NULL; 336 *bo = NULL;
337} 337}
338 338
339int radeon_bo_pin_restricted(struct radeon_bo *bo, u32 domain, u64 max_offset, 339int radeon_bo_pin_restricted(struct radeon_bo *bo, u32 domain, u64 max_offset,
340 u64 *gpu_addr) 340 u64 *gpu_addr)
341{ 341{