On Wed, Aug 30, 2023 at 4:24 PM Biju Das <biju.das.jz@xxxxxxxxxxxxxx> wrote:
>
> The ADV7533 supports a maximum lane clock of 800MHz whereas it is 891MHz
> for ADV7535. Add max_lane_freq_khz variable to struct adv7511_chip_info to
> handle this difference.
>
> While at it, drop the unused local variable max_lane_freq.
>
> Signed-off-by: Biju Das <biju.das.jz@xxxxxxxxxxxxxx>
> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> ---
> v1->v2:
> * Added Rb tag from Laurent.
> * Replaced max_lane_freq->max_lane_freq_khz in struct adv7511_chip_info.
> * Replaced variable type from unsigned long->unsigned int.
> ---
> drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 +
> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 ++
> drivers/gpu/drm/bridge/adv7511/adv7533.c | 5 +----
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h
> index b9c6c1e8a353..f8d61f2fa30e 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h
> @@ -336,6 +336,7 @@ enum adv7511_type {
> struct adv7511_chip_info {
> enum adv7511_type type;
> unsigned int max_mode_clock_khz;
> + unsigned int max_lane_freq_khz;
> };
>
> struct adv7511 {
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index 12ceffd6a9eb..1c76aa5a5d5b 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -1370,11 +1370,13 @@ static const struct adv7511_chip_info adv7511_chip_info = {
> static const struct adv7511_chip_info adv7533_chip_info = {
> .type = ADV7533,
> .max_mode_clock_khz = 80000,
> + .max_lane_freq_khz = 800000,
> };
>
> static const struct adv7511_chip_info adv7535_chip_info = {
> .type = ADV7535,
> .max_mode_clock_khz = 148500,
> + .max_lane_freq_khz = 891000,
> };
>
> static const struct i2c_device_id adv7511_i2c_ids[] = {
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7533.c b/drivers/gpu/drm/bridge/adv7511/adv7533.c
> index 1d113489754c..4481489aaf5e 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7533.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7533.c
> @@ -103,7 +103,6 @@ void adv7533_dsi_power_off(struct adv7511 *adv)
> enum drm_mode_status adv7533_mode_valid(struct adv7511 *adv,
> const struct drm_display_mode *mode)
> {
> - unsigned long max_lane_freq;
> struct mipi_dsi_device *dsi = adv->dsi;
> u8 bpp = mipi_dsi_pixel_format_to_bpp(dsi->format);
>
> @@ -112,9 +111,7 @@ enum drm_mode_status adv7533_mode_valid(struct adv7511 *adv,
> return MODE_CLOCK_HIGH;
>
> /* Check max clock for each lane */
> - max_lane_freq = (adv->info->type == ADV7533 ? 800000 : 891000);
> -
> - if (mode->clock * bpp > max_lane_freq * adv->num_dsi_lanes)
> + if (mode->clock * bpp > adv->info->max_lane_freq_khz * adv->num_dsi_lanes)
> return MODE_CLOCK_HIGH;
>
> return MODE_OK;
> --
> 2.25.1
>
Reviewed-by: Robert Foss <rfoss@xxxxxxxxxx>
