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/dist/drm/amd/amdgpu Fix up merge.



details:   https://anonhg.NetBSD.org/src/rev/923d04292ccc
branches:  trunk
changeset: 1028282:923d04292ccc
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 10:20:24 2021 +0000

description:
Fix up merge.

diffstat:

 sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_pm.h |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r 388ad7983e95 -r 923d04292ccc sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_pm.h
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_pm.h     Sun Dec 19 10:20:17 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_pm.h     Sun Dec 19 10:20:24 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdgpu_pm.h,v 1.4 2021/12/18 23:44:58 riastradh Exp $  */
+/*     $NetBSD: amdgpu_pm.h,v 1.5 2021/12/19 10:20:24 riastradh Exp $  */
 
 /*
  * Copyright 2014 Advanced Micro Devices, Inc.
@@ -26,6 +26,8 @@
 #ifndef __AMDGPU_PM_H__
 #define __AMDGPU_PM_H__
 
+struct amdgpu_device;
+
 #include <sys/stdbool.h>
 struct cg_flag_name
 {
@@ -46,6 +48,4 @@
 void amdgpu_dpm_enable_vce(struct amdgpu_device *adev, bool enable);
 void amdgpu_dpm_enable_jpeg(struct amdgpu_device *adev, bool enable);
 
-void amdgpu_pm_acpi_event_handler(struct amdgpu_device *adev);
-
 #endif



Home | Main Index | Thread Index | Old Index