dri-devel September 2021

dri-devel@lists.freedesktop.org

348 participants
817 discussions

[PATCH v9 00/14] Add Mediatek Soc DRM (vdosys0) support for mt8195
by jason-jh.lin 05 Sep '21

05 Sep '21

Change in v9: - seperate power and gce properties of mmsys into another dt-binding patch - rebase on "Separate aal module" series https://patchwork.kernel.org/project/linux-mediatek/list/?series=516463 - keep mtk_ddp_clk_enable/disable in the same place - change mtk_dsc_start config register to mtk_drm_ddp_write_mask - remove the 0 setting of merge fifo config function - add CCORR driver data for mt8195 Change in v8: - add DP_INTF0 mux into mmsys routing table - add DP_INTF0 mutex mod and enum into add/remove comp funtion - remove bypass DSC enum in mtk_ddp_comp_init Change in v7: - add dt=binding of mmsys and disp path into this series - separate th modidfication of alphabetic order, remove unused define and rename the define of register offset to individual patch - add comment for MERGE ultra and preultra setting Change in v6: - adjust alphabetic order for mediatek-drm - move the patch that add mt8195 support for mediatek-drm as the lastest patch - add MERGE define for const varriable Change in v5: - add power-domain property into vdosys0 and vdosys1 dts node. - add MT8195 prifix and remove unused VDO1 define in mt8195-mmsys.h Change in v4: - extract dt-binding patches to another patch series https://patchwork.kernel.org/project/linux-mediatek/list/?series=519597 - squash DSC module into mtk_drm_ddp_comp.c - add coment and simplify MERGE config function Change in v3: - change mmsys and display dt-bindings document from txt to yaml - add MERGE additional description in display dt-bindings document - fix mboxes-cells number of vdosys0 node in dts - drop mutex eof convert define - remove pm_runtime apis in DSC and MERGE - change DSC and MERGE enum to alphabetic order Change in v2: - add DSC yaml file - add mt8195 drm driver porting parts in to one patch - remove useless define, variable, structure member and function - simplify DSC and MERGE file and switch threre order jason-jh.lin (14): dt-bindings: arm: mediatek: mmsys: add power and gce properties dt-bindings: arm: mediatek: mmsys: add mt8195 SoC binding dt-bindings: mediatek: display: split each block to individual yaml dt-bindings: mediatek: add mediatek,dsc.yaml for mt8195 SoC binding dt-bindings: mediatek: display: add mt8195 SoC binding arm64: dts: mt8195: add display node for vdosys0 soc: mediatek: add mtk-mmsys support for mt8195 vdosys0 soc: mediatek: add mtk-mutex support for mt8195 vdosys0 drm/mediatek: remove unused define in mtk_drm_ddp_comp.c drm/mediatek: rename the define of register offset drm/mediatek: adjust to the alphabetic order for mediatek-drm drm/mediatek: add DSC support for mediatek-drm drm/mediatek: add MERGE support for mediatek-drm drm/mediatek: add mediatek-drm of vdosys0 support for mt8195 .../bindings/arm/mediatek/mediatek,mmsys.yaml | 30 ++- .../display/mediatek/mediatek,aal.yaml | 76 ++++++ .../display/mediatek/mediatek,ccorr.yaml | 71 ++++++ .../display/mediatek/mediatek,color.yaml | 85 +++++++ .../display/mediatek/mediatek,disp.txt | 219 ---------------- .../display/mediatek/mediatek,dither.yaml | 75 ++++++ .../display/mediatek/mediatek,dsc.yaml | 70 +++++ .../display/mediatek/mediatek,gamma.yaml | 76 ++++++ .../display/mediatek/mediatek,merge.yaml | 98 +++++++ .../display/mediatek/mediatek,mutex.yaml | 79 ++++++ .../display/mediatek/mediatek,od.yaml | 52 ++++ .../display/mediatek/mediatek,ovl-2l.yaml | 86 +++++++ .../display/mediatek/mediatek,ovl.yaml | 101 ++++++++ .../display/mediatek/mediatek,rdma.yaml | 112 ++++++++ .../display/mediatek/mediatek,split.yaml | 56 ++++ .../display/mediatek/mediatek,ufoe.yaml | 59 +++++ .../display/mediatek/mediatek,wdma.yaml | 86 +++++++ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 110 ++++++++ drivers/gpu/drm/mediatek/Makefile | 1 + drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 6 + drivers/gpu/drm/mediatek/mtk_disp_drv.h | 8 + drivers/gpu/drm/mediatek/mtk_disp_merge.c | 239 ++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 6 + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 186 +++++++++----- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 24 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 114 ++++++--- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + drivers/soc/mediatek/mt8195-mmsys.h | 114 +++++++++ drivers/soc/mediatek/mtk-mmsys.c | 11 + drivers/soc/mediatek/mtk-mutex.c | 98 ++++++- include/linux/soc/mediatek/mtk-mmsys.h | 9 + 31 files changed, 2016 insertions(+), 342 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml delete mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dsc.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,merge.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,od.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,split.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,ufoe.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_merge.c create mode 100644 drivers/soc/mediatek/mt8195-mmsys.h -- 2.18.0

