Re: [PATCH drm-dp 3/4] drm/hisilicon/hibmc: add dp kapi moduel in hibmc drivers

[Yongbang Shi <shiyongbang@huawei.com>]

> On Mon, 21 Oct 2024 at 15:22, Yongbang Shi <shiyongbang@huawei.com> wrote:
>> Hi Dmitry,
>> There're some format problems with the previous replies. Send it again here.
>> Thanks for your advices, I'll resolve the problems you mentioned.
>>
>>> On Mon, Sep 30, 2024 at 06:06:09PM +0800, shiyongbang wrote:
>>>> From: baihan li <libaihan@huawei.com>
>>>>
>>>> Build a kapi level that hibmc driver can enable dp by
>>>> calling these kapi functions.
>>>>
>>>> Signed-off-by: baihan li <libaihan@huawei.com>
>>>> ---
>>>>    drivers/gpu/drm/hisilicon/hibmc/Makefile      |  2 +-
>>>>    .../gpu/drm/hisilicon/hibmc/dp/dp_config.h    | 20 ++++++++
>>>>    drivers/gpu/drm/hisilicon/hibmc/dp/dp_kapi.c  | 12 ++---
>>>>    drivers/gpu/drm/hisilicon/hibmc/dp/dp_kapi.h  | 48 +++++++++++++++++++
>>>>    4 files changed, 75 insertions(+), 7 deletions(-)
>>>>    create mode 100644 drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h
>>>>    create mode 100644 drivers/gpu/drm/hisilicon/hibmc/dp/dp_kapi.h
>>>>
>>>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/Makefile b/drivers/gpu/drm/hisilicon/hibmc/Makefile
>>>> index 94d77da88bbf..693036dfab52 100644
>>>> --- a/drivers/gpu/drm/hisilicon/hibmc/Makefile
>>>> +++ b/drivers/gpu/drm/hisilicon/hibmc/Makefile
>>>> @@ -1,5 +1,5 @@
>>>>    # SPDX-License-Identifier: GPL-2.0-only
>>>>    hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_drm_i2c.o \
>>>> -           dp/dp_aux.o dp/dp_link.o
>>>> +           dp/dp_aux.o dp/dp_link.o dp/dp_kapi.o
>>>>
>>>>    obj-$(CONFIG_DRM_HISI_HIBMC) += hibmc-drm.o
>>>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h
>>>> new file mode 100644
>>>> index 000000000000..a6353a808cc4
>>>> --- /dev/null
>>>> +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h
>>>> @@ -0,0 +1,20 @@
>>>> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>>>> +/* Copyright (c) 2024 Hisilicon Limited. */
>>>> +
>>>> +#ifndef DP_CONFIG_H
>>>> +#define DP_CONFIG_H
>>>> +
>>>> +#define DP_BPP 24
>>>> +#define DP_SYMBOL_PER_FCLK 4
>>>> +#define DP_MIN_PULSE_NUM 0x9
>>>> +#define DP_MSA1 0x20
>>>> +#define DP_MSA2 0x845c00
>>>> +#define DP_OFFSET 0x1e0000
>>>> +#define DP_HDCP 0x2
>>>> +#define DP_INT_RST 0xffff
>>>> +#define DP_DPTX_RST 0x3ff
>>>> +#define DP_CLK_EN 0x7
>>>> +#define DP_SYNC_EN_MASK 0x3
>>>> +#define DP_LINK_RATE_CAL 27
>>> I think some of these defines were used in previous patches. Please make
>>> sure that at each step the code builds without errors.
>>>
>>>> +
>>>> +#endif
>>>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_kapi.c b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_kapi.c
>>>> index 4091723473ad..ca7edc69427c 100644
>>>> --- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_kapi.c
>>>> +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_kapi.c
>>>> @@ -64,12 +64,12 @@ static void hibmc_dp_set_tu(struct hibmc_dp_dev *dp, struct dp_mode *mode)
>>>>       rate_ks = dp->link.cap.link_rate * DP_LINK_RATE_CAL;
>>>>       value = (pixel_clock * bpp * 5000) / (61 * lane_num * rate_ks);
>>>>
>>>> -    if (value % 10 == 9) { /* 10: div, 9: carry */
>>>> -            tu_symbol_size = value / 10 + 1; /* 10: div */
>>>> +    if (value % 10 == 9) { /* 9 carry */
>>>> +            tu_symbol_size = value / 10 + 1;
>>>>               tu_symbol_frac_size = 0;
>>>>       } else {
>>>> -            tu_symbol_size = value / 10; /* 10: div */
>>>> -            tu_symbol_frac_size = value % 10 + 1; /* 10: div */
>>>> +            tu_symbol_size = value / 10;
>>>> +            tu_symbol_frac_size = value % 10 + 1;
>>>>       }
>>>>
>>>>       drm_info(dp->dev, "tu value: %u.%u value: %u\n",
>>>> @@ -158,7 +158,7 @@ static void hibmc_dp_link_cfg(struct hibmc_dp_dev *dp, struct dp_mode *mode)
>>>>       dp_write_bits(dp->base + DP_VIDEO_CTRL,
>>>>                     DP_CFG_STREAM_HSYNC_POLARITY, mode->h_pol);
>>>>
>>>> -    /* MSA mic 0 and 1*/
>>>> +    /* MSA mic 0 and 1 */
>>>>       writel(DP_MSA1, dp->base + DP_VIDEO_MSA1);
>>>>       writel(DP_MSA2, dp->base + DP_VIDEO_MSA2);
>>>>
>>>> @@ -167,7 +167,7 @@ static void hibmc_dp_link_cfg(struct hibmc_dp_dev *dp, struct dp_mode *mode)
>>>>       dp_write_bits(dp->base + DP_VIDEO_CTRL, DP_CFG_STREAM_RGB_ENABLE, 0x1);
>>>>       dp_write_bits(dp->base + DP_VIDEO_CTRL, DP_CFG_STREAM_VIDEO_MAPPING, 0);
>>>>
>>>> -    /*divide 2: up even */
>>>> +    /* divide 2: up even */
>>>>       if (timing_delay % 2)
>>>>               timing_delay++;
>>>>
>>> This should be squashed into the previous commits.
>>>
>>>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_kapi.h b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_kapi.h
>>>> new file mode 100644
>>>> index 000000000000..6b07642d55b8
>>>> --- /dev/null
>>>> +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_kapi.h
>>>> @@ -0,0 +1,48 @@
>>>> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>>>> +/* Copyright (c) 2024 Hisilicon Limited. */
>>>> +
>>>> +#ifndef DP_KAPI_H
>>>> +#define DP_KAPI_H
>>>> +
>>>> +#include <linux/types.h>
>>>> +#include <drm/drm_device.h>
>>>> +#include <drm/drm_encoder.h>
>>>> +#include <drm/drm_connector.h>
>>>> +#include <drm/drm_print.h>
>>>> +#include <linux/delay.h>
>>> Sort the headers, please.
>>>
>>>> +
>>>> +struct hibmc_dp_dev;
>>>> +
>>>> +struct dp_mode {
>>>> +    u32 h_total;
>>>> +    u32 h_active;
>>>> +    u32 h_blank;
>>>> +    u32 h_front;
>>>> +    u32 h_sync;
>>>> +    u32 h_back;
>>>> +    bool h_pol;
>>>> +    u32 v_total;
>>>> +    u32 v_active;
>>>> +    u32 v_blank;
>>>> +    u32 v_front;
>>>> +    u32 v_sync;
>>>> +    u32 v_back;
>>>> +    bool v_pol;
>>>> +    u32 field_rate;
>>>> +    u32 pixel_clock; // khz
>>> Why do you need a separate struct for this?
>> I can try to use drm_mode function and refactor this struct, but they're insufficient for our scenarios.
>> Here's change template bellow:
> But you are generating the data from struct drm_display_mode. Please
> use the existing struct instead and generate the blank and porch
> timings when you have to program them.
> There is really no need to define another struct just to temporarily
> hold the same data.

I got it! I'll directly use drm_mode values in dp config.

Thanks,
Baihan


>> struct dp_mode {
>>           sturct videomode mode;
>>           u32 h_total;
>>           u32 h_blank;
>>           u32 v_total;
>>           u32 v_blank;
>>           u32 field_rate;
>> };
>> static void dp_mode_cfg(struct dp_mode *dp_mode, struct drm_display_mode *mode)
>> {
>>           dp_mode->field_rate = drm_mode_vrefresh(mode);
>>           drm_display_mode_to_videomode(mode, &dp_mode->vmode);
>>           dp_mode->h_total = mode->htotal;
>>           dp_mode->h_blank = mode->htotal - mode->hdisplay;
>>           dp_mode->v_total = mode->vtotal;
>>           dp_mode->v_blank = mode->vtotal - mode->vdisplay;
>> }
>>