Mon Aug 27 06:39:38 2018 UTC ()
cik_sdma.c needs <linux/err.h>.


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

--- src/sys/external/bsd/drm2/dist/drm/radeon/Attic/cik_sdma.c 2018/08/27 04:58:35 1.3
+++ src/sys/external/bsd/drm2/dist/drm/radeon/Attic/cik_sdma.c 2018/08/27 06:39:38 1.4
@@ -1,42 +1,43 @@ @@ -1,42 +1,43 @@
1/* $NetBSD: cik_sdma.c,v 1.3 2018/08/27 04:58:35 riastradh Exp $ */ 1/* $NetBSD: cik_sdma.c,v 1.4 2018/08/27 06:39:38 riastradh Exp $ */
2 2
3/* 3/*
4 * Copyright 2013 Advanced Micro Devices, Inc. 4 * Copyright 2013 Advanced Micro Devices, Inc.
5 * 5 *
6 * Permission is hereby granted, free of charge, to any person obtaining a 6 * Permission is hereby granted, free of charge, to any person obtaining a
7 * copy of this software and associated documentation files (the "Software"), 7 * copy of this software and associated documentation files (the "Software"),
8 * to deal in the Software without restriction, including without limitation 8 * to deal in the Software without restriction, including without limitation
9 * the rights to use, copy, modify, merge, publish, distribute, sublicense, 9 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
10 * and/or sell copies of the Software, and to permit persons to whom the 10 * and/or sell copies of the Software, and to permit persons to whom the
11 * Software is furnished to do so, subject to the following conditions: 11 * Software is furnished to do so, subject to the following conditions:
12 * 12 *
13 * The above copyright notice and this permission notice shall be included in 13 * The above copyright notice and this permission notice shall be included in
14 * all copies or substantial portions of the Software. 14 * all copies or substantial portions of the Software.
15 * 15 *
16 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 16 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 17 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 18 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
19 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR 19 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
20 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 20 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
21 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 21 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22 * OTHER DEALINGS IN THE SOFTWARE. 22 * OTHER DEALINGS IN THE SOFTWARE.
23 * 23 *
24 * Authors: Alex Deucher 24 * Authors: Alex Deucher
25 */ 25 */
26#include <sys/cdefs.h> 26#include <sys/cdefs.h>
27__KERNEL_RCSID(0, "$NetBSD: cik_sdma.c,v 1.3 2018/08/27 04:58:35 riastradh Exp $"); 27__KERNEL_RCSID(0, "$NetBSD: cik_sdma.c,v 1.4 2018/08/27 06:39:38 riastradh Exp $");
28 28
29#include <linux/firmware.h> 29#include <linux/firmware.h>
 30#include <linux/err.h>
30#include <drm/drmP.h> 31#include <drm/drmP.h>
31#include "radeon.h" 32#include "radeon.h"
32#include "radeon_ucode.h" 33#include "radeon_ucode.h"
33#include "radeon_asic.h" 34#include "radeon_asic.h"
34#include "radeon_trace.h" 35#include "radeon_trace.h"
35#include "cikd.h" 36#include "cikd.h"
36 37
37/* sdma */ 38/* sdma */
38#define CIK_SDMA_UCODE_SIZE 1050 39#define CIK_SDMA_UCODE_SIZE 1050
39#define CIK_SDMA_UCODE_VERSION 64 40#define CIK_SDMA_UCODE_VERSION 64
40 41
41u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); 42u32 cik_gpu_check_soft_reset(struct radeon_device *rdev);
42 43