2 22

[PATCH] drm/fourcc: Add QCOM tiled modifiers
by Rob Clark 04 Sep '21

04 Sep '21

From: Rob Clark <robdclark(a)chromium.org> These are mainly used internally in mesa, although I believe the display should be able to scan out the TILED3 format. Currently we define this modifier internally in mesa for use with modifier based allocation. But we can get rid of that hack if we define the modfiers properly. Signed-off-by: Rob Clark <robdclark(a)chromium.org> --- include/uapi/drm/drm_fourcc.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index 9f4bb4a6f358..8cb0c702aeca 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -590,6 +590,28 @@ extern "C" { */ #define DRM_FORMAT_MOD_QCOM_COMPRESSED fourcc_mod_code(QCOM, 1) +/* + * Qualcomm Tiled Format + * + * Similar to DRM_FORMAT_MOD_QCOM_COMPRESSED but not compressed. + * Implementation may be platform and base-format specific. + * + * Each macrotile consists of m x n (mostly 4 x 4) tiles. + * Pixel data pitch/stride is aligned with macrotile width. + * Pixel data height is aligned with macrotile height. + * Entire pixel data buffer is aligned with 4k(bytes). + */ +#define DRM_FORMAT_MOD_QCOM_TILED3 fourcc_mod_code(QCOM, 3) + +/* + * Qualcomm Alternate Tiled Format + * + * Alternate tiled format typically only used within GMEM. + * Implementation may be platform and base-format specific. + */ +#define DRM_FORMAT_MOD_QCOM_TILED2 fourcc_mod_code(QCOM, 2) + + /* Vivante framebuffer modifiers */ /* -- 2.31.1

1 0

[PATCH] video: fbdev: udlfb: Fix brace coding style error
by Srivathsa Dara 04 Sep '21

04 Sep '21

Fix brace coding-style error for function defination Signed-off-by: Srivathsa Dara <srivathsa729.8(a)gmail.com> drivers/video/fbdev/udlfb.c:82 --- drivers/video/fbdev/udlfb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c index b9cdd02c1000..25643265947f 100644 --- a/drivers/video/fbdev/udlfb.c +++ b/drivers/video/fbdev/udlfb.c @@ -1457,7 +1457,8 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev, static ssize_t edid_show( struct file *filp, struct kobject *kobj, struct bin_attribute *a, - char *buf, loff_t off, size_t count) { + char *buf, loff_t off, size_t count) +{ struct device *fbdev = kobj_to_dev(kobj); struct fb_info *fb_info = dev_get_drvdata(fbdev); struct dlfb_data *dlfb = fb_info->par; -- 2.25.1

1 0

[PATCH] staging: fbtft: fbtft-core: fix 'trailing statements should be on next line' coding style error
by Srivathsa Dara 04 Sep '21

04 Sep '21

Fix coding style error 'trailing statements should be on next line' Signed-off-by: Srivathsa Dara <srivathsa729.8(a)gmail.com> --- drivers/staging/fbtft/fbtft-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index ed992ca605eb..65de1c02e7dc 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -1038,7 +1038,8 @@ int fbtft_init_display(struct fbtft_par *par) i++; /* make debug message */ - for (j = 0; par->init_sequence[i + 1 + j] >= 0; j++); + for (j = 0; par->init_sequence[i + 1 + j] >= 0; j++) + ; fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "init: write(0x%02X) %*ph\n", -- 2.25.1

1 0

[PATCH] Fix ERROR: trailing statements should be on next line
by srivathsa 04 Sep '21

04 Sep '21

Signed-off-by: Srivathsa Dara <srivathsa729.8(a)gmail.com> --- drivers/staging/fbtft/fbtft-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index ed992ca605eb..65de1c02e7dc 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -1038,7 +1038,8 @@ int fbtft_init_display(struct fbtft_par *par) i++; /* make debug message */ - for (j = 0; par->init_sequence[i + 1 + j] >= 0; j++); + for (j = 0; par->init_sequence[i + 1 + j] >= 0; j++) + ; fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "init: write(0x%02X) %*ph\n", -- 2.25.1

2 1

[PATCH 4.19] fbmem: add margin check to fb_check_caps()
by Dongliang Mu 04 Sep '21

04 Sep '21

[ Upstream commit a49145acfb975d921464b84fe00279f99827d816 ] A fb_ioctl() FBIOPUT_VSCREENINFO call with invalid xres setting or yres setting in struct fb_var_screeninfo will result in a KASAN: vmalloc-out-of-bounds failure in bitfill_aligned() as the margins are being cleared. The margins are cleared in chunks and if the xres setting or yres setting is a value of zero upto the chunk size, the failure will occur. Add a margin check to validate xres and yres settings. Note that, this patch needs special handling to backport it to linux kernel 4.19, 4.14, 4.9, 4.4. Signed-off-by: George Kennedy <george.kennedy(a)oracle.com> Reported-by: syzbot+e5fd3e65515b48c02a30(a)syzkaller.appspotmail.com Reviewed-by: Dan Carpenter <dan.carpenter(a)oracle.com> Cc: Dhaval Giani <dhaval.giani(a)oracle.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie(a)samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/1594149963-13801-1-git-send-e… Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/video/fbdev/core/fbmem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 84845275dbef..de04c097d67c 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -991,6 +991,10 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) goto done; } + /* bitfill_aligned() assumes that it's at least 8x8 */ + if (var->xres < 8 || var->yres < 8) + return -EINVAL; + ret = info->fbops->fb_check_var(var, info); if (ret) -- 2.25.1

