From patchwork Sat Jun 3 17:07:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 102864 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1773858vqr; Sat, 3 Jun 2023 10:36:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4GaKMVg51w4xQffI5twWPHDSyjDAZ1SUWZ9yxGuXzASDXVX0jnnVXAyNdNE6i4n5RwWXJO X-Received: by 2002:a05:6a20:e68a:b0:104:a096:6ac7 with SMTP id mz10-20020a056a20e68a00b00104a0966ac7mr2429443pzb.34.1685813796109; Sat, 03 Jun 2023 10:36:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685813796; cv=none; d=google.com; s=arc-20160816; b=m3Trlgh+YMCVHCiAsUHvMW/AqwqUFFmWhYnXeODnemc3PcR3f+14oXaxYw4jrhYVit ET0nhZO3HEdV10uepBBzR7PoqItzlV7p7/Zi9WK/0sUyeaUCF6q0ezTuAW5IE/jF/qe4 /A6n50TmfX7/yBCslZTlhtY8vUx1XZQ88bvT/dVkKTWR9GsDlXzMSrGHl4JpOVWA5AwI saQXizuVmLvxDzWVbUdF1nOODnke0hUNy7tRLDr4xLYrtz8An6p7q+t0u4+0wHs68Te2 3IYHErmivDtWr5Ah6+Gva32bToLQNUNMhGeVaC/tBF5Pwa9JD0ygUYwvNrrKcmMgyPSq 3nTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Ks8PkXhSiU9mX+0rQ+kXNelheNE43K3jnZ3UdElS40E=; b=Io+acrEXMKd/pRxFNkVRXr/uNXcxqIJ5eANqYznsI1nZyg3x9qKy/Y9C/ZYxV00n5z Yo3HofF/NuplyYhvp7Vs8/XWmAvtGSYybkPGFDW0o2Ew2n8V1HkH5aqViNF573DFz6ok bEY+e/G41UQnwSCfz3pVz+w6u6Up2823kM+2uwz3fzZGkdkOR553kx5s4b7Yc8gndScD dU3MtOzcd87ruBu+XW112TgOFoFeMa59jR3pB5kpJT8R3HJ6I8qDpEo17hoLU/wlK5bv fJa0RsH4w73HLii/oxM4oRbtaB9nYy7+4NPKMDSPex9/P04YhuqckSKzbqjt1jexDQbe r7PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Z4c+VOGJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bv3-20020a632e03000000b0052883ac6949si3051814pgb.13.2023.06.03.10.36.20; Sat, 03 Jun 2023 10:36:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Z4c+VOGJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229591AbjFCRIH (ORCPT + 99 others); Sat, 3 Jun 2023 13:08:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229482AbjFCRIG (ORCPT ); Sat, 3 Jun 2023 13:08:06 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73B6F13E for ; Sat, 3 Jun 2023 10:08:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EE73C60B4B for ; Sat, 3 Jun 2023 17:08:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AA83C433D2; Sat, 3 Jun 2023 17:07:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685812083; bh=YJn97j6iA20HsijrcP7IiRS2WGaA4roV8+a66M4L3KE=; h=From:To:Cc:Subject:Date:From; b=Z4c+VOGJ1KBlYOgY0pp+zzTr+kYCs2KChCz+CJ9RhZnjK42+hMV3Ow4/mYyKEb4ub arcKdCKjD31hYjRHSIrVPPx/otetnP5SPGRBDOpDMfixCStwF+YFKmrzIQK7E197N4 dK3YS8XlJQi+V/hx1s0+Utzs/tkTpQx1KeXX8gswMT8qLc720CeRlaJ0HPgmUaQN+0 dNv32+8Kz1FanK2uJrCWtkHCCkIod2yE/dnCI87Hk0J1M7T7DeadSRncnQIC5NPetM +8MQr557VV+TVFlWF6eKxbbsxysxy3YWZvn0Bl2YmFEps8mGn9WJImkKJQ+csPm8ab YPgkAVHQgwd3A== From: Masahiro Yamada To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Daniel Vetter , David Airlie , Fabio Estevam , Liu Ying , NXP Linux Team , Nick Terrell , Pengutronix Kernel Team , Sascha Hauer , Shawn Guo , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] drm/bridge: imx: fix mixed module-builtin object Date: Sun, 4 Jun 2023 02:07:46 +0900 Message-Id: <20230603170747.1753842-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767703887322170449?= X-GMAIL-MSGID: =?utf-8?q?1767703887322170449?= With CONFIG_DRM_IMX8QM_LDB=m and CONFIG_DRM_IMX8QXP_LDB=y (or vice versa), imx-ldb-helper.o is linked to a module and also to vmlinux even though the expected CFLAGS are different between builtins and modules. This is the same situation as fixed by commit 637a642f5ca5 ("zstd: Fixing mixed module-builtin objects"). Turn helpers in imx-ldb-helper.c into inline functions. Signed-off-by: Masahiro Yamada --- drivers/gpu/drm/bridge/imx/Makefile | 4 +- drivers/gpu/drm/bridge/imx/imx-ldb-helper.c | 221 -------------------- drivers/gpu/drm/bridge/imx/imx-ldb-helper.h | 213 +++++++++++++++++-- 3 files changed, 197 insertions(+), 241 deletions(-) delete mode 100644 drivers/gpu/drm/bridge/imx/imx-ldb-helper.c diff --git a/drivers/gpu/drm/bridge/imx/Makefile b/drivers/gpu/drm/bridge/imx/Makefile index aa90ec8d5433..64b93009376a 100644 --- a/drivers/gpu/drm/bridge/imx/Makefile +++ b/drivers/gpu/drm/bridge/imx/Makefile @@ -1,7 +1,7 @@ -imx8qm-ldb-objs := imx-ldb-helper.o imx8qm-ldb-drv.o +imx8qm-ldb-objs := imx8qm-ldb-drv.o obj-$(CONFIG_DRM_IMX8QM_LDB) += imx8qm-ldb.o -imx8qxp-ldb-objs := imx-ldb-helper.o imx8qxp-ldb-drv.o +imx8qxp-ldb-objs := imx8qxp-ldb-drv.o obj-$(CONFIG_DRM_IMX8QXP_LDB) += imx8qxp-ldb.o obj-$(CONFIG_DRM_IMX8QXP_PIXEL_COMBINER) += imx8qxp-pixel-combiner.o diff --git a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c b/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c deleted file mode 100644 index 7338b84bc83d..000000000000 --- a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c +++ /dev/null @@ -1,221 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2012 Sascha Hauer, Pengutronix - * Copyright 2019,2020,2022 NXP - */ - -#include -#include -#include -#include - -#include -#include -#include - -#include "imx-ldb-helper.h" - -bool ldb_channel_is_single_link(struct ldb_channel *ldb_ch) -{ - return ldb_ch->link_type == LDB_CH_SINGLE_LINK; -} - -bool ldb_channel_is_split_link(struct ldb_channel *ldb_ch) -{ - return ldb_ch->link_type == LDB_CH_DUAL_LINK_EVEN_ODD_PIXELS || - ldb_ch->link_type == LDB_CH_DUAL_LINK_ODD_EVEN_PIXELS; -} - -int ldb_bridge_atomic_check_helper(struct drm_bridge *bridge, - struct drm_bridge_state *bridge_state, - struct drm_crtc_state *crtc_state, - struct drm_connector_state *conn_state) -{ - struct ldb_channel *ldb_ch = bridge->driver_private; - - ldb_ch->in_bus_format = bridge_state->input_bus_cfg.format; - ldb_ch->out_bus_format = bridge_state->output_bus_cfg.format; - - return 0; -} - -void ldb_bridge_mode_set_helper(struct drm_bridge *bridge, - const struct drm_display_mode *mode, - const struct drm_display_mode *adjusted_mode) -{ - struct ldb_channel *ldb_ch = bridge->driver_private; - struct ldb *ldb = ldb_ch->ldb; - bool is_split = ldb_channel_is_split_link(ldb_ch); - - if (is_split) - ldb->ldb_ctrl |= LDB_SPLIT_MODE_EN; - - switch (ldb_ch->out_bus_format) { - case MEDIA_BUS_FMT_RGB666_1X7X3_SPWG: - break; - case MEDIA_BUS_FMT_RGB888_1X7X4_SPWG: - if (ldb_ch->chno == 0 || is_split) - ldb->ldb_ctrl |= LDB_DATA_WIDTH_CH0_24; - if (ldb_ch->chno == 1 || is_split) - ldb->ldb_ctrl |= LDB_DATA_WIDTH_CH1_24; - break; - case MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA: - if (ldb_ch->chno == 0 || is_split) - ldb->ldb_ctrl |= LDB_DATA_WIDTH_CH0_24 | - LDB_BIT_MAP_CH0_JEIDA; - if (ldb_ch->chno == 1 || is_split) - ldb->ldb_ctrl |= LDB_DATA_WIDTH_CH1_24 | - LDB_BIT_MAP_CH1_JEIDA; - break; - } -} - -void ldb_bridge_enable_helper(struct drm_bridge *bridge) -{ - struct ldb_channel *ldb_ch = bridge->driver_private; - struct ldb *ldb = ldb_ch->ldb; - - /* - * Platform specific bridge drivers should set ldb_ctrl properly - * for the enablement, so just write the ctrl_reg here. - */ - regmap_write(ldb->regmap, ldb->ctrl_reg, ldb->ldb_ctrl); -} - -void ldb_bridge_disable_helper(struct drm_bridge *bridge) -{ - struct ldb_channel *ldb_ch = bridge->driver_private; - struct ldb *ldb = ldb_ch->ldb; - bool is_split = ldb_channel_is_split_link(ldb_ch); - - if (ldb_ch->chno == 0 || is_split) - ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK; - if (ldb_ch->chno == 1 || is_split) - ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK; - - regmap_write(ldb->regmap, ldb->ctrl_reg, ldb->ldb_ctrl); -} - -int ldb_bridge_attach_helper(struct drm_bridge *bridge, - enum drm_bridge_attach_flags flags) -{ - struct ldb_channel *ldb_ch = bridge->driver_private; - struct ldb *ldb = ldb_ch->ldb; - - if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) { - DRM_DEV_ERROR(ldb->dev, - "do not support creating a drm_connector\n"); - return -EINVAL; - } - - if (!bridge->encoder) { - DRM_DEV_ERROR(ldb->dev, "missing encoder\n"); - return -ENODEV; - } - - return drm_bridge_attach(bridge->encoder, - ldb_ch->next_bridge, bridge, - DRM_BRIDGE_ATTACH_NO_CONNECTOR); -} - -int ldb_init_helper(struct ldb *ldb) -{ - struct device *dev = ldb->dev; - struct device_node *np = dev->of_node; - struct device_node *child; - int ret; - u32 i; - - ldb->regmap = syscon_node_to_regmap(np->parent); - if (IS_ERR(ldb->regmap)) { - ret = PTR_ERR(ldb->regmap); - if (ret != -EPROBE_DEFER) - DRM_DEV_ERROR(dev, "failed to get regmap: %d\n", ret); - return ret; - } - - for_each_available_child_of_node(np, child) { - struct ldb_channel *ldb_ch; - - ret = of_property_read_u32(child, "reg", &i); - if (ret || i > MAX_LDB_CHAN_NUM - 1) { - ret = -EINVAL; - DRM_DEV_ERROR(dev, - "invalid channel node address: %u\n", i); - of_node_put(child); - return ret; - } - - ldb_ch = ldb->channel[i]; - ldb_ch->ldb = ldb; - ldb_ch->chno = i; - ldb_ch->is_available = true; - ldb_ch->np = child; - - ldb->available_ch_cnt++; - } - - return 0; -} - -int ldb_find_next_bridge_helper(struct ldb *ldb) -{ - struct device *dev = ldb->dev; - struct ldb_channel *ldb_ch; - int ret, i; - - for (i = 0; i < MAX_LDB_CHAN_NUM; i++) { - ldb_ch = ldb->channel[i]; - - if (!ldb_ch->is_available) - continue; - - ldb_ch->next_bridge = devm_drm_of_get_bridge(dev, ldb_ch->np, - 1, 0); - if (IS_ERR(ldb_ch->next_bridge)) { - ret = PTR_ERR(ldb_ch->next_bridge); - if (ret != -EPROBE_DEFER) - DRM_DEV_ERROR(dev, - "failed to get next bridge: %d\n", - ret); - return ret; - } - } - - return 0; -} - -void ldb_add_bridge_helper(struct ldb *ldb, - const struct drm_bridge_funcs *bridge_funcs) -{ - struct ldb_channel *ldb_ch; - int i; - - for (i = 0; i < MAX_LDB_CHAN_NUM; i++) { - ldb_ch = ldb->channel[i]; - - if (!ldb_ch->is_available) - continue; - - ldb_ch->bridge.driver_private = ldb_ch; - ldb_ch->bridge.funcs = bridge_funcs; - ldb_ch->bridge.of_node = ldb_ch->np; - - drm_bridge_add(&ldb_ch->bridge); - } -} - -void ldb_remove_bridge_helper(struct ldb *ldb) -{ - struct ldb_channel *ldb_ch; - int i; - - for (i = 0; i < MAX_LDB_CHAN_NUM; i++) { - ldb_ch = ldb->channel[i]; - - if (!ldb_ch->is_available) - continue; - - drm_bridge_remove(&ldb_ch->bridge); - } -} diff --git a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.h b/drivers/gpu/drm/bridge/imx/imx-ldb-helper.h index a0a5cde27fbc..42e9b4aa8399 100644 --- a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.h +++ b/drivers/gpu/drm/bridge/imx/imx-ldb-helper.h @@ -65,32 +65,209 @@ struct ldb { #define bridge_to_ldb_ch(b) container_of(b, struct ldb_channel, bridge) -bool ldb_channel_is_single_link(struct ldb_channel *ldb_ch); -bool ldb_channel_is_split_link(struct ldb_channel *ldb_ch); +static inline bool ldb_channel_is_single_link(struct ldb_channel *ldb_ch) +{ + return ldb_ch->link_type == LDB_CH_SINGLE_LINK; +} -int ldb_bridge_atomic_check_helper(struct drm_bridge *bridge, - struct drm_bridge_state *bridge_state, - struct drm_crtc_state *crtc_state, - struct drm_connector_state *conn_state); +static inline bool ldb_channel_is_split_link(struct ldb_channel *ldb_ch) +{ + return ldb_ch->link_type == LDB_CH_DUAL_LINK_EVEN_ODD_PIXELS || + ldb_ch->link_type == LDB_CH_DUAL_LINK_ODD_EVEN_PIXELS; +} -void ldb_bridge_mode_set_helper(struct drm_bridge *bridge, - const struct drm_display_mode *mode, - const struct drm_display_mode *adjusted_mode); +static inline int ldb_bridge_atomic_check_helper(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct ldb_channel *ldb_ch = bridge->driver_private; -void ldb_bridge_enable_helper(struct drm_bridge *bridge); + ldb_ch->in_bus_format = bridge_state->input_bus_cfg.format; + ldb_ch->out_bus_format = bridge_state->output_bus_cfg.format; -void ldb_bridge_disable_helper(struct drm_bridge *bridge); + return 0; +} -int ldb_bridge_attach_helper(struct drm_bridge *bridge, - enum drm_bridge_attach_flags flags); +static inline void ldb_bridge_mode_set_helper(struct drm_bridge *bridge, + const struct drm_display_mode *mode, + const struct drm_display_mode *adjusted_mode) +{ + struct ldb_channel *ldb_ch = bridge->driver_private; + struct ldb *ldb = ldb_ch->ldb; + bool is_split = ldb_channel_is_split_link(ldb_ch); -int ldb_init_helper(struct ldb *ldb); + if (is_split) + ldb->ldb_ctrl |= LDB_SPLIT_MODE_EN; -int ldb_find_next_bridge_helper(struct ldb *ldb); + switch (ldb_ch->out_bus_format) { + case MEDIA_BUS_FMT_RGB666_1X7X3_SPWG: + break; + case MEDIA_BUS_FMT_RGB888_1X7X4_SPWG: + if (ldb_ch->chno == 0 || is_split) + ldb->ldb_ctrl |= LDB_DATA_WIDTH_CH0_24; + if (ldb_ch->chno == 1 || is_split) + ldb->ldb_ctrl |= LDB_DATA_WIDTH_CH1_24; + break; + case MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA: + if (ldb_ch->chno == 0 || is_split) + ldb->ldb_ctrl |= LDB_DATA_WIDTH_CH0_24 | + LDB_BIT_MAP_CH0_JEIDA; + if (ldb_ch->chno == 1 || is_split) + ldb->ldb_ctrl |= LDB_DATA_WIDTH_CH1_24 | + LDB_BIT_MAP_CH1_JEIDA; + break; + } +} -void ldb_add_bridge_helper(struct ldb *ldb, - const struct drm_bridge_funcs *bridge_funcs); +static inline void ldb_bridge_enable_helper(struct drm_bridge *bridge) +{ + struct ldb_channel *ldb_ch = bridge->driver_private; + struct ldb *ldb = ldb_ch->ldb; -void ldb_remove_bridge_helper(struct ldb *ldb); + /* + * Platform specific bridge drivers should set ldb_ctrl properly + * for the enablement, so just write the ctrl_reg here. + */ + regmap_write(ldb->regmap, ldb->ctrl_reg, ldb->ldb_ctrl); +} + +static inline void ldb_bridge_disable_helper(struct drm_bridge *bridge) +{ + struct ldb_channel *ldb_ch = bridge->driver_private; + struct ldb *ldb = ldb_ch->ldb; + bool is_split = ldb_channel_is_split_link(ldb_ch); + + if (ldb_ch->chno == 0 || is_split) + ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK; + if (ldb_ch->chno == 1 || is_split) + ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK; + + regmap_write(ldb->regmap, ldb->ctrl_reg, ldb->ldb_ctrl); +} + +static inline int ldb_bridge_attach_helper(struct drm_bridge *bridge, + enum drm_bridge_attach_flags flags) +{ + struct ldb_channel *ldb_ch = bridge->driver_private; + struct ldb *ldb = ldb_ch->ldb; + + if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) { + DRM_DEV_ERROR(ldb->dev, + "do not support creating a drm_connector\n"); + return -EINVAL; + } + + if (!bridge->encoder) { + DRM_DEV_ERROR(ldb->dev, "missing encoder\n"); + return -ENODEV; + } + + return drm_bridge_attach(bridge->encoder, + ldb_ch->next_bridge, bridge, + DRM_BRIDGE_ATTACH_NO_CONNECTOR); +} + +static inline int ldb_init_helper(struct ldb *ldb) +{ + struct device *dev = ldb->dev; + struct device_node *np = dev->of_node; + struct device_node *child; + int ret; + u32 i; + + ldb->regmap = syscon_node_to_regmap(np->parent); + if (IS_ERR(ldb->regmap)) { + ret = PTR_ERR(ldb->regmap); + if (ret != -EPROBE_DEFER) + DRM_DEV_ERROR(dev, "failed to get regmap: %d\n", ret); + return ret; + } + + for_each_available_child_of_node(np, child) { + struct ldb_channel *ldb_ch; + + ret = of_property_read_u32(child, "reg", &i); + if (ret || i > MAX_LDB_CHAN_NUM - 1) { + ret = -EINVAL; + DRM_DEV_ERROR(dev, + "invalid channel node address: %u\n", i); + of_node_put(child); + return ret; + } + + ldb_ch = ldb->channel[i]; + ldb_ch->ldb = ldb; + ldb_ch->chno = i; + ldb_ch->is_available = true; + ldb_ch->np = child; + + ldb->available_ch_cnt++; + } + + return 0; +} + +static inline int ldb_find_next_bridge_helper(struct ldb *ldb) +{ + struct device *dev = ldb->dev; + struct ldb_channel *ldb_ch; + int ret, i; + + for (i = 0; i < MAX_LDB_CHAN_NUM; i++) { + ldb_ch = ldb->channel[i]; + + if (!ldb_ch->is_available) + continue; + + ldb_ch->next_bridge = devm_drm_of_get_bridge(dev, ldb_ch->np, + 1, 0); + if (IS_ERR(ldb_ch->next_bridge)) { + ret = PTR_ERR(ldb_ch->next_bridge); + if (ret != -EPROBE_DEFER) + DRM_DEV_ERROR(dev, + "failed to get next bridge: %d\n", + ret); + return ret; + } + } + + return 0; +} + +static inline void ldb_add_bridge_helper(struct ldb *ldb, + const struct drm_bridge_funcs *bridge_funcs) +{ + struct ldb_channel *ldb_ch; + int i; + + for (i = 0; i < MAX_LDB_CHAN_NUM; i++) { + ldb_ch = ldb->channel[i]; + + if (!ldb_ch->is_available) + continue; + + ldb_ch->bridge.driver_private = ldb_ch; + ldb_ch->bridge.funcs = bridge_funcs; + ldb_ch->bridge.of_node = ldb_ch->np; + + drm_bridge_add(&ldb_ch->bridge); + } +} + +static inline void ldb_remove_bridge_helper(struct ldb *ldb) +{ + struct ldb_channel *ldb_ch; + int i; + + for (i = 0; i < MAX_LDB_CHAN_NUM; i++) { + ldb_ch = ldb->channel[i]; + + if (!ldb_ch->is_available) + continue; + + drm_bridge_remove(&ldb_ch->bridge); + } +} #endif /* __IMX_LDB_HELPER__ */ From patchwork Sat Jun 3 17:07:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 102867 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1786633vqr; Sat, 3 Jun 2023 11:10:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Rvg0G1ZDzc5Bbm/cZZPACq//GxiR8wJ9Zkhd4qCpyqOSV1uyltVji0qrr2iVbaJpuvHVv X-Received: by 2002:a05:6358:720d:b0:123:30f2:a07f with SMTP id h13-20020a056358720d00b0012330f2a07fmr19954724rwa.26.1685815855412; Sat, 03 Jun 2023 11:10:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685815855; cv=none; d=google.com; s=arc-20160816; b=XU5rLsgmIDjd4ERrMjdvqOPTwTgrvqpPpRopzmVG4Td+Xr2iRUYPHtRUfoRVnLmIMu x1+Wjtwp3bGisfLUSMX4IqswFD4clBkiWXFLBkxikoGYkOmD8PikUD5+t4Sod4gXCScJ oduY6jRIje1vn0hR7m/BHEAzshYeezt3wuykhRuZoJ2Dnv5D3x5wfOG6RtzVspq9cnvm FzvdEaDdKbyR85cjwS3GH32RWm5wIxk/Qod6p8FOEb276/ZBNl1gOkEl8zNeoS4ufi+C D1vaFHLqKhfKGPNbb3O0IBfOByecNNWRVLJdHD30JK4MeDF8Kx3bLNjsl3HfxboQzmly q32A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=q/Gfr0Fkk6cdSB6EAN6ZEs6g03e9SzbrPN10P8eR+is=; b=H5dhiO8YFdlT9W5ooJ68g6zI/tcVF6GDJpCYpuBJ1sPthdJBm9k5X+zSzGmgMeHUjK Ykl4Xld+9c4dc2J6EVFU2DLFNs3b8Zbu2ByklOT5PsMRMNe3TDA7u2egLsfoW1LNdFZS iG2fCNs6q7Hlw4+AePbo9ZC37G+zISEmc3w0bv+r6t/pFKFSx8O0pzHz7ckdpViVQ1ID fdza7BmMwOlPZplwW+4uhr1DpkUbwbHZMY364ES0qvrTGC8/IbCScAXBI0h/qPrWJFt+ 52OdK+Hmi3u6JXssFC0NIO00fb69o6FjZGxlFgWR8XegtDZTopp8Sv79Njykqu0umhrT mCkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mh016dTw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bm18-20020a656e92000000b0052c575f1d8dsi3023116pgb.260.2023.06.03.11.10.40; Sat, 03 Jun 2023 11:10:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mh016dTw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229607AbjFCRIL (ORCPT + 99 others); Sat, 3 Jun 2023 13:08:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229600AbjFCRII (ORCPT ); Sat, 3 Jun 2023 13:08:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BD0E135 for ; Sat, 3 Jun 2023 10:08:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 938D960B4B for ; Sat, 3 Jun 2023 17:08:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF872C433A0; Sat, 3 Jun 2023 17:08:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685812087; bh=625V0iT5dcehfVt4qp+4KsunqsvUgaOhEkp64prztuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mh016dTw6+Ptz8S0odzfu5vqrTwHWrX7gPI3LWg8aJGRF3ES+70ahzjpvreYGtu3L 3eAM6sA0I2sRRt/jT7wICaR7Fh5/kxX/J7yGOdSc1naXM5ekeQc/3FoYFxj74ekWJ7 c9N1n1hg2QAuiDvBAyy+6CPGOSMzvZcXNhn848ET64ugNQydaSXi3hofcqIpYCPbH4 LwAPFg/owy8d6bNbe86ro5BbF4NAeCbsifc55jpi5hhjTwCCNpJ8vKTF/4vQTS+mw+ W2ICtXxbhYQw9WalBmCDrYXbpLyWzB82vjRrAD08V+sna0hUGiFDYoiL0ZKKsO6YXV NOgsweVlQ1kwg== From: Masahiro Yamada To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Daniel Vetter , David Airlie , Fabio Estevam , Liu Ying , NXP Linux Team , Pengutronix Kernel Team , Sascha Hauer , Shawn Guo , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] drm/bridge: imx: turn imx8{qm,qxp}-ldb into single-object modules Date: Sun, 4 Jun 2023 02:07:47 +0900 Message-Id: <20230603170747.1753842-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230603170747.1753842-1-masahiroy@kernel.org> References: <20230603170747.1753842-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767706046238270937?= X-GMAIL-MSGID: =?utf-8?q?1767706046238270937?= With the previous fix, these modules are built from a single C file. Rename the source files so they match the module names. Signed-off-by: Masahiro Yamada --- drivers/gpu/drm/bridge/imx/Makefile | 4 ---- drivers/gpu/drm/bridge/imx/{imx8qm-ldb-drv.c => imx8qm-ldb.c} | 0 .../gpu/drm/bridge/imx/{imx8qxp-ldb-drv.c => imx8qxp-ldb.c} | 0 3 files changed, 4 deletions(-) rename drivers/gpu/drm/bridge/imx/{imx8qm-ldb-drv.c => imx8qm-ldb.c} (100%) rename drivers/gpu/drm/bridge/imx/{imx8qxp-ldb-drv.c => imx8qxp-ldb.c} (100%) diff --git a/drivers/gpu/drm/bridge/imx/Makefile b/drivers/gpu/drm/bridge/imx/Makefile index 64b93009376a..c102443f7286 100644 --- a/drivers/gpu/drm/bridge/imx/Makefile +++ b/drivers/gpu/drm/bridge/imx/Makefile @@ -1,9 +1,5 @@ -imx8qm-ldb-objs := imx8qm-ldb-drv.o obj-$(CONFIG_DRM_IMX8QM_LDB) += imx8qm-ldb.o - -imx8qxp-ldb-objs := imx8qxp-ldb-drv.o obj-$(CONFIG_DRM_IMX8QXP_LDB) += imx8qxp-ldb.o - obj-$(CONFIG_DRM_IMX8QXP_PIXEL_COMBINER) += imx8qxp-pixel-combiner.o obj-$(CONFIG_DRM_IMX8QXP_PIXEL_LINK) += imx8qxp-pixel-link.o obj-$(CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI) += imx8qxp-pxl2dpi.o diff --git a/drivers/gpu/drm/bridge/imx/imx8qm-ldb-drv.c b/drivers/gpu/drm/bridge/imx/imx8qm-ldb.c similarity index 100% rename from drivers/gpu/drm/bridge/imx/imx8qm-ldb-drv.c rename to drivers/gpu/drm/bridge/imx/imx8qm-ldb.c diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-ldb-drv.c b/drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c similarity index 100% rename from drivers/gpu/drm/bridge/imx/imx8qxp-ldb-drv.c rename to drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c