| Message ID | 1482145726-16782-2-git-send-email-arnaud.pouliquen@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 19 Dec 2016, Arnaud Pouliquen <arnaud.pouliquen@st.com> wrote: > Add helper to allow users to retrieve the speaker allocations without > knowledge of the ELD structure. > > Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com> I've already replied with my Reviewed-by, please take care to include them. Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > include/drm/drm_edid.h | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h > index c3a7d44..de93543 100644 > --- a/include/drm/drm_edid.h > +++ b/include/drm/drm_edid.h > @@ -248,6 +248,7 @@ struct detailed_timing { > # define DRM_ELD_AUD_SYNCH_DELAY_MAX 0xfa /* 500 ms */ > > #define DRM_ELD_SPEAKER 7 > +# define DRM_ELD_SPEAKER_MASK 0x7f > # define DRM_ELD_SPEAKER_RLRC (1 << 6) > # define DRM_ELD_SPEAKER_FLRC (1 << 5) > # define DRM_ELD_SPEAKER_RC (1 << 4) > @@ -415,6 +416,18 @@ static inline int drm_eld_size(const uint8_t *eld) > } > > /** > + * drm_eld_get_spk_alloc - Get speaker allocation > + * @eld: pointer to an ELD memory structure > + * > + * The returned value is the speakers mask. User has to use %DRM_ELD_SPEAKER > + * field definitions to identify speakers. > + */ > +static inline u8 drm_eld_get_spk_alloc(const uint8_t *eld) > +{ > + return eld[DRM_ELD_SPEAKER] & DRM_ELD_SPEAKER_MASK; > +} > + > +/** > * drm_eld_get_conn_type - Get device type hdmi/dp connected > * @eld: pointer to an ELD memory structure > *
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index c3a7d44..de93543 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -248,6 +248,7 @@ struct detailed_timing { # define DRM_ELD_AUD_SYNCH_DELAY_MAX 0xfa /* 500 ms */ #define DRM_ELD_SPEAKER 7 +# define DRM_ELD_SPEAKER_MASK 0x7f # define DRM_ELD_SPEAKER_RLRC (1 << 6) # define DRM_ELD_SPEAKER_FLRC (1 << 5) # define DRM_ELD_SPEAKER_RC (1 << 4) @@ -415,6 +416,18 @@ static inline int drm_eld_size(const uint8_t *eld) } /** + * drm_eld_get_spk_alloc - Get speaker allocation + * @eld: pointer to an ELD memory structure + * + * The returned value is the speakers mask. User has to use %DRM_ELD_SPEAKER + * field definitions to identify speakers. + */ +static inline u8 drm_eld_get_spk_alloc(const uint8_t *eld) +{ + return eld[DRM_ELD_SPEAKER] & DRM_ELD_SPEAKER_MASK; +} + +/** * drm_eld_get_conn_type - Get device type hdmi/dp connected * @eld: pointer to an ELD memory structure *
Add helper to allow users to retrieve the speaker allocations without knowledge of the ELD structure. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com> --- include/drm/drm_edid.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)