From patchwork Sat Jul 9 17:36:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 12912293 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 87B72C433EF for ; Sat, 9 Jul 2022 17:36:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B15FB113FFC; Sat, 9 Jul 2022 17:36:25 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2470A113FFC for ; Sat, 9 Jul 2022 17:36:24 +0000 (UTC) Received: from tr.lan (ip-86-49-12-201.bb.vodafone.cz [86.49.12.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id D1EFC84594; Sat, 9 Jul 2022 19:36:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1657388182; bh=QHcQWAGBCHbfuwYZGBwRUUMZ+Zda39M1DDkOtqxtM/U=; h=From:To:Cc:Subject:Date:From; b=hdLM8ECORAHWDJzo87aXdaAXqv6IkghIV/t1G4UZjT4uS24tb51jEEof9VlEjjQuW iHFLqnYpABhANk08ofMHh6Rw5kluw+vLJlIpXWiBg9kWmnJqZBbnuPVXwOv7r4leW3 uLnmiVYGFBJ/r+6ucc6yY9il+9STqDfdB+KquRWP84w0DYGVYQnq06bGbhaIRk9uSf We1FnPt2tnAQjBwpJra3CTmmZ6JAnzcZuExf45Xloe6wtm42ny5UWssh5SxE7GvMpm 7GcKsduuMKCySpdCDoOfs07FOmK/NuNbWWCE75VabZAc1YJDT6AZEZToxd6ZtJq/Hm Q8coHNX70vNRQ== From: Marek Vasut To: dri-devel@lists.freedesktop.org Subject: [PATCH v4 1/4] drm/lcdif: Clean up headers Date: Sat, 9 Jul 2022 19:36:03 +0200 Message-Id: <20220709173606.72852-1-marex@denx.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Alexander Stein , Peng Fan , Liu Ying , robert.foss@linaro.org, Liu Ying , Martyn Welch , Laurent Pinchart , Robby Cai , Sam Ravnborg Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Drop unneeded headers, sort rest alphabetically, no functional change. Acked-by: Sam Ravnborg Reviewed-by: Liu Ying Reported-by: Liu Ying Tested-by: Martyn Welch Fixes: 9db35bb349a0e ("drm: lcdif: Add support for i.MX8MP LCDIF variant") Signed-off-by: Marek Vasut Cc: Alexander Stein Cc: Laurent Pinchart Cc: Liu Ying Cc: Lucas Stach Cc: Marek Vasut Cc: Martyn Welch Cc: Peng Fan Cc: Robby Cai Cc: Sam Ravnborg Cc: Stefan Agner --- V2: Add RB from Liu V3: Add TB from Martyn from V1 V4: Add AB from Sam from V2 --- drivers/gpu/drm/mxsfb/lcdif_drv.c | 3 --- drivers/gpu/drm/mxsfb/lcdif_drv.h | 1 + drivers/gpu/drm/mxsfb/lcdif_kms.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/lcdif_drv.c b/drivers/gpu/drm/mxsfb/lcdif_drv.c index befad33dcb959..1370889c6d687 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_drv.c +++ b/drivers/gpu/drm/mxsfb/lcdif_drv.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -16,10 +15,8 @@ #include #include -#include #include #include -#include #include #include #include diff --git a/drivers/gpu/drm/mxsfb/lcdif_drv.h b/drivers/gpu/drm/mxsfb/lcdif_drv.h index cb916341e8454..6cdba6e20c02b 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_drv.h +++ b/drivers/gpu/drm/mxsfb/lcdif_drv.h @@ -8,6 +8,7 @@ #ifndef __LCDIF_DRV_H__ #define __LCDIF_DRV_H__ +#include #include #include #include diff --git a/drivers/gpu/drm/mxsfb/lcdif_kms.c b/drivers/gpu/drm/mxsfb/lcdif_kms.c index 1bec1279c8b56..d7363e2b2fad0 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_kms.c +++ b/drivers/gpu/drm/mxsfb/lcdif_kms.c @@ -17,9 +17,9 @@ #include #include #include -#include #include #include +#include #include #include #include From patchwork Sat Jul 9 17:36:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 12912292 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A469BC43334 for ; Sat, 9 Jul 2022 17:36:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F52111A044; Sat, 9 Jul 2022 17:36:25 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by gabe.freedesktop.org (Postfix) with ESMTPS id A76A5113FFC for ; Sat, 9 Jul 2022 17:36:24 +0000 (UTC) Received: from tr.lan (ip-86-49-12-201.bb.vodafone.cz [86.49.12.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 688D0845CA; Sat, 9 Jul 2022 19:36:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1657388182; bh=vWUORI+UJ9WdsViGdDUTMTFqX9xPF+zqpfnvog0kyqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yMOMpaUHz2Kx494Ks+sLcUg7uEYET6Tc2ZCGoZm0vsEOn2sFPAqbO3qno1/cRk9HL TAxbC5ocROIXmzegAQMt9XviTL7V+3nX0JCsuBWVpd2MbspdWrjACl+ot+gXucHu5R D3ofJ3uXZ8w/vaTct3sQs4Z/9iDTDP0kElxBx3PKqPh2s1+YxpcHyFImMB5JEH+z1r gWZiMMwuNyU/nVfXCPxUmnnp1hHjgbu3Om0o4u6yjsMSaR7Zc3lz74P1gOM6DcRtR3 /sIkvA3RlWajD5UuDmzm3NRIsFBCuF/viY+426iyM15vV52Us4ztepQWQqlBzMGyfn nbvRiJT1SfI2Q== From: Marek Vasut To: dri-devel@lists.freedesktop.org Subject: [PATCH v4 2/4] drm/lcdif: Consistently use plain timings Date: Sat, 9 Jul 2022 19:36:04 +0200 Message-Id: <20220709173606.72852-2-marex@denx.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220709173606.72852-1-marex@denx.de> References: <20220709173606.72852-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Alexander Stein , Peng Fan , Liu Ying , robert.foss@linaro.org, Liu Ying , Martyn Welch , Laurent Pinchart , Robby Cai , Sam Ravnborg Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Drop the crtc_ prefix from mode, consistently use the plain one. Acked-by: Sam Ravnborg Reviewed-by: Liu Ying Reported-by: Liu Ying Tested-by: Martyn Welch Fixes: 9db35bb349a0e ("drm: lcdif: Add support for i.MX8MP LCDIF variant") Signed-off-by: Marek Vasut Cc: Alexander Stein Cc: Laurent Pinchart Cc: Liu Ying Cc: Lucas Stach Cc: Marek Vasut Cc: Martyn Welch Cc: Peng Fan Cc: Robby Cai Cc: Sam Ravnborg Cc: Stefan Agner --- V2: Add RB from Liu Replace plane with plain V3: Add TB from Martyn from V1 V4: Add AB from Sam from V2 --- drivers/gpu/drm/mxsfb/lcdif_kms.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/lcdif_kms.c b/drivers/gpu/drm/mxsfb/lcdif_kms.c index d7363e2b2fad0..829b0a6bb0d3f 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_kms.c +++ b/drivers/gpu/drm/mxsfb/lcdif_kms.c @@ -123,8 +123,8 @@ static void lcdif_set_mode(struct lcdif_drm_private *lcdif, u32 bus_flags) writel(ctrl, lcdif->base + LCDC_V8_CTRL); - writel(DISP_SIZE_DELTA_Y(m->crtc_vdisplay) | - DISP_SIZE_DELTA_X(m->crtc_hdisplay), + writel(DISP_SIZE_DELTA_Y(m->vdisplay) | + DISP_SIZE_DELTA_X(m->hdisplay), lcdif->base + LCDC_V8_DISP_SIZE); writel(HSYN_PARA_BP_H(m->htotal - m->hsync_end) | @@ -139,8 +139,8 @@ static void lcdif_set_mode(struct lcdif_drm_private *lcdif, u32 bus_flags) VSYN_HSYN_WIDTH_PW_H(m->hsync_end - m->hsync_start), lcdif->base + LCDC_V8_VSYN_HSYN_WIDTH); - writel(CTRLDESCL0_1_HEIGHT(m->crtc_vdisplay) | - CTRLDESCL0_1_WIDTH(m->crtc_hdisplay), + writel(CTRLDESCL0_1_HEIGHT(m->vdisplay) | + CTRLDESCL0_1_WIDTH(m->hdisplay), lcdif->base + LCDC_V8_CTRLDESCL0_1); writel(CTRLDESCL0_3_PITCH(lcdif->crtc.primary->state->fb->pitches[0]), From patchwork Sat Jul 9 17:36:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 12912295 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B28DEC433EF for ; Sat, 9 Jul 2022 17:36:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 89B5611A079; Sat, 9 Jul 2022 17:36:32 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) by gabe.freedesktop.org (Postfix) with ESMTPS id 89BA711A044 for ; Sat, 9 Jul 2022 17:36:24 +0000 (UTC) Received: from tr.lan (ip-86-49-12-201.bb.vodafone.cz [86.49.12.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id CCADF845D9; Sat, 9 Jul 2022 19:36:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1657388183; bh=FDipnGOZ1IliFhv5WJ2JRRjRD0dDeDc5d9IhkfKRT+o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xbrkI24v5aM8h2enPXfs9w2UYTZGvTRIXriG31/2QHE/PzaFfiaA42iVBucqyN9d4 vmZfx8ZjPBJVn4LAEIIXeABS/sSqe9K+7eb+zt9dne/3Xwh/l54kW64GRKVO4b2+H8 I2lo9OyFXxqzwZkAkeWews8y+3RLtdNs2tB9YgQRqILJx+CdZ7iyLEmQMD54+l5O2H xa+pNz17KbzlugFWmxOw/4Y9TmXIH7Orb9OYOWtYuWac4zPGjx97UVnxFG7i2ZSnwk 2dheRN+0iyH78HR1jwwYrnRCBAt/uyDg5DzpyYKxVwHoLXCOvE6wplv3JzdqF6rXBZ wdBcucrwKkQxQ== From: Marek Vasut To: dri-devel@lists.freedesktop.org Subject: [PATCH v4 3/4] drm/lcdif: Clean up debug prints and comments Date: Sat, 9 Jul 2022 19:36:05 +0200 Message-Id: <20220709173606.72852-3-marex@denx.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220709173606.72852-1-marex@denx.de> References: <20220709173606.72852-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Alexander Stein , Peng Fan , Liu Ying , robert.foss@linaro.org, Liu Ying , Martyn Welch , Laurent Pinchart , Robby Cai , Sam Ravnborg Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Update debug print to report bridge timings over connector ones. Drop missed comment commit from mxsfb. Acked-by: Sam Ravnborg Reviewed-by: Liu Ying Reported-by: Liu Ying Tested-by: Martyn Welch Fixes: 9db35bb349a0e ("drm: lcdif: Add support for i.MX8MP LCDIF variant") Signed-off-by: Marek Vasut Cc: Alexander Stein Cc: Laurent Pinchart Cc: Liu Ying Cc: Lucas Stach Cc: Marek Vasut Cc: Martyn Welch Cc: Peng Fan Cc: Robby Cai Cc: Sam Ravnborg Cc: Stefan Agner --- V2: Add RB from Liu V3: Add TB from Martyn from V1 V4: Add AB from Sam from V2 --- drivers/gpu/drm/mxsfb/lcdif_kms.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/lcdif_kms.c b/drivers/gpu/drm/mxsfb/lcdif_kms.c index 829b0a6bb0d3f..9a77c631300a4 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_kms.c +++ b/drivers/gpu/drm/mxsfb/lcdif_kms.c @@ -204,7 +204,7 @@ static void lcdif_crtc_mode_set_nofb(struct lcdif_drm_private *lcdif, DRM_DEV_DEBUG_DRIVER(drm->dev, "Pixel clock: %dkHz (actual: %dkHz)\n", m->crtc_clock, (int)(clk_get_rate(lcdif->clk) / 1000)); - DRM_DEV_DEBUG_DRIVER(drm->dev, "Connector bus_flags: 0x%08X\n", + DRM_DEV_DEBUG_DRIVER(drm->dev, "Bridge bus_flags: 0x%08X\n", bus_flags); DRM_DEV_DEBUG_DRIVER(drm->dev, "Mode flags: 0x%08X\n", m->flags); @@ -296,7 +296,6 @@ static void lcdif_crtc_atomic_enable(struct drm_crtc *crtc, lcdif_crtc_mode_set_nofb(lcdif, bridge_state, bus_format); - /* Write cur_buf as well to avoid an initial corrupt frame */ paddr = drm_fb_cma_get_gem_addr(new_pstate->fb, new_pstate, 0); if (paddr) { writel(lower_32_bits(paddr), From patchwork Sat Jul 9 17:36:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 12912294 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 64136C433EF for ; Sat, 9 Jul 2022 17:36:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC0AE11A075; Sat, 9 Jul 2022 17:36:29 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0DA32113FFC for ; Sat, 9 Jul 2022 17:36:25 +0000 (UTC) Received: from tr.lan (ip-86-49-12-201.bb.vodafone.cz [86.49.12.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 3A660845E3; Sat, 9 Jul 2022 19:36:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1657388183; bh=ejhlCQfiKtKRvIn6WGQWt+nRi+8ptnpW/1C7jajPIT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oEqC0Qo9KWR1DpFgXtw8y9Ajw3cYa18fNth62NfxdSy+fJbH6l2gDBFO5tChTyuFd aTWQDsDe9FdHqdao09A7R6NxIzOfFCnkqm2QlxyhoYGOXqPsmRv1VjYW5haW7OAGoB 4IYuuSSl4C4ZOdhZmq5gW6Njmb/i+R6jki6TVxa6C0YyRR+3g7DchsRqfhhoisvHbY cusmipS+zvst9I1ASUEFAcf0aJCZ8wqKGxeQ/NAGS0busLub81F6tHTLy6RAECBmvI p6ZK3UHSxFaUZWy4J2Bib06LMmnBAt80HBzOwmwsrsBkLhRehFZAMER4s2+WZcQgPO 0tabi6ONjy+HQ== From: Marek Vasut To: dri-devel@lists.freedesktop.org Subject: [PATCH v4 4/4] drm/lcdif: switch to devm_drm_of_get_bridge Date: Sat, 9 Jul 2022 19:36:06 +0200 Message-Id: <20220709173606.72852-4-marex@denx.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220709173606.72852-1-marex@denx.de> References: <20220709173606.72852-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Alexander Stein , Peng Fan , Liu Ying , robert.foss@linaro.org, Liu Ying , Martyn Welch , Laurent Pinchart , Robby Cai , Sam Ravnborg Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The function "drm_of_find_panel_or_bridge" has been deprecated in favor of "devm_drm_of_get_bridge". Switch to the new function and reduce boilerplate. Acked-by: Sam Ravnborg Reviewed-by: Liu Ying Reported-by: Liu Ying Tested-by: Martyn Welch Fixes: 9db35bb349a0e ("drm: lcdif: Add support for i.MX8MP LCDIF variant") Signed-off-by: Marek Vasut Cc: Alexander Stein Cc: Laurent Pinchart Cc: Liu Ying Cc: Lucas Stach Cc: Marek Vasut Cc: Martyn Welch Cc: Peng Fan Cc: Robby Cai Cc: Sam Ravnborg Cc: Stefan Agner --- V2: Add RB from Liu V3: Add TB from Martyn from V1 V4: Add AB from Sam from V2 --- drivers/gpu/drm/mxsfb/lcdif_drv.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/lcdif_drv.c b/drivers/gpu/drm/mxsfb/lcdif_drv.c index 1370889c6d687..746a4261f3da2 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_drv.c +++ b/drivers/gpu/drm/mxsfb/lcdif_drv.c @@ -42,23 +42,11 @@ static int lcdif_attach_bridge(struct lcdif_drm_private *lcdif) { struct drm_device *drm = lcdif->drm; struct drm_bridge *bridge; - struct drm_panel *panel; int ret; - ret = drm_of_find_panel_or_bridge(drm->dev->of_node, 0, 0, &panel, - &bridge); - if (ret) - return ret; - - if (panel) { - bridge = devm_drm_panel_bridge_add_typed(drm->dev, panel, - DRM_MODE_CONNECTOR_DPI); - if (IS_ERR(bridge)) - return PTR_ERR(bridge); - } - - if (!bridge) - return -ENODEV; + bridge = devm_drm_of_get_bridge(drm->dev, drm->dev->of_node, 0, 0); + if (IS_ERR(bridge)) + return PTR_ERR(bridge); ret = drm_bridge_attach(&lcdif->encoder, bridge, NULL, 0); if (ret)