From patchwork Tue Aug 20 01:16:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 11102445 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D49AD174A for ; Tue, 20 Aug 2019 01:17:37 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id BDBB42070B for ; Tue, 20 Aug 2019 01:17:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDBB42070B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 30A9E6E4CF; Tue, 20 Aug 2019 01:17:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4897D6E4A0 for ; Tue, 20 Aug 2019 01:17:33 +0000 (UTC) Received: from pendragon.bb.dnainternet.fi (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id BC6F533D; Tue, 20 Aug 2019 03:17:30 +0200 (CEST) From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 00/50] drm/omap: Replace custom display drivers with drm_bridge and drm_panel Date: Tue, 20 Aug 2019 04:16:31 +0300 Message-Id: <20190820011721.30136-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1566263851; bh=0QSIgd4aTcGily6/SHBdVa0GYM/bq43nvmppJL9ww2M=; h=From:To:Cc:Subject:Date:From; b=aBp7a8ysrHBt6ndFFr0qs+YqeCo9LrK+BQh9hU/QRFKw+9/EaWIppt7LiryxmIb9P QRRaGdlyNrpCN6uHYOYmuuHzbm1UE0IJbCz1sMLtZ42KmVQVuf9V3FoFhgfkvgQBah 1gEPiOnOYJOdQn7Jy1SDdw4W3tVUoK+utg0UQzhg= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Ripard , Tomi Valkeinen , Sean Paul , Sebastian Reichel Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hello, This patch series (nearly, see [1]) completes the rework of the omapdrm driver to move to drm_bridge and drm_panel. Let's start with some context (copied from v1) to understand the problem. omapdrm contains custom drivers for external encoders, panels and connectors (collectively referred to as display drivers). It combines them to create output pipelines abstracted by a drm_encoder and a drm_connector, with the ability to delegate the encoder and connector operations to the component in the pipeline that implements them. For instance, for an HDMI output pipeline, the hot plug detection and the EDID read can be implemented by two different components, when they are handled by two different devices at the hardware level. DRM/KMS uses drm_bridge and drm_panel to abstract external encoders and panels. The model is however simpler than what omapdrm provides, as bridges were designed to be simple add-ons at the output of a drm_encoder. The ability to chain bridges exists, but a bridge driver hardcodes in its design its position in the pipeline : bridges that expect to terminate the pipeline create a drm_connector, while bridges that expect to be an intermediate component in the pipeline do not create a connector. In addition to not supporting bridges that can be either internal or a termination point in the pipeline depending on the hardware design, implementing the drm_connector inside a bridge driver makes it impossible to support hardware where bridge operations are handled by different hardware components, as explained above. The omapdrm driver has received support for drm_bridge and drm_panel, but these issues prevented completely moving away from the omapdrm custom display drivers. This patch series thus first reworks the drm_bridge infrastructure to support the omapdrm use cases, and then transitions the omapdrm driver. The series starts with a small drive-by cleanup (01/50), followed by a new helper (02/50) that leverages data from drm_connector.c to convert a connector type to a string. Patch 03/50 then adds a new flag to the drm_display_info structure to identify HDMI sinks. This is a feature needed by the OMAP4 and OMAP5 HDMI encoders, and I believe it can be useful to other HDMI encoders as well. The next two patches address the drm_bridge issues explained above. Patch 04/50 adds connector-related operations to drm_bridge, and patch 05/50 makes it possible to attach to a bridge without having the bridge create a connector. The connector is expected to be created by the display controller driver. The approach taken here is slightly intrusive as path 05/50 adds a parameter to the bridge .attach() operation, and thus touches all bridge drivers, even if the changes are very simple (as a consequence I haven't CC'ed all the individual bridge maintainers as the CC list was too large). Other options may be possible, what matters most to me is the feature, not so much its implementation. Please note that compared to v1 this version uses a flag bitmask instead of a boolean on Andrzej's request, as he expects the parameter to be useful for other purposes. The first sizeable change follows with the rename of the dumb-vga-dac driver to simple-bridge (06/50 and 07/50) and support for non-VGA bridges (08/50). This doesn't change the spirit of the driver that still focusses on transparent bridges, but prepares it to support an analog video amplifier. Patches 09/50 then add support for an enable GPIO, and 10/50 support for the OPA362 video amplifier itself. The next six patches make use of these new features: patches 11/50 and 12/50 add new bridge drivers for display connectors and for the TI TPD12S015 HDMI level shifter respectively, patch 13/50 supports the new API in the panel bridge driver, and patches 15/50 to 16/50 do the same in the ti-tfp410 driver. Patch 17/50 is possibly the most remarkable one in the series, with the drm_bridge operations extension, as it provides a helper for display controller drivers to construct a drm_connector entirerly backed by a chain of bridges. This offsets the complexity of the additional bridge operations by handling it all in a single place. An example usage for omapdrm can be found in patch 34/50. Don't let its diffstat mislead you, usage of the helper would remove lots of code if it wasn't for the fact that the legacy implementation still has to be kept for the DSI panel (see [1]). Down the road this helper and the new operation paradigm should remove code from both display controller and bridge drivers. The rest of the series is omapdrm-focussed, slowly preparing the driver for the switch to drm_bridge drivers using the new helper (34/50), the removal of the omapdrm-specific display drivers (35/50), and lots of simplification and code removal in the other patches. Compared to v1, many review comments have been taken into account, please see individual patches for details. Please note that some issues are still being discussed and have thus not been addressed yet. This includes HPD handling and removal of the drm_connector argument from the drm_bridge .get_edid() operation. The patches can be found at git://linuxtv.org/pinchartl/media.git omapdrm/bridge/devel [1] The only notable exception is the omapdrm-specific DSI panel driver that implements a large number of custom operations. This should be addressed separately. Laurent Pinchart (50): video: hdmi: Change return type of hdmi_avi_infoframe_init() to void drm/connector: Add helper to get a connector type name drm/edid: Add flag to drm_display_info to identify HDMI sinks drm/bridge: Add connector-related bridge operations and data drm/bridge: Extend bridge API to disable connector creation drm/bridge: dumb-vga-dac: Rename internal symbols to simple-bridge drm/bridge: dumb-vga-dac: Rename driver to simple-bridge drm/bridge: simple-bridge: Add support for non-VGA bridges drm/bridge: simple-bridge: Add support for enable GPIO drm/bridge: simple-bridge: Add support for the TI OP362 drm/bridge: Add bridge driver for display connectors drm/bridge: Add driver for the TI TPD12S015 HDMI level shifter drm/bridge: panel: Implement bridge connector operations drm/bridge: tfp410: Don't include drmP.h drm/bridge: tfp410: Replace manual connector handling with bridge drm/bridge: tfp410: Allow operation without drm_connector drm: Add helper to create a connector for a chain of bridges drm/omap: Simplify HDMI mode and infoframe configuration drm/omap: Factor out display type to connector type conversion drm/omap: Use the drm_panel_bridge API drm/omap: dss: Fix output next device lookup in DT drm/omap: Add infrastructure to support drm_bridge local to DSS outputs drm/omap: dss: Make omap_dss_device_ops optional drm/omap: hdmi: Allocate EDID in the .read_edid() operation drm/omap: hdmi4: Rework EDID read to isolate data read drm/omap: hdmi5: Rework EDID read to isolate data read drm/omap: hdmi4: Register a drm_bridge for EDID read drm/omap: hdmi5: Register a drm_bridge for EDID read drm/omap: hdmi4: Move mode set, enable and disable operations to bridge drm/omap: hdmi5: Move mode set, enable and disable operations to bridge drm/omap: hdmi4: Implement drm_bridge .hpd_notify() operation drm/omap: dss: Remove .set_hdmi_mode() and .set_infoframe() operations drm/omap: venc: Register a drm_bridge drm/omap: Create connector for bridges drm/omap: Switch the HDMI and VENC outputs to drm_bridge drm/omap: Remove HPD, detect and EDID omapdss operations drm/omap: hdmi: Remove omap_dss_device operations drm/omap: venc: Remove omap_dss_device operations drm/omap: hdmi4: Simplify EDID read drm/omap: hdmi5: Simplify EDID read drm/omap: dpi: Sort includes alphabetically drm/omap: dpi: Reorder functions in sections drm/omap: dpi: Simplify clock setting API drm/omap: dpi: Register a drm_bridge drm/omap: sdi: Sort includes alphabetically drm/omap: sdi: Register a drm_bridge drm/omap: Simplify connector implementation drm/omap: dss: Remove unused omap_dss_device operations drm/omap: dss: Inline the omapdss_display_get() function drm/omap: dss: Remove unused omapdss_of_find_connected_device() function Documentation/gpu/todo.rst | 12 + arch/arm/configs/davinci_all_defconfig | 2 +- arch/arm/configs/integrator_defconfig | 2 +- arch/arm/configs/multi_v7_defconfig | 2 +- arch/arm/configs/shmobile_defconfig | 2 +- arch/arm/configs/sunxi_defconfig | 2 +- arch/arm/configs/versatile_defconfig | 2 +- drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/arc/arcpgu_hdmi.c | 2 +- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 2 +- drivers/gpu/drm/bridge/Kconfig | 29 +- drivers/gpu/drm/bridge/Makefile | 4 +- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 6 +- drivers/gpu/drm/bridge/analogix-anx78xx.c | 6 +- .../drm/bridge/analogix/analogix_dp_core.c | 8 +- drivers/gpu/drm/bridge/cdns-dsi.c | 6 +- drivers/gpu/drm/bridge/display-connector.c | 292 ++++++++++++++ drivers/gpu/drm/bridge/dumb-vga-dac.c | 299 -------------- drivers/gpu/drm/bridge/lvds-encoder.c | 5 +- .../bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 6 +- drivers/gpu/drm/bridge/nxp-ptn3460.c | 6 +- drivers/gpu/drm/bridge/panel.c | 22 +- drivers/gpu/drm/bridge/parade-ps8622.c | 6 +- drivers/gpu/drm/bridge/sii902x.c | 6 +- drivers/gpu/drm/bridge/sil-sii8620.c | 3 +- drivers/gpu/drm/bridge/simple-bridge.c | 339 ++++++++++++++++ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 8 +- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 8 +- drivers/gpu/drm/bridge/tc358764.c | 6 +- drivers/gpu/drm/bridge/tc358767.c | 6 +- drivers/gpu/drm/bridge/thc63lvd1024.c | 5 +- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 6 +- drivers/gpu/drm/bridge/ti-tfp410.c | 205 ++++------ drivers/gpu/drm/bridge/ti-tpd12s015.c | 195 +++++++++ drivers/gpu/drm/drm_bridge.c | 100 ++++- drivers/gpu/drm/drm_bridge_connector.c | 372 ++++++++++++++++++ drivers/gpu/drm/drm_connector.c | 15 + drivers/gpu/drm/drm_edid.c | 11 +- drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- drivers/gpu/drm/exynos/exynos_dp.c | 3 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 2 +- drivers/gpu/drm/i2c/tda998x_drv.c | 8 +- drivers/gpu/drm/imx/imx-ldb.c | 2 +- drivers/gpu/drm/imx/parallel-display.c | 2 +- drivers/gpu/drm/ingenic/ingenic-drm.c | 2 +- drivers/gpu/drm/mcde/mcde_dsi.c | 8 +- drivers/gpu/drm/mediatek/mtk_dpi.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- drivers/gpu/drm/mediatek/mtk_hdmi.c | 8 +- drivers/gpu/drm/msm/dsi/dsi_manager.c | 4 +- drivers/gpu/drm/msm/edp/edp_bridge.c | 2 +- drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +- drivers/gpu/drm/omapdrm/displays/Kconfig | 22 -- drivers/gpu/drm/omapdrm/displays/Makefile | 4 - .../omapdrm/displays/connector-analog-tv.c | 97 ----- .../gpu/drm/omapdrm/displays/connector-hdmi.c | 183 --------- .../gpu/drm/omapdrm/displays/encoder-opa362.c | 137 ------- .../drm/omapdrm/displays/encoder-tpd12s015.c | 217 ---------- .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 2 +- drivers/gpu/drm/omapdrm/dss/Makefile | 2 +- drivers/gpu/drm/omapdrm/dss/base.c | 71 ++-- drivers/gpu/drm/omapdrm/dss/display.c | 9 - drivers/gpu/drm/omapdrm/dss/dpi.c | 337 +++++++++------- drivers/gpu/drm/omapdrm/dss/dsi.c | 4 +- drivers/gpu/drm/omapdrm/dss/dss-of.c | 28 -- drivers/gpu/drm/omapdrm/dss/dss.c | 3 +- drivers/gpu/drm/omapdrm/dss/hdmi.h | 4 +- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 324 ++++++++------- drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 59 +-- drivers/gpu/drm/omapdrm/dss/hdmi4_core.h | 4 +- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 304 +++++++------- drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 48 +-- drivers/gpu/drm/omapdrm/dss/hdmi5_core.h | 5 +- .../gpu/drm/omapdrm/dss/omapdss-boot-init.c | 5 - drivers/gpu/drm/omapdrm/dss/omapdss.h | 47 +-- drivers/gpu/drm/omapdrm/dss/output.c | 55 ++- drivers/gpu/drm/omapdrm/dss/sdi.c | 188 +++++---- drivers/gpu/drm/omapdrm/dss/venc.c | 270 +++++++------ drivers/gpu/drm/omapdrm/omap_connector.c | 246 +----------- drivers/gpu/drm/omapdrm/omap_connector.h | 3 - drivers/gpu/drm/omapdrm/omap_drv.c | 96 +++-- drivers/gpu/drm/omapdrm/omap_encoder.c | 83 +--- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 2 +- drivers/gpu/drm/rcar-du/rcar_lvds.c | 8 +- drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- drivers/gpu/drm/rockchip/rockchip_rgb.c | 2 +- drivers/gpu/drm/sti/sti_dvo.c | 2 +- drivers/gpu/drm/sti/sti_hda.c | 2 +- drivers/gpu/drm/sti/sti_hdmi.c | 2 +- drivers/gpu/drm/stm/ltdc.c | 2 +- drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_external.c | 2 +- drivers/gpu/drm/vc4/vc4_dpi.c | 2 +- drivers/gpu/drm/vc4/vc4_dsi.c | 2 +- drivers/video/hdmi.c | 11 +- include/drm/drm_bridge.h | 197 +++++++++- include/drm/drm_bridge_connector.h | 18 + include/drm/drm_connector.h | 9 + include/linux/hdmi.h | 2 +- 103 files changed, 2819 insertions(+), 2375 deletions(-) create mode 100644 drivers/gpu/drm/bridge/display-connector.c delete mode 100644 drivers/gpu/drm/bridge/dumb-vga-dac.c create mode 100644 drivers/gpu/drm/bridge/simple-bridge.c create mode 100644 drivers/gpu/drm/bridge/ti-tpd12s015.c create mode 100644 drivers/gpu/drm/drm_bridge_connector.c delete mode 100644 drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c delete mode 100644 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c delete mode 100644 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c delete mode 100644 drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c delete mode 100644 drivers/gpu/drm/omapdrm/dss/dss-of.c create mode 100644 include/drm/drm_bridge_connector.h Signed-off-by: Laurent Pinchart