mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
drm/amd/display: Move common speakersToChannels definition to hw_shared.h
Signed-off-by: Eric Bernstein <eric.bernstein@amd.com> Acked-by: Bindu Ramamurthy <bindu.r@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
74d7f445e8
commit
06d55ffaea
5 changed files with 85 additions and 247 deletions
|
@ -1062,88 +1062,6 @@ static void dce110_reset_hdmi_stream_attribute(
|
|||
|
||||
#include "include/audio_types.h"
|
||||
|
||||
/**
|
||||
* speakersToChannels
|
||||
*
|
||||
* @brief
|
||||
* translate speakers to channels
|
||||
*
|
||||
* FL - Front Left
|
||||
* FR - Front Right
|
||||
* RL - Rear Left
|
||||
* RR - Rear Right
|
||||
* RC - Rear Center
|
||||
* FC - Front Center
|
||||
* FLC - Front Left Center
|
||||
* FRC - Front Right Center
|
||||
* RLC - Rear Left Center
|
||||
* RRC - Rear Right Center
|
||||
* LFE - Low Freq Effect
|
||||
*
|
||||
* FC
|
||||
* FLC FRC
|
||||
* FL FR
|
||||
*
|
||||
* LFE
|
||||
* ()
|
||||
*
|
||||
*
|
||||
* RL RR
|
||||
* RLC RRC
|
||||
* RC
|
||||
*
|
||||
* ch 8 7 6 5 4 3 2 1
|
||||
* 0b00000011 - - - - - - FR FL
|
||||
* 0b00000111 - - - - - LFE FR FL
|
||||
* 0b00001011 - - - - FC - FR FL
|
||||
* 0b00001111 - - - - FC LFE FR FL
|
||||
* 0b00010011 - - - RC - - FR FL
|
||||
* 0b00010111 - - - RC - LFE FR FL
|
||||
* 0b00011011 - - - RC FC - FR FL
|
||||
* 0b00011111 - - - RC FC LFE FR FL
|
||||
* 0b00110011 - - RR RL - - FR FL
|
||||
* 0b00110111 - - RR RL - LFE FR FL
|
||||
* 0b00111011 - - RR RL FC - FR FL
|
||||
* 0b00111111 - - RR RL FC LFE FR FL
|
||||
* 0b01110011 - RC RR RL - - FR FL
|
||||
* 0b01110111 - RC RR RL - LFE FR FL
|
||||
* 0b01111011 - RC RR RL FC - FR FL
|
||||
* 0b01111111 - RC RR RL FC LFE FR FL
|
||||
* 0b11110011 RRC RLC RR RL - - FR FL
|
||||
* 0b11110111 RRC RLC RR RL - LFE FR FL
|
||||
* 0b11111011 RRC RLC RR RL FC - FR FL
|
||||
* 0b11111111 RRC RLC RR RL FC LFE FR FL
|
||||
* 0b11000011 FRC FLC - - - - FR FL
|
||||
* 0b11000111 FRC FLC - - - LFE FR FL
|
||||
* 0b11001011 FRC FLC - - FC - FR FL
|
||||
* 0b11001111 FRC FLC - - FC LFE FR FL
|
||||
* 0b11010011 FRC FLC - RC - - FR FL
|
||||
* 0b11010111 FRC FLC - RC - LFE FR FL
|
||||
* 0b11011011 FRC FLC - RC FC - FR FL
|
||||
* 0b11011111 FRC FLC - RC FC LFE FR FL
|
||||
* 0b11110011 FRC FLC RR RL - - FR FL
|
||||
* 0b11110111 FRC FLC RR RL - LFE FR FL
|
||||
* 0b11111011 FRC FLC RR RL FC - FR FL
|
||||
* 0b11111111 FRC FLC RR RL FC LFE FR FL
|
||||
*
|
||||
* @param
|
||||
* speakers - speaker information as it comes from CEA audio block
|
||||
*/
|
||||
/* translate speakers to channels */
|
||||
|
||||
union audio_cea_channels {
|
||||
uint8_t all;
|
||||
struct audio_cea_channels_bits {
|
||||
uint32_t FL:1;
|
||||
uint32_t FR:1;
|
||||
uint32_t LFE:1;
|
||||
uint32_t FC:1;
|
||||
uint32_t RL_RC:1;
|
||||
uint32_t RR:1;
|
||||
uint32_t RC_RLC_FLC:1;
|
||||
uint32_t RRC_FRC:1;
|
||||
} channels;
|
||||
};
|
||||
|
||||
/* 25.2MHz/1.001*/
|
||||
/* 25.2MHz/1.001*/
|
||||
|
|
|
@ -1021,88 +1021,6 @@ void enc1_reset_hdmi_stream_attribute(
|
|||
|
||||
#include "include/audio_types.h"
|
||||
|
||||
/**
|
||||
* speakersToChannels
|
||||
*
|
||||
* @brief
|
||||
* translate speakers to channels
|
||||
*
|
||||
* FL - Front Left
|
||||
* FR - Front Right
|
||||
* RL - Rear Left
|
||||
* RR - Rear Right
|
||||
* RC - Rear Center
|
||||
* FC - Front Center
|
||||
* FLC - Front Left Center
|
||||
* FRC - Front Right Center
|
||||
* RLC - Rear Left Center
|
||||
* RRC - Rear Right Center
|
||||
* LFE - Low Freq Effect
|
||||
*
|
||||
* FC
|
||||
* FLC FRC
|
||||
* FL FR
|
||||
*
|
||||
* LFE
|
||||
* ()
|
||||
*
|
||||
*
|
||||
* RL RR
|
||||
* RLC RRC
|
||||
* RC
|
||||
*
|
||||
* ch 8 7 6 5 4 3 2 1
|
||||
* 0b00000011 - - - - - - FR FL
|
||||
* 0b00000111 - - - - - LFE FR FL
|
||||
* 0b00001011 - - - - FC - FR FL
|
||||
* 0b00001111 - - - - FC LFE FR FL
|
||||
* 0b00010011 - - - RC - - FR FL
|
||||
* 0b00010111 - - - RC - LFE FR FL
|
||||
* 0b00011011 - - - RC FC - FR FL
|
||||
* 0b00011111 - - - RC FC LFE FR FL
|
||||
* 0b00110011 - - RR RL - - FR FL
|
||||
* 0b00110111 - - RR RL - LFE FR FL
|
||||
* 0b00111011 - - RR RL FC - FR FL
|
||||
* 0b00111111 - - RR RL FC LFE FR FL
|
||||
* 0b01110011 - RC RR RL - - FR FL
|
||||
* 0b01110111 - RC RR RL - LFE FR FL
|
||||
* 0b01111011 - RC RR RL FC - FR FL
|
||||
* 0b01111111 - RC RR RL FC LFE FR FL
|
||||
* 0b11110011 RRC RLC RR RL - - FR FL
|
||||
* 0b11110111 RRC RLC RR RL - LFE FR FL
|
||||
* 0b11111011 RRC RLC RR RL FC - FR FL
|
||||
* 0b11111111 RRC RLC RR RL FC LFE FR FL
|
||||
* 0b11000011 FRC FLC - - - - FR FL
|
||||
* 0b11000111 FRC FLC - - - LFE FR FL
|
||||
* 0b11001011 FRC FLC - - FC - FR FL
|
||||
* 0b11001111 FRC FLC - - FC LFE FR FL
|
||||
* 0b11010011 FRC FLC - RC - - FR FL
|
||||
* 0b11010111 FRC FLC - RC - LFE FR FL
|
||||
* 0b11011011 FRC FLC - RC FC - FR FL
|
||||
* 0b11011111 FRC FLC - RC FC LFE FR FL
|
||||
* 0b11110011 FRC FLC RR RL - - FR FL
|
||||
* 0b11110111 FRC FLC RR RL - LFE FR FL
|
||||
* 0b11111011 FRC FLC RR RL FC - FR FL
|
||||
* 0b11111111 FRC FLC RR RL FC LFE FR FL
|
||||
*
|
||||
* @param
|
||||
* speakers - speaker information as it comes from CEA audio block
|
||||
*/
|
||||
/* translate speakers to channels */
|
||||
|
||||
union audio_cea_channels {
|
||||
uint8_t all;
|
||||
struct audio_cea_channels_bits {
|
||||
uint32_t FL:1;
|
||||
uint32_t FR:1;
|
||||
uint32_t LFE:1;
|
||||
uint32_t FC:1;
|
||||
uint32_t RL_RC:1;
|
||||
uint32_t RR:1;
|
||||
uint32_t RC_RLC_FLC:1;
|
||||
uint32_t RRC_FRC:1;
|
||||
} channels;
|
||||
};
|
||||
|
||||
/* 25.2MHz/1.001*/
|
||||
/* 25.2MHz/1.001*/
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
|
||||
|
||||
#include "dc_bios_types.h"
|
||||
#include "hw_shared.h"
|
||||
#include "dcn30_afmt.h"
|
||||
#include "reg_helper.h"
|
||||
|
||||
|
|
|
@ -100,89 +100,6 @@ struct dcn30_afmt_mask {
|
|||
};
|
||||
|
||||
|
||||
/**
|
||||
* speakersToChannels
|
||||
*
|
||||
* @brief
|
||||
* translate speakers to channels
|
||||
*
|
||||
* FL - Front Left
|
||||
* FR - Front Right
|
||||
* RL - Rear Left
|
||||
* RR - Rear Right
|
||||
* RC - Rear Center
|
||||
* FC - Front Center
|
||||
* FLC - Front Left Center
|
||||
* FRC - Front Right Center
|
||||
* RLC - Rear Left Center
|
||||
* RRC - Rear Right Center
|
||||
* LFE - Low Freq Effect
|
||||
*
|
||||
* FC
|
||||
* FLC FRC
|
||||
* FL FR
|
||||
*
|
||||
* LFE
|
||||
* ()
|
||||
*
|
||||
*
|
||||
* RL RR
|
||||
* RLC RRC
|
||||
* RC
|
||||
*
|
||||
* ch 8 7 6 5 4 3 2 1
|
||||
* 0b00000011 - - - - - - FR FL
|
||||
* 0b00000111 - - - - - LFE FR FL
|
||||
* 0b00001011 - - - - FC - FR FL
|
||||
* 0b00001111 - - - - FC LFE FR FL
|
||||
* 0b00010011 - - - RC - - FR FL
|
||||
* 0b00010111 - - - RC - LFE FR FL
|
||||
* 0b00011011 - - - RC FC - FR FL
|
||||
* 0b00011111 - - - RC FC LFE FR FL
|
||||
* 0b00110011 - - RR RL - - FR FL
|
||||
* 0b00110111 - - RR RL - LFE FR FL
|
||||
* 0b00111011 - - RR RL FC - FR FL
|
||||
* 0b00111111 - - RR RL FC LFE FR FL
|
||||
* 0b01110011 - RC RR RL - - FR FL
|
||||
* 0b01110111 - RC RR RL - LFE FR FL
|
||||
* 0b01111011 - RC RR RL FC - FR FL
|
||||
* 0b01111111 - RC RR RL FC LFE FR FL
|
||||
* 0b11110011 RRC RLC RR RL - - FR FL
|
||||
* 0b11110111 RRC RLC RR RL - LFE FR FL
|
||||
* 0b11111011 RRC RLC RR RL FC - FR FL
|
||||
* 0b11111111 RRC RLC RR RL FC LFE FR FL
|
||||
* 0b11000011 FRC FLC - - - - FR FL
|
||||
* 0b11000111 FRC FLC - - - LFE FR FL
|
||||
* 0b11001011 FRC FLC - - FC - FR FL
|
||||
* 0b11001111 FRC FLC - - FC LFE FR FL
|
||||
* 0b11010011 FRC FLC - RC - - FR FL
|
||||
* 0b11010111 FRC FLC - RC - LFE FR FL
|
||||
* 0b11011011 FRC FLC - RC FC - FR FL
|
||||
* 0b11011111 FRC FLC - RC FC LFE FR FL
|
||||
* 0b11110011 FRC FLC RR RL - - FR FL
|
||||
* 0b11110111 FRC FLC RR RL - LFE FR FL
|
||||
* 0b11111011 FRC FLC RR RL FC - FR FL
|
||||
* 0b11111111 FRC FLC RR RL FC LFE FR FL
|
||||
*
|
||||
* @param
|
||||
* speakers - speaker information as it comes from CEA audio block
|
||||
*/
|
||||
/* translate speakers to channels */
|
||||
|
||||
union audio_cea_channels {
|
||||
uint8_t all;
|
||||
struct audio_cea_channels_bits {
|
||||
uint32_t FL:1;
|
||||
uint32_t FR:1;
|
||||
uint32_t LFE:1;
|
||||
uint32_t FC:1;
|
||||
uint32_t RL_RC:1;
|
||||
uint32_t RR:1;
|
||||
uint32_t RC_RLC_FLC:1;
|
||||
uint32_t RRC_FRC:1;
|
||||
} channels;
|
||||
};
|
||||
|
||||
struct afmt;
|
||||
|
||||
struct afmt_funcs {
|
||||
|
|
|
@ -264,4 +264,88 @@ enum dc_lut_mode {
|
|||
LUT_RAM_A,
|
||||
LUT_RAM_B
|
||||
};
|
||||
|
||||
/**
|
||||
* speakersToChannels
|
||||
*
|
||||
* @brief
|
||||
* translate speakers to channels
|
||||
*
|
||||
* FL - Front Left
|
||||
* FR - Front Right
|
||||
* RL - Rear Left
|
||||
* RR - Rear Right
|
||||
* RC - Rear Center
|
||||
* FC - Front Center
|
||||
* FLC - Front Left Center
|
||||
* FRC - Front Right Center
|
||||
* RLC - Rear Left Center
|
||||
* RRC - Rear Right Center
|
||||
* LFE - Low Freq Effect
|
||||
*
|
||||
* FC
|
||||
* FLC FRC
|
||||
* FL FR
|
||||
*
|
||||
* LFE
|
||||
* ()
|
||||
*
|
||||
*
|
||||
* RL RR
|
||||
* RLC RRC
|
||||
* RC
|
||||
*
|
||||
* ch 8 7 6 5 4 3 2 1
|
||||
* 0b00000011 - - - - - - FR FL
|
||||
* 0b00000111 - - - - - LFE FR FL
|
||||
* 0b00001011 - - - - FC - FR FL
|
||||
* 0b00001111 - - - - FC LFE FR FL
|
||||
* 0b00010011 - - - RC - - FR FL
|
||||
* 0b00010111 - - - RC - LFE FR FL
|
||||
* 0b00011011 - - - RC FC - FR FL
|
||||
* 0b00011111 - - - RC FC LFE FR FL
|
||||
* 0b00110011 - - RR RL - - FR FL
|
||||
* 0b00110111 - - RR RL - LFE FR FL
|
||||
* 0b00111011 - - RR RL FC - FR FL
|
||||
* 0b00111111 - - RR RL FC LFE FR FL
|
||||
* 0b01110011 - RC RR RL - - FR FL
|
||||
* 0b01110111 - RC RR RL - LFE FR FL
|
||||
* 0b01111011 - RC RR RL FC - FR FL
|
||||
* 0b01111111 - RC RR RL FC LFE FR FL
|
||||
* 0b11110011 RRC RLC RR RL - - FR FL
|
||||
* 0b11110111 RRC RLC RR RL - LFE FR FL
|
||||
* 0b11111011 RRC RLC RR RL FC - FR FL
|
||||
* 0b11111111 RRC RLC RR RL FC LFE FR FL
|
||||
* 0b11000011 FRC FLC - - - - FR FL
|
||||
* 0b11000111 FRC FLC - - - LFE FR FL
|
||||
* 0b11001011 FRC FLC - - FC - FR FL
|
||||
* 0b11001111 FRC FLC - - FC LFE FR FL
|
||||
* 0b11010011 FRC FLC - RC - - FR FL
|
||||
* 0b11010111 FRC FLC - RC - LFE FR FL
|
||||
* 0b11011011 FRC FLC - RC FC - FR FL
|
||||
* 0b11011111 FRC FLC - RC FC LFE FR FL
|
||||
* 0b11110011 FRC FLC RR RL - - FR FL
|
||||
* 0b11110111 FRC FLC RR RL - LFE FR FL
|
||||
* 0b11111011 FRC FLC RR RL FC - FR FL
|
||||
* 0b11111111 FRC FLC RR RL FC LFE FR FL
|
||||
*
|
||||
* @param
|
||||
* speakers - speaker information as it comes from CEA audio block
|
||||
*/
|
||||
/* translate speakers to channels */
|
||||
|
||||
union audio_cea_channels {
|
||||
uint8_t all;
|
||||
struct audio_cea_channels_bits {
|
||||
uint32_t FL:1;
|
||||
uint32_t FR:1;
|
||||
uint32_t LFE:1;
|
||||
uint32_t FC:1;
|
||||
uint32_t RL_RC:1;
|
||||
uint32_t RR:1;
|
||||
uint32_t RC_RLC_FLC:1;
|
||||
uint32_t RRC_FRC:1;
|
||||
} channels;
|
||||
};
|
||||
|
||||
#endif /* __DAL_HW_SHARED_H__ */
|
||||
|
|
Loading…
Reference in a new issue