drm: adv7511: Add max_lane_freq_khz variable to struct adv7511_chip_info

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@bp.renesas.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Robert Foss <rfoss@kernel.org>
Signed-off-by: Robert Foss <rfoss@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230830142358.275459-4-biju.das.jz@bp.renesas.com

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h
index b9c6c1e8a353b3d0b81bdd386b9f6d54161f2170..f8d61f2fa30ef6ab9e8974beff95814d1b239ff9 100644 (file)
--- 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 4ee90a7542026c5c0910cedb9bd0a60f02756971..4fff3e26e3d9a548a6fce36496566b3ef2f0cdc5 100644 (file)
--- 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 1d113489754c2efcf985f865d61e458ad264b88e..4481489aaf5ebf164313c86cbf3447d2d7914ab9 100644 (file)
--- 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;