diff options
| author |   jsg <jsg@openbsd.org> | 2019-08-17 08:23:28 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2019-08-17 08:23:28 +0000 |
| commit | f44285eb8ac2d545beab28a22c181b62e8cd43f2 (patch) | |
| tree | 55c66eefd2ec62f57451255d1bd3518138c22c20 | |
| parent | drm/amd/display: Only enable audio if speaker allocation exists (diff) | |
| download | wireguard-openbsd-f44285eb8ac2d545beab28a22c181b62e8cd43f2.tar.xz wireguard-openbsd-f44285eb8ac2d545beab28a22c181b62e8cd43f2.zip | |
drm/amd/display: Increase size of audios array
From Tai Man
8d641499bf969a284161d2682b71669c96389773 in linux 4.19.y/4.19.67
7352193a33dfc9b69ba3bf6a8caea925b96243b1 in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/amd/display/dc/inc/core_types.h | 2 | ||||
| -rw-r--r-- | sys/dev/pci/drm/amd/display/dc/inc/hw/hw_shared.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/amd/display/dc/inc/core_types.h b/sys/dev/pci/drm/amd/display/dc/inc/core_types.h index 670c876f5d4..459bd3db950 100644 --- a/sys/dev/pci/drm/amd/display/dc/inc/core_types.h +++ b/sys/dev/pci/drm/amd/display/dc/inc/core_types.h @@ -159,7 +159,7 @@ struct resource_pool { struct clock_source *clock_sources[MAX_CLOCK_SOURCES]; unsigned int clk_src_count; - struct audio *audios[MAX_PIPES]; + struct audio *audios[MAX_AUDIOS]; unsigned int audio_count; struct audio_support audio_support; diff --git a/sys/dev/pci/drm/amd/display/dc/inc/hw/hw_shared.h b/sys/dev/pci/drm/amd/display/dc/inc/hw/hw_shared.h index cf7433ebf91..71901743a93 100644 --- a/sys/dev/pci/drm/amd/display/dc/inc/hw/hw_shared.h +++ b/sys/dev/pci/drm/amd/display/dc/inc/hw/hw_shared.h @@ -34,6 +34,7 @@ * Data types shared between different Virtual HW blocks ******************************************************************************/ +#define MAX_AUDIOS 7 #define MAX_PIPES 6 struct gamma_curve { |