2 2

[PATCH] drm/msm: remove unneeded variable
by cgel.zte＠gmail.com 03 Sep '21

03 Sep '21

From: Chi Minghao <chi.minghao(a)zte.com.cn> Fix the following coccicheck REVIEW: ./drivers/gpu/drm/msm/edp/edp_ctrl.c:1245:5-8 Unneeded variable Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Chi Minghao <chi.minghao(a)zte.com.cn> --- drivers/gpu/drm/msm/edp/edp_ctrl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c index 4fb397ee7c84..3610e26e62fa 100644 --- a/drivers/gpu/drm/msm/edp/edp_ctrl.c +++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c @@ -1242,8 +1242,6 @@ bool msm_edp_ctrl_panel_connected(struct edp_ctrl *ctrl) int msm_edp_ctrl_get_panel_info(struct edp_ctrl *ctrl, struct drm_connector *connector, struct edid **edid) { - int ret = 0; - mutex_lock(&ctrl->dev_mutex); if (ctrl->edid) { @@ -1278,7 +1276,7 @@ int msm_edp_ctrl_get_panel_info(struct edp_ctrl *ctrl, } unlock_ret: mutex_unlock(&ctrl->dev_mutex); - return ret; + return 0; } int msm_edp_ctrl_timing_cfg(struct edp_ctrl *ctrl, -- 2.25.1

3 4

[PATCH v2 17/52] dt-bindings: display: aa121td01: Fix data-mapping
by Maxime Ripard 03 Sep '21

03 Sep '21

The Mitsubishi AA121TD01 Device Tree Binding was requiring a data-mapping property value which was set to another value in the existing Device Trees. Fix this. Cc: dri-devel(a)lists.freedesktop.org Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: Thierry Reding <thierry.reding(a)gmail.com> Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> --- .../bindings/display/panel/mitsubishi,aa121td01.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml b/Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml index b0f1d4eff12d..467a0ed4d444 100644 --- a/Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml +++ b/Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml @@ -20,7 +20,7 @@ properties: - {} # panel-lvds, but not listed here to avoid false select data-mapping: - const: jeida-24 + const: jeida-18 width-mm: const: 261 @@ -44,7 +44,7 @@ examples: width-mm = <261>; height-mm = <163>; - data-mapping = "jeida-24"; + data-mapping = "jeida-18"; panel-timing { /* 1280x800 @60Hz */ -- 2.31.1

2 1

[PATCH v2 16/52] dt-bindings: display: aa121td01: Remove unused vcc-supply
by Maxime Ripard 03 Sep '21

03 Sep '21

The Mitsubishi AA121TD01 Device Tree Binding was requiring a vcc-supply property. However, neither the existing device trees using that binding, nor the driver were actually using that property which is also redundant with power-supply. Let's just drop it. Cc: dri-devel(a)lists.freedesktop.org Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: Thierry Reding <thierry.reding(a)gmail.com> Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> --- .../bindings/display/panel/mitsubishi,aa121td01.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml b/Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml index 977c50a85b67..b0f1d4eff12d 100644 --- a/Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml +++ b/Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml @@ -19,9 +19,6 @@ properties: - const: mitsubishi,aa121td01 - {} # panel-lvds, but not listed here to avoid false select - vcc-supply: - description: Reference to the regulator powering the panel VCC pins. - data-mapping: const: jeida-24 @@ -38,13 +35,11 @@ additionalProperties: false required: - compatible - - vcc-supply examples: - |+ panel { compatible = "mitsubishi,aa121td01", "panel-lvds"; - vcc-supply = <&vcc_3v3>; width-mm = <261>; height-mm = <163>; -- 2.31.1

2 1

[PATCH v2 14/52] dt-bindings: display: aa104xd12: Fix data-mapping
by Maxime Ripard 03 Sep '21

03 Sep '21

The Mitsubishi AA140XD12 Device Tree Binding was requiring a data-mapping property value which was set to another value in the existing Device Trees. Fix this. Cc: dri-devel(a)lists.freedesktop.org Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: Thierry Reding <thierry.reding(a)gmail.com> Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> --- .../bindings/display/panel/mitsubishi,aa104xd12.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml b/Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml index b595edd58bbb..2d1c85e377cd 100644 --- a/Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml +++ b/Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml @@ -20,7 +20,7 @@ properties: - {} # panel-lvds, but not listed here to avoid false select data-mapping: - const: jeida-24 + const: jeida-18 width-mm: const: 210 @@ -45,7 +45,7 @@ examples: width-mm = <210>; height-mm = <158>; - data-mapping = "jeida-24"; + data-mapping = "jeida-18"; panel-timing { /* 1024x768 @65Hz */ -- 2.31.1

2 1

← Newer
1
...
73
74
75
76
77
78
79
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel September 2021