Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:20:24 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_pm.h
Log Message:
Fix up merge.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_pm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_pm.h
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_pm.h:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_pm.h:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_pm.h:1.4 Sat Dec 18 23:44:58 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_pm.h Sun Dec 19 10:20:24 2021
@@ -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_uvd(struct amdgpu
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
