From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B573C001DC for ; Mon, 31 Jul 2023 12:06:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230032AbjGaMGO (ORCPT ); Mon, 31 Jul 2023 08:06:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229819AbjGaMGL (ORCPT ); Mon, 31 Jul 2023 08:06:11 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D350C1716 for ; Mon, 31 Jul 2023 05:05:49 -0700 (PDT) Received: from [192.168.1.100] (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id C542366020AE; Mon, 31 Jul 2023 13:05:47 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1690805148; bh=Cp1OUkoq2QcJiLwkZOnkdDS0aVQ4fce+FabJFBEosT0=; h=Date:Subject:From:To:Cc:References:In-Reply-To:From; b=g3F/ITRTQABf7q5YPRM3ABPAL5TG2irUPeqFo+70YXEdW7Z8EfO3oFUQqsFVJF1PU a1J4yB2HoMpTo3sC94srJsT/gb6F2I8IXetGrRZWXYDUVZyPi1QkdHYwtVYhYw506E QZ6qYPDL53iD39dtAZCaMMjzahi+u83sBUrFjPpWFwF6D9qK94gwdja28NnKIgjaYC a7Ld0V+WG+jzPYMjbhucrI+N6sXWZZRlBncQGm22M27CgJIgy2i0YlVzdLv8qvQ9+F yDKxyr1Bt1MPfBYAXN7J3qpjQdtq/J6o5y0AiB7fIHGXBiPSWY8SfVv10sknDMP580 9eeCo+OxRxXbQ== Message-ID: <555a378b-9a35-1f32-4b83-352e4174002a@collabora.com> Date: Mon, 31 Jul 2023 14:05:45 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH RESEND v6 03/11] drm/mediatek: gamma: Support SoC specific LUT size Content-Language: en-US From: AngeloGioacchino Del Regno To: =?UTF-8?B?Q0sgSHUgKOiDoeS/iuWFiSk=?= , "chunkuang.hu@kernel.org" Cc: "linux-kernel@vger.kernel.org" , "linux-mediatek@lists.infradead.org" , "wenst@chromium.org" , =?UTF-8?B?SmFzb24tSkggTGluICjmnpfnnb/npaUp?= , "kernel@collabora.com" , "dri-devel@lists.freedesktop.org" , "ehristev@collabora.com" , "linux-arm-kernel@lists.infradead.org" , "matthias.bgg@gmail.com" References: <20230727094633.22505-1-angelogioacchino.delregno@collabora.com> <20230727094633.22505-4-angelogioacchino.delregno@collabora.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Il 31/07/23 12:40, AngeloGioacchino Del Regno ha scritto: > Il 31/07/23 09:49, CK Hu (胡俊光) ha scritto: >> Hi, Angelo: >> >> On Thu, 2023-07-27 at 11:46 +0200, AngeloGioacchino Del Regno wrote: >>> Newer SoCs support a bigger Gamma LUT table: wire up a callback >>> to retrieve the correct LUT size for each different Gamma IP. >>> >>> Co-developed-by: Jason-JH.Lin >>> Signed-off-by: Jason-JH.Lin >>> [Angelo: Rewritten commit message/description + porting] >>> Signed-off-by: AngeloGioacchino Del Regno < >>> angelogioacchino.delregno@collabora.com> >>> Reviewed-by: Jason-JH.Lin >>> --- >>>   drivers/gpu/drm/mediatek/mtk_disp_drv.h     |  1 + >>>   drivers/gpu/drm/mediatek/mtk_disp_gamma.c   | 25 ++++++++++++++++++- >>> -- >>>   drivers/gpu/drm/mediatek/mtk_drm_crtc.c     |  4 ++-- >>>   drivers/gpu/drm/mediatek/mtk_drm_crtc.h     |  1 - >>>   drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c |  1 + >>>   drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h |  9 ++++++++ >>>   6 files changed, 35 insertions(+), 6 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h >>> b/drivers/gpu/drm/mediatek/mtk_disp_drv.h >>> index 75045932353e..e554b19f4830 100644 >>> --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h >>> +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h >>> @@ -53,6 +53,7 @@ void mtk_gamma_clk_disable(struct device *dev); >>>   void mtk_gamma_config(struct device *dev, unsigned int w, >>>                 unsigned int h, unsigned int vrefresh, >>>                 unsigned int bpc, struct cmdq_pkt *cmdq_pkt); >>> +unsigned int mtk_gamma_get_lut_size(struct device *dev); >>>   void mtk_gamma_set(struct device *dev, struct drm_crtc_state >>> *state); >>>   void mtk_gamma_set_common(struct device *dev, void __iomem *regs, >>> struct drm_crtc_state *state); >>>   void mtk_gamma_start(struct device *dev); >>> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c >>> b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c >>> index ce6f2499b891..b25ba209e7a4 100644 >>> --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c >>> +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c >>> @@ -25,10 +25,12 @@ >>>   #define DISP_GAMMA_LUT                0x0700 >>>   #define LUT_10BIT_MASK                0x03ff >>> +#define LUT_SIZE_DEFAULT            512 >>>   struct mtk_disp_gamma_data { >>>       bool has_dither; >>>       bool lut_diff; >>> +    u16 lut_size; >>>   }; >>>   /* >>> @@ -55,6 +57,17 @@ void mtk_gamma_clk_disable(struct device *dev) >>>       clk_disable_unprepare(gamma->clk); >>>   } >>> +unsigned int mtk_gamma_get_lut_size(struct device *dev) >>> +{ >>> +    struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); >>> +    unsigned int lut_size = LUT_SIZE_DEFAULT; >>> + >>> +    if (gamma && gamma->data) >>> +        lut_size = gamma->data->lut_size; >>> + >>> +    return lut_size; >>> +} >>> + >>>   void mtk_gamma_set_common(struct device *dev, void __iomem *regs, >>> struct drm_crtc_state *state) >>>   { >>>       struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); >>> @@ -62,6 +75,7 @@ void mtk_gamma_set_common(struct device *dev, void >>> __iomem *regs, struct drm_crt >>>       struct drm_color_lut *lut; >>>       void __iomem *lut_base; >>>       bool lut_diff; >>> +    u16 lut_size; >>>       u32 word; >>>       u32 diff[3] = {0}; >>> @@ -69,17 +83,20 @@ void mtk_gamma_set_common(struct device *dev, >>> void __iomem *regs, struct drm_crt >>>       if (!state->gamma_lut) >>>           return; >>> -    if (gamma && gamma->data) >>> +    if (gamma && gamma->data) { >>>           lut_diff = gamma->data->lut_diff; >>> -    else >>> +        lut_size = gamma->data->lut_size; >>> +    } else { >>>           lut_diff = false; >>> +        lut_size = LUT_SIZE_DEFAULT; >>> +    } >>>       reg = readl(regs + DISP_GAMMA_CFG); >>>       reg = reg | GAMMA_LUT_EN; >>>       writel(reg, regs + DISP_GAMMA_CFG); >>>       lut_base = regs + DISP_GAMMA_LUT; >>>       lut = (struct drm_color_lut *)state->gamma_lut->data; >>> -    for (i = 0; i < MTK_LUT_SIZE; i++) { >>> +    for (i = 0; i < lut_size; i++) { >>>           if (!lut_diff || (i % 2 == 0)) { >>>               word = (((lut[i].red >> 6) & LUT_10BIT_MASK) << >>> 20) + >>>                   (((lut[i].green >> 6) & LUT_10BIT_MASK) >>> << 10) + >>> @@ -196,10 +213,12 @@ static int mtk_disp_gamma_remove(struct >>> platform_device *pdev) >>>   static const struct mtk_disp_gamma_data mt8173_gamma_driver_data = { >>>       .has_dither = true, >>> +    .lut_size = 512, >>>   }; >>>   static const struct mtk_disp_gamma_data mt8183_gamma_driver_data = { >>>       .lut_diff = true, >>> +    .lut_size = 512, >>>   }; >>>   static const struct of_device_id mtk_disp_gamma_driver_dt_match[] = >>> { >>> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c >>> b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c >>> index d40142842f85..0df62b076f49 100644 >>> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c >>> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c >>> @@ -958,8 +958,8 @@ int mtk_drm_crtc_create(struct drm_device >>> *drm_dev, >>>           mtk_crtc->ddp_comp[i] = comp; >>>           if (comp->funcs) { >>> -            if (comp->funcs->gamma_set) >>> -                gamma_lut_size = MTK_LUT_SIZE; >>> +            if (comp->funcs->gamma_set && comp->funcs- >>>> gamma_get_lut_size) >>> +                gamma_lut_size = >>> mtk_ddp_gamma_get_lut_size(comp); >> >> In this patch, for AAL, the gamma_lut_size is not defined. >> > > It is defined: AAL will call mtk_gamma_set_common(), which will use > the "DEFAULT" (512) LUT size if no platform data was provided and the > platform data can only come from the mtk_gamma driver - so, if the > call to mtk_gamma_set_common() comes from mtk_aal, it will use 512. > > P.S.: The call to drm_mode_crtc_set_gamma_size() is performed only if >       gamma_lut_size > 0. > Actually, I see what you mean now. Gets fixed in v7. Thanks! > Regards, > Angelo > >> Regards, >> CK >> >>>               if (comp->funcs->ctm_set) >>>                   has_ctm = true; >>> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h >>> b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h >>> index 3e9046993d09..b2e50292e57d 100644 >>> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h >>> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h >>> @@ -10,7 +10,6 @@ >>>   #include "mtk_drm_ddp_comp.h" >>>   #include "mtk_drm_plane.h" >>> -#define MTK_LUT_SIZE    512 >>>   #define MTK_MAX_BPC    10 >>>   #define MTK_MIN_BPC    3 >>> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c >>> b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c >>> index f114da4d36a9..c77af2e4000f 100644 >>> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c >>> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c >>> @@ -322,6 +322,7 @@ static const struct mtk_ddp_comp_funcs ddp_dsi = >>> { >>>   static const struct mtk_ddp_comp_funcs ddp_gamma = { >>>       .clk_enable = mtk_gamma_clk_enable, >>>       .clk_disable = mtk_gamma_clk_disable, >>> +    .gamma_get_lut_size = mtk_gamma_get_lut_size, >>>       .gamma_set = mtk_gamma_set, >>>       .config = mtk_gamma_config, >>>       .start = mtk_gamma_start, >>> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h >>> b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h >>> index febcaeef16a1..c1355960e195 100644 >>> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h >>> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h >>> @@ -67,6 +67,7 @@ struct mtk_ddp_comp_funcs { >>>       void (*layer_config)(struct device *dev, unsigned int idx, >>>                    struct mtk_plane_state *state, >>>                    struct cmdq_pkt *cmdq_pkt); >>> +    unsigned int (*gamma_get_lut_size)(struct device *dev); >>>       void (*gamma_set)(struct device *dev, >>>                 struct drm_crtc_state *state); >>>       void (*bgclr_in_on)(struct device *dev); >>> @@ -186,6 +187,14 @@ static inline void >>> mtk_ddp_comp_layer_config(struct mtk_ddp_comp *comp, >>>           comp->funcs->layer_config(comp->dev, idx, state, >>> cmdq_pkt); >>>   } >>> +static inline unsigned int mtk_ddp_gamma_get_lut_size(struct >>> mtk_ddp_comp *comp) >>> +{ >>> +    if (comp->funcs && comp->funcs->gamma_get_lut_size) >>> +        return comp->funcs->gamma_get_lut_size(comp->dev); >>> + >>> +    return 0; >>> +} >>> + >>>   static inline void mtk_ddp_gamma_set(struct mtk_ddp_comp *comp, >>>                        struct drm_crtc_state *state) >>>   { > > >