Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/include/linux provide some dummy structs



details:   https://anonhg.NetBSD.org/src/rev/0cc1dae6b102
branches:  trunk
changeset: 992479:0cc1dae6b102
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:43:10 2018 +0000

description:
provide some dummy structs

declaration without implementation of dmi_match (Won't link)
provide div64_u64_rem XXX the naming of the parameters is backwards
ci_send_msg_to_smc_return_parameter isn't unused, keep it


Author: coypu <coypu%sdf.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c |   6 ++----
 sys/external/bsd/drm2/include/linux/dmi.h      |   3 ++-
 sys/external/bsd/drm2/include/linux/fence.h    |  11 ++++++++++-
 sys/external/bsd/drm2/include/linux/math64.h   |   9 ++++++++-
 4 files changed, 22 insertions(+), 7 deletions(-)

diffs (94 lines):

diff -r f8934a97eb82 -r 0cc1dae6b102 sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c    Mon Aug 27 06:42:54 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c    Mon Aug 27 06:43:10 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ci_dpm.c,v 1.8 2018/08/27 06:40:56 riastradh Exp $     */
+/*     $NetBSD: ci_dpm.c,v 1.9 2018/08/27 06:43:10 riastradh Exp $     */
 
 /*
  * Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ci_dpm.c,v 1.8 2018/08/27 06:40:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ci_dpm.c,v 1.9 2018/08/27 06:43:10 riastradh Exp $");
 
 #include <linux/firmware.h>
 #include "drmP.h"
@@ -1671,7 +1671,6 @@
        return ci_send_msg_to_smc(rdev, msg);
 }
 
-#ifndef __NetBSD__             /* XXX unused? */
 static PPSMC_Result ci_send_msg_to_smc_return_parameter(struct radeon_device *rdev,
                                                        PPSMC_Msg msg, u32 *parameter)
 {
@@ -1684,7 +1683,6 @@
 
        return smc_result;
 }
-#endif
 
 static int ci_dpm_force_state_sclk(struct radeon_device *rdev, u32 n)
 {
diff -r f8934a97eb82 -r 0cc1dae6b102 sys/external/bsd/drm2/include/linux/dmi.h
--- a/sys/external/bsd/drm2/include/linux/dmi.h Mon Aug 27 06:42:54 2018 +0000
+++ b/sys/external/bsd/drm2/include/linux/dmi.h Mon Aug 27 06:43:10 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dmi.h,v 1.3 2014/04/25 23:54:59 riastradh Exp $        */
+/*     $NetBSD: dmi.h,v 1.4 2018/08/27 06:43:10 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -69,5 +69,6 @@
 #define DMI_EXACT_MATCH(a, b)  {(a), (b)}
 
 int dmi_check_system(const struct dmi_system_id *list);
+bool dmi_match(enum dmi_field, const char[]);
 
 #endif  /* _LINUX_DMI_H_ */
diff -r f8934a97eb82 -r 0cc1dae6b102 sys/external/bsd/drm2/include/linux/fence.h
--- a/sys/external/bsd/drm2/include/linux/fence.h       Mon Aug 27 06:42:54 2018 +0000
+++ b/sys/external/bsd/drm2/include/linux/fence.h       Mon Aug 27 06:43:10 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fence.h,v 1.1 2018/08/27 06:33:57 riastradh Exp $      */
+/*     $NetBSD: fence.h,v 1.2 2018/08/27 06:43:10 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,4 +32,13 @@
 #ifndef        _LINUX_FENCE_H_
 #define        _LINUX_FENCE_H_
 
+struct fence_ops {
+
+};
+
+struct fence {
+       const struct fence_ops  *ops;
+};
+
+
 #endif /* _LINUX_FENCE_H_ */
diff -r f8934a97eb82 -r 0cc1dae6b102 sys/external/bsd/drm2/include/linux/math64.h
--- a/sys/external/bsd/drm2/include/linux/math64.h      Mon Aug 27 06:42:54 2018 +0000
+++ b/sys/external/bsd/drm2/include/linux/math64.h      Mon Aug 27 06:43:10 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: math64.h,v 1.3 2014/07/16 20:59:58 riastradh Exp $     */
+/*     $NetBSD: math64.h,v 1.4 2018/08/27 06:43:10 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -54,4 +54,11 @@
        return divisor / dividend;
 }
 
+static inline uint64_t
+div64_u64_rem(uint64_t divisor, uint64_t dividend, uint64_t *rem)
+{
+       *rem = divisor % dividend;
+       return divisor / dividend;
+}
+
 #endif  /* _LINUX_MATH64_H_ */



Home | Main Index | Thread Index | Old Index