diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-06-09 06:11:50 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-06-09 06:11:50 +0000 |
| commit | 714673e36fe92357a6f6f9de90bf0e8b4c2280cf (patch) | |
| tree | 4a668973d574e7a314ccab0d4b6782b5998daa6b | |
| parent | e67f11d97be6797b4ff696397a6985a80da93bb6 (diff) | |
reduce the diff to linux
| -rw-r--r-- | sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/drm/include/linux/component.h | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c index e287de2318c..35d9eb671f8 100644 --- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -655,9 +655,6 @@ static int amdgpu_dm_audio_init(struct amdgpu_device *adev) if (!amdgpu_audio) return 0; - STUB(); - return 0; -#ifdef notyet adev->mode_info.audio.enabled = true; adev->mode_info.audio.num_pins = adev->dm.dc->res_pool->audio_count; @@ -681,7 +678,6 @@ static int amdgpu_dm_audio_init(struct amdgpu_device *adev) adev->dm.audio_registered = true; return 0; -#endif } static void amdgpu_dm_audio_fini(struct amdgpu_device *adev) @@ -689,8 +685,6 @@ static void amdgpu_dm_audio_fini(struct amdgpu_device *adev) if (!amdgpu_audio) return; - STUB(); -#ifdef notyet if (!adev->mode_info.audio.enabled) return; @@ -702,7 +696,6 @@ static void amdgpu_dm_audio_fini(struct amdgpu_device *adev) /* TODO: Disable audio? */ adev->mode_info.audio.enabled = false; -#endif } void amdgpu_dm_audio_eld_notify(struct amdgpu_device *adev, int pin) diff --git a/sys/dev/pci/drm/include/linux/component.h b/sys/dev/pci/drm/include/linux/component.h index c20c085a61d..3f210fb079f 100644 --- a/sys/dev/pci/drm/include/linux/component.h +++ b/sys/dev/pci/drm/include/linux/component.h @@ -4,5 +4,6 @@ #define _LINUX_COMPONENT_H #define component_del(a, b) +#define component_add(a, b) 0 #endif |