Message ID | ac358f6e84d80db208e78e0c7a892d4b30b073a8.1694078430.git.jani.nikula@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/edid: split out drm_eld.[ch], add some SAD helpers | expand |
> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jani > Nikula > Sent: Thursday, September 7, 2023 2:58 PM > To: dri-devel@lists.freedesktop.org > Cc: Nikula, Jani <jani.nikula@intel.com>; intel-gfx@lists.freedesktop.org > Subject: [Intel-gfx] [PATCH 2/6] drm/eld: replace uint8_t with u8 > > Unify on kernel types. > > Cc: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> LGTM Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> > --- > include/drm/drm_eld.h | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/include/drm/drm_eld.h b/include/drm/drm_eld.h index > 9bde89bd96ea..7b674256b9aa 100644 > --- a/include/drm/drm_eld.h > +++ b/include/drm/drm_eld.h > @@ -70,7 +70,7 @@ > * drm_eld_mnl - Get ELD monitor name length in bytes. > * @eld: pointer to an eld memory structure with mnl set > */ > -static inline int drm_eld_mnl(const uint8_t *eld) > +static inline int drm_eld_mnl(const u8 *eld) > { > return (eld[DRM_ELD_CEA_EDID_VER_MNL] & > DRM_ELD_MNL_MASK) >> DRM_ELD_MNL_SHIFT; } @@ -79,7 +79,7 @@ > static inline int drm_eld_mnl(const uint8_t *eld) > * drm_eld_sad - Get ELD SAD structures. > * @eld: pointer to an eld memory structure with sad_count set > */ > -static inline const uint8_t *drm_eld_sad(const uint8_t *eld) > +static inline const u8 *drm_eld_sad(const u8 *eld) > { > unsigned int ver, mnl; > > @@ -98,7 +98,7 @@ static inline const uint8_t *drm_eld_sad(const uint8_t > *eld) > * drm_eld_sad_count - Get ELD SAD count. > * @eld: pointer to an eld memory structure with sad_count set > */ > -static inline int drm_eld_sad_count(const uint8_t *eld) > +static inline int drm_eld_sad_count(const u8 *eld) > { > return (eld[DRM_ELD_SAD_COUNT_CONN_TYPE] & > DRM_ELD_SAD_COUNT_MASK) >> > DRM_ELD_SAD_COUNT_SHIFT; > @@ -111,7 +111,7 @@ static inline int drm_eld_sad_count(const uint8_t *eld) > * This is a helper for determining the payload size of the baseline block, in > * bytes, for e.g. setting the Baseline_ELD_Len field in the ELD header block. > */ > -static inline int drm_eld_calc_baseline_block_size(const uint8_t *eld) > +static inline int drm_eld_calc_baseline_block_size(const u8 *eld) > { > return DRM_ELD_MONITOR_NAME_STRING - > DRM_ELD_HEADER_BLOCK_SIZE + > drm_eld_mnl(eld) + drm_eld_sad_count(eld) * 3; @@ -127,7 > +127,7 @@ static inline int drm_eld_calc_baseline_block_size(const uint8_t > *eld) > * > * The returned value is guaranteed to be a multiple of 4. > */ > -static inline int drm_eld_size(const uint8_t *eld) > +static inline int drm_eld_size(const u8 *eld) > { > return DRM_ELD_HEADER_BLOCK_SIZE + > eld[DRM_ELD_BASELINE_ELD_LEN] * 4; } @@ -139,7 +139,7 @@ static inline > int drm_eld_size(const uint8_t *eld) > * 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) > +static inline u8 drm_eld_get_spk_alloc(const u8 *eld) > { > return eld[DRM_ELD_SPEAKER] & DRM_ELD_SPEAKER_MASK; } @@ - > 151,7 +151,7 @@ static inline u8 drm_eld_get_spk_alloc(const uint8_t *eld) > * The caller need to use %DRM_ELD_CONN_TYPE_HDMI or > %DRM_ELD_CONN_TYPE_DP to > * identify the display type connected. > */ > -static inline u8 drm_eld_get_conn_type(const uint8_t *eld) > +static inline u8 drm_eld_get_conn_type(const u8 *eld) > { > return eld[DRM_ELD_SAD_COUNT_CONN_TYPE] & > DRM_ELD_CONN_TYPE_MASK; } > -- > 2.39.2
> -----Original Message----- > From: Nikula, Jani <jani.nikula@intel.com> > Sent: Thursday, September 7, 2023 2:58 PM > To: dri-devel@lists.freedesktop.org > Cc: intel-gfx@lists.freedesktop.org; Nikula, Jani <jani.nikula@intel.com>; > Golani, Mitulkumar Ajitkumar <mitulkumar.ajitkumar.golani@intel.com> > Subject: [PATCH 2/6] drm/eld: replace uint8_t with u8 > > Unify on kernel types. > > Cc: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > include/drm/drm_eld.h | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/include/drm/drm_eld.h b/include/drm/drm_eld.h index > 9bde89bd96ea..7b674256b9aa 100644 > --- a/include/drm/drm_eld.h > +++ b/include/drm/drm_eld.h > @@ -70,7 +70,7 @@ > * drm_eld_mnl - Get ELD monitor name length in bytes. > * @eld: pointer to an eld memory structure with mnl set > */ > -static inline int drm_eld_mnl(const uint8_t *eld) > +static inline int drm_eld_mnl(const u8 *eld) > { > return (eld[DRM_ELD_CEA_EDID_VER_MNL] & > DRM_ELD_MNL_MASK) >> DRM_ELD_MNL_SHIFT; } @@ -79,7 +79,7 @@ > static inline int drm_eld_mnl(const uint8_t *eld) > * drm_eld_sad - Get ELD SAD structures. > * @eld: pointer to an eld memory structure with sad_count set > */ > -static inline const uint8_t *drm_eld_sad(const uint8_t *eld) > +static inline const u8 *drm_eld_sad(const u8 *eld) > { > unsigned int ver, mnl; > > @@ -98,7 +98,7 @@ static inline const uint8_t *drm_eld_sad(const uint8_t > *eld) > * drm_eld_sad_count - Get ELD SAD count. > * @eld: pointer to an eld memory structure with sad_count set > */ > -static inline int drm_eld_sad_count(const uint8_t *eld) > +static inline int drm_eld_sad_count(const u8 *eld) > { > return (eld[DRM_ELD_SAD_COUNT_CONN_TYPE] & > DRM_ELD_SAD_COUNT_MASK) >> > DRM_ELD_SAD_COUNT_SHIFT; > @@ -111,7 +111,7 @@ static inline int drm_eld_sad_count(const uint8_t > *eld) > * This is a helper for determining the payload size of the baseline block, in > * bytes, for e.g. setting the Baseline_ELD_Len field in the ELD header block. > */ > -static inline int drm_eld_calc_baseline_block_size(const uint8_t *eld) > +static inline int drm_eld_calc_baseline_block_size(const u8 *eld) > { > return DRM_ELD_MONITOR_NAME_STRING - > DRM_ELD_HEADER_BLOCK_SIZE + > drm_eld_mnl(eld) + drm_eld_sad_count(eld) * 3; @@ -127,7 > +127,7 @@ static inline int drm_eld_calc_baseline_block_size(const uint8_t > *eld) > * > * The returned value is guaranteed to be a multiple of 4. > */ > -static inline int drm_eld_size(const uint8_t *eld) > +static inline int drm_eld_size(const u8 *eld) > { > return DRM_ELD_HEADER_BLOCK_SIZE + > eld[DRM_ELD_BASELINE_ELD_LEN] * 4; } @@ -139,7 +139,7 @@ static inline > int drm_eld_size(const uint8_t *eld) > * 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) > +static inline u8 drm_eld_get_spk_alloc(const u8 *eld) > { > return eld[DRM_ELD_SPEAKER] & DRM_ELD_SPEAKER_MASK; } @@ - > 151,7 +151,7 @@ static inline u8 drm_eld_get_spk_alloc(const uint8_t *eld) > * The caller need to use %DRM_ELD_CONN_TYPE_HDMI or > %DRM_ELD_CONN_TYPE_DP to > * identify the display type connected. > */ > -static inline u8 drm_eld_get_conn_type(const uint8_t *eld) > +static inline u8 drm_eld_get_conn_type(const u8 *eld) Changes LGTM Reviewed-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com> > { > return eld[DRM_ELD_SAD_COUNT_CONN_TYPE] & > DRM_ELD_CONN_TYPE_MASK; } > -- > 2.39.2
diff --git a/include/drm/drm_eld.h b/include/drm/drm_eld.h index 9bde89bd96ea..7b674256b9aa 100644 --- a/include/drm/drm_eld.h +++ b/include/drm/drm_eld.h @@ -70,7 +70,7 @@ * drm_eld_mnl - Get ELD monitor name length in bytes. * @eld: pointer to an eld memory structure with mnl set */ -static inline int drm_eld_mnl(const uint8_t *eld) +static inline int drm_eld_mnl(const u8 *eld) { return (eld[DRM_ELD_CEA_EDID_VER_MNL] & DRM_ELD_MNL_MASK) >> DRM_ELD_MNL_SHIFT; } @@ -79,7 +79,7 @@ static inline int drm_eld_mnl(const uint8_t *eld) * drm_eld_sad - Get ELD SAD structures. * @eld: pointer to an eld memory structure with sad_count set */ -static inline const uint8_t *drm_eld_sad(const uint8_t *eld) +static inline const u8 *drm_eld_sad(const u8 *eld) { unsigned int ver, mnl; @@ -98,7 +98,7 @@ static inline const uint8_t *drm_eld_sad(const uint8_t *eld) * drm_eld_sad_count - Get ELD SAD count. * @eld: pointer to an eld memory structure with sad_count set */ -static inline int drm_eld_sad_count(const uint8_t *eld) +static inline int drm_eld_sad_count(const u8 *eld) { return (eld[DRM_ELD_SAD_COUNT_CONN_TYPE] & DRM_ELD_SAD_COUNT_MASK) >> DRM_ELD_SAD_COUNT_SHIFT; @@ -111,7 +111,7 @@ static inline int drm_eld_sad_count(const uint8_t *eld) * This is a helper for determining the payload size of the baseline block, in * bytes, for e.g. setting the Baseline_ELD_Len field in the ELD header block. */ -static inline int drm_eld_calc_baseline_block_size(const uint8_t *eld) +static inline int drm_eld_calc_baseline_block_size(const u8 *eld) { return DRM_ELD_MONITOR_NAME_STRING - DRM_ELD_HEADER_BLOCK_SIZE + drm_eld_mnl(eld) + drm_eld_sad_count(eld) * 3; @@ -127,7 +127,7 @@ static inline int drm_eld_calc_baseline_block_size(const uint8_t *eld) * * The returned value is guaranteed to be a multiple of 4. */ -static inline int drm_eld_size(const uint8_t *eld) +static inline int drm_eld_size(const u8 *eld) { return DRM_ELD_HEADER_BLOCK_SIZE + eld[DRM_ELD_BASELINE_ELD_LEN] * 4; } @@ -139,7 +139,7 @@ static inline int drm_eld_size(const uint8_t *eld) * 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) +static inline u8 drm_eld_get_spk_alloc(const u8 *eld) { return eld[DRM_ELD_SPEAKER] & DRM_ELD_SPEAKER_MASK; } @@ -151,7 +151,7 @@ static inline u8 drm_eld_get_spk_alloc(const uint8_t *eld) * The caller need to use %DRM_ELD_CONN_TYPE_HDMI or %DRM_ELD_CONN_TYPE_DP to * identify the display type connected. */ -static inline u8 drm_eld_get_conn_type(const uint8_t *eld) +static inline u8 drm_eld_get_conn_type(const u8 *eld) { return eld[DRM_ELD_SAD_COUNT_CONN_TYPE] & DRM_ELD_CONN_TYPE_MASK; }
Unify on kernel types. Cc: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- include/drm/drm_eld.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)