From 4be119ad847e317ad53d1162155b63dccd2ec607 Mon Sep 17 00:00:00 2001 From: Eric Yang Date: Sat, 27 Feb 2016 17:04:24 -0500 Subject: [PATCH 0866/1110] drm/amd/dal: Don't include audio type in dc.h Signed-off-by: Eric Yang Acked-by: Harry Wentland --- drivers/gpu/drm/amd/dal/dc/dc.h | 2 +- drivers/gpu/drm/amd/dal/dc/dc_types.h | 101 ++++++++++++++++++++ drivers/gpu/drm/amd/dal/dc/dm_services.h | 2 - drivers/gpu/drm/amd/dal/include/audio_types.h | 129 -------------------------- 4 files changed, 102 insertions(+), 132 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/dc/dc.h b/drivers/gpu/drm/amd/dal/dc/dc.h index 5660790..348bb0d 100644 --- a/drivers/gpu/drm/amd/dal/dc/dc.h +++ b/drivers/gpu/drm/amd/dal/dc/dc.h @@ -28,7 +28,7 @@ #include "dc_types.h" #include "dal_types.h" -#include "audio_types.h" +#include "grph_object_defs.h" #include "logger_types.h" #include "gpio_types.h" #include "link_service_types.h" diff --git a/drivers/gpu/drm/amd/dal/dc/dc_types.h b/drivers/gpu/drm/amd/dal/dc/dc_types.h index e849972..a0a8542 100644 --- a/drivers/gpu/drm/amd/dal/dc/dc_types.h +++ b/drivers/gpu/drm/amd/dal/dc/dc_types.h @@ -571,4 +571,105 @@ struct render_mode { enum pixel_format pixel_format; }; +/* audio*/ + +union audio_sample_rates { + struct sample_rates { + uint8_t RATE_32:1; + uint8_t RATE_44_1:1; + uint8_t RATE_48:1; + uint8_t RATE_88_2:1; + uint8_t RATE_96:1; + uint8_t RATE_176_4:1; + uint8_t RATE_192:1; + } rate; + + uint8_t all; +}; + +struct audio_speaker_flags { + uint32_t FL_FR:1; + uint32_t LFE:1; + uint32_t FC:1; + uint32_t RL_RR:1; + uint32_t RC:1; + uint32_t FLC_FRC:1; + uint32_t RLC_RRC:1; + uint32_t SUPPORT_AI:1; +}; + +struct audio_speaker_info { + uint32_t ALLSPEAKERS:7; + uint32_t SUPPORT_AI:1; +}; + + +struct audio_info_flags { + + union { + + struct audio_speaker_flags speaker_flags; + struct audio_speaker_info info; + + uint8_t all; + }; +}; + +enum audio_format_code { + AUDIO_FORMAT_CODE_FIRST = 1, + AUDIO_FORMAT_CODE_LINEARPCM = AUDIO_FORMAT_CODE_FIRST, + + AUDIO_FORMAT_CODE_AC3, + /*Layers 1 & 2 */ + AUDIO_FORMAT_CODE_MPEG1, + /*MPEG1 Layer 3 */ + AUDIO_FORMAT_CODE_MP3, + /*multichannel */ + AUDIO_FORMAT_CODE_MPEG2, + AUDIO_FORMAT_CODE_AAC, + AUDIO_FORMAT_CODE_DTS, + AUDIO_FORMAT_CODE_ATRAC, + AUDIO_FORMAT_CODE_1BITAUDIO, + AUDIO_FORMAT_CODE_DOLBYDIGITALPLUS, + AUDIO_FORMAT_CODE_DTS_HD, + AUDIO_FORMAT_CODE_MAT_MLP, + AUDIO_FORMAT_CODE_DST, + AUDIO_FORMAT_CODE_WMAPRO, + AUDIO_FORMAT_CODE_LAST, + AUDIO_FORMAT_CODE_COUNT = + AUDIO_FORMAT_CODE_LAST - AUDIO_FORMAT_CODE_FIRST +}; + +struct audio_mode { + /* ucData[0] [6:3] */ + enum audio_format_code format_code; + /* ucData[0] [2:0] */ + uint8_t channel_count; + /* ucData[1] */ + union audio_sample_rates sample_rates; + union { + /* for LPCM */ + uint8_t sample_size; + /* for Audio Formats 2-8 (Max bit rate divided by 8 kHz) */ + uint8_t max_bit_rate; + /* for Audio Formats 9-15 */ + uint8_t vendor_specific; + }; +}; + +struct audio_info { + struct audio_info_flags flags; + uint32_t video_latency; + uint32_t audio_latency; + uint32_t display_index; + uint8_t display_name[AUDIO_INFO_DISPLAY_NAME_SIZE_IN_CHARS]; + uint32_t manufacture_id; + uint32_t product_id; + /* PortID used for ContainerID when defined */ + uint32_t port_id[2]; + uint32_t mode_count; + /* this field must be last in this struct */ + struct audio_mode modes[DC_MAX_AUDIO_DESC_COUNT]; +}; + #endif /* DC_TYPES_H_ */ diff --git a/drivers/gpu/drm/amd/dal/dc/dm_services.h b/drivers/gpu/drm/amd/dal/dc/dm_services.h index 2d44e92..8acdcd4 100644 --- a/drivers/gpu/drm/amd/dal/dc/dm_services.h +++ b/drivers/gpu/drm/amd/dal/dc/dm_services.h @@ -34,8 +34,6 @@ /* TODO: remove when DC is complete. */ #include "dm_services_types.h" #include "logger_interface.h" -#include "include/dal_types.h" -#include "irq_types.h" #include "link_service_types.h" #undef DEPRECATED diff --git a/drivers/gpu/drm/amd/dal/include/audio_types.h b/drivers/gpu/drm/amd/dal/include/audio_types.h index 8f1eda1..f08b609 100644 --- a/drivers/gpu/drm/amd/dal/include/audio_types.h +++ b/drivers/gpu/drm/amd/dal/include/audio_types.h @@ -33,13 +33,6 @@ #define MAX_HW_AUDIO_INFO_DISPLAY_NAME_SIZE_IN_CHARS 18 #define MULTI_CHANNEL_SPLIT_NO_ASSO_INFO 0xFFFFFFFF -struct audio_pll_hw_settings { - uint32_t feed_back_divider; - uint32_t step_size_integer; - uint32_t step_size_fraction; - uint32_t step_range; -}; - struct audio_clock_info { /* pixel clock frequency*/ uint32_t pixel_clock_in_10khz; @@ -70,113 +63,6 @@ enum audio_dto_source { DTO_SOURCE_ID5 }; -union audio_sample_rates { - struct sample_rates { - uint8_t RATE_32:1; - uint8_t RATE_44_1:1; - uint8_t RATE_48:1; - uint8_t RATE_88_2:1; - uint8_t RATE_96:1; - uint8_t RATE_176_4:1; - uint8_t RATE_192:1; - } rate; - - uint8_t all; -}; - -enum audio_format_code { - AUDIO_FORMAT_CODE_FIRST = 1, - AUDIO_FORMAT_CODE_LINEARPCM = AUDIO_FORMAT_CODE_FIRST, - - AUDIO_FORMAT_CODE_AC3, - /*Layers 1 & 2 */ - AUDIO_FORMAT_CODE_MPEG1, - /*MPEG1 Layer 3 */ - AUDIO_FORMAT_CODE_MP3, - /*multichannel */ - AUDIO_FORMAT_CODE_MPEG2, - AUDIO_FORMAT_CODE_AAC, - AUDIO_FORMAT_CODE_DTS, - AUDIO_FORMAT_CODE_ATRAC, - AUDIO_FORMAT_CODE_1BITAUDIO, - AUDIO_FORMAT_CODE_DOLBYDIGITALPLUS, - AUDIO_FORMAT_CODE_DTS_HD, - AUDIO_FORMAT_CODE_MAT_MLP, - AUDIO_FORMAT_CODE_DST, - AUDIO_FORMAT_CODE_WMAPRO, - AUDIO_FORMAT_CODE_LAST, - AUDIO_FORMAT_CODE_COUNT = - AUDIO_FORMAT_CODE_LAST - AUDIO_FORMAT_CODE_FIRST -}; - -struct audio_mode { - /* ucData[0] [6:3] */ - enum audio_format_code format_code; - /* ucData[0] [2:0] */ - uint8_t channel_count; - /* ucData[1] */ - union audio_sample_rates sample_rates; - union { - /* for LPCM */ - uint8_t sample_size; - /* for Audio Formats 2-8 (Max bit rate divided by 8 kHz) */ - uint8_t max_bit_rate; - /* for Audio Formats 9-15 */ - uint8_t vendor_specific; - }; -}; - -struct audio_speaker_flags { - uint32_t FL_FR:1; - uint32_t LFE:1; - uint32_t FC:1; - uint32_t RL_RR:1; - uint32_t RC:1; - uint32_t FLC_FRC:1; - uint32_t RLC_RRC:1; - uint32_t SUPPORT_AI:1; -}; - -struct audio_speaker_info { - uint32_t ALLSPEAKERS:7; - uint32_t SUPPORT_AI:1; -}; - -struct audio_info_flags { - - union { - - struct audio_speaker_flags speaker_flags; - struct audio_speaker_info info; - - uint8_t all; - }; -}; - -/*struct audio_info_flags { - struct audio_speaker_flags { - uint32_t FL_FR:1; - uint32_t LFE:1; - uint32_t FC:1; - uint32_t RL_RR:1; - uint32_t RC:1; - uint32_t FLC_FRC:1; - uint32_t RLC_RRC:1; - uint32_t SUPPORT_AI:1; - }; - - struct audio_speaker_info { - uint32_t ALLSPEAKERS:7; - uint32_t SUPPORT_AI:1; - }; - - union { - struct audio_speaker_flags speaker_flags; - struct audio_speaker_info info; - }; -}; -*/ - union audio_cea_channels { uint8_t all; struct audio_cea_channels_bits { @@ -191,21 +77,6 @@ union audio_cea_channels { } channels; }; -struct audio_info { - struct audio_info_flags flags; - uint32_t video_latency; - uint32_t audio_latency; - uint32_t display_index; - uint8_t display_name[AUDIO_INFO_DISPLAY_NAME_SIZE_IN_CHARS]; - uint32_t manufacture_id; - uint32_t product_id; - /* PortID used for ContainerID when defined */ - uint32_t port_id[2]; - uint32_t mode_count; - /* this field must be last in this struct */ - struct audio_mode modes[DC_MAX_AUDIO_DESC_COUNT]; -}; - struct audio_crtc_info { uint32_t h_total; uint32_t h_active; -- 2.7.4