Skip to content

Commit b91adbe

Browse files
committed
Merge tag 'mediatek-drm-fixes-20260119' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-fixes
Mediatek DRM Fixes - 20260119 1. Fix platform_get_irq() error checking 2. HDMI DDC v2 driver fixes 3. dpi: Find next bridge during probe 4. mtk_gem: Partial refactor and use drm_gem_dma_object 5. dt-bindings: Fix typo 'hardwares' to 'hardware' Signed-off-by: Dave Airlie <airlied@redhat.com> From: Chun-Kuang Hu <chunkuang.hu@kernel.org> Link: https://patch.msgid.link/20260119154717.4735-1-chunkuang.hu@kernel.org
2 parents 2312e0a + b9639c5 commit b91adbe

10 files changed

Lines changed: 158 additions & 243 deletions

File tree

Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ maintainers:
1111
- Jitao shi <jitao.shi@mediatek.com>
1212

1313
description: |
14-
MediaTek DP and eDP are different hardwares and there are some features
14+
MediaTek DP and eDP are different hardware and there are some features
1515
which are not supported for eDP. For example, audio is not supported for
1616
eDP. Therefore, we need to use two different compatibles to describe them.
1717
In addition, We just need to enable the power domain of DP, so the clock

drivers/gpu/drm/mediatek/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ config DRM_MEDIATEK
88
depends on OF
99
depends on MTK_MMSYS
1010
select DRM_CLIENT_SELECTION
11-
select DRM_GEM_DMA_HELPER if DRM_FBDEV_EMULATION
11+
select DRM_GEM_DMA_HELPER
1212
select DRM_KMS_HELPER
1313
select DRM_DISPLAY_HELPER
1414
select DRM_BRIDGE_CONNECTOR

drivers/gpu/drm/mediatek/mtk_dpi.c

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -836,20 +836,6 @@ static int mtk_dpi_bridge_attach(struct drm_bridge *bridge,
836836
enum drm_bridge_attach_flags flags)
837837
{
838838
struct mtk_dpi *dpi = bridge_to_dpi(bridge);
839-
int ret;
840-
841-
dpi->next_bridge = devm_drm_of_get_bridge(dpi->dev, dpi->dev->of_node, 1, -1);
842-
if (IS_ERR(dpi->next_bridge)) {
843-
ret = PTR_ERR(dpi->next_bridge);
844-
if (ret == -EPROBE_DEFER)
845-
return ret;
846-
847-
/* Old devicetree has only one endpoint */
848-
dpi->next_bridge = devm_drm_of_get_bridge(dpi->dev, dpi->dev->of_node, 0, 0);
849-
if (IS_ERR(dpi->next_bridge))
850-
return dev_err_probe(dpi->dev, PTR_ERR(dpi->next_bridge),
851-
"Failed to get bridge\n");
852-
}
853839

854840
return drm_bridge_attach(encoder, dpi->next_bridge,
855841
&dpi->bridge, flags);
@@ -1319,6 +1305,15 @@ static int mtk_dpi_probe(struct platform_device *pdev)
13191305
if (dpi->irq < 0)
13201306
return dpi->irq;
13211307

1308+
dpi->next_bridge = devm_drm_of_get_bridge(dpi->dev, dpi->dev->of_node, 1, -1);
1309+
if (IS_ERR(dpi->next_bridge) && PTR_ERR(dpi->next_bridge) == -ENODEV) {
1310+
/* Old devicetree has only one endpoint */
1311+
dpi->next_bridge = devm_drm_of_get_bridge(dpi->dev, dpi->dev->of_node, 0, 0);
1312+
}
1313+
if (IS_ERR(dpi->next_bridge))
1314+
return dev_err_probe(dpi->dev, PTR_ERR(dpi->next_bridge),
1315+
"Failed to get bridge\n");
1316+
13221317
platform_set_drvdata(pdev, dpi);
13231318

13241319
dpi->bridge.of_node = dev->of_node;

0 commit comments

Comments
 (0)