From: Maxime Ripard <maxime@cerno.tech> To: Eric Anholt <eric@anholt.net>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Thomas Zimmermann <tzimmermann@suse.de>, Maxime Ripard <maxime@cerno.tech>, Daniel Vetter <daniel.vetter@intel.com>, David Airlie <airlied@linux.ie> Cc: dri-devel@lists.freedesktop.org, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Dave Stevenson <dave.stevenson@raspberrypi.com> Subject: [PATCH 7/8] drm/vc4: dsi: Add configuration for BCM2711 DSI1 Date: Thu, 3 Dec 2020 14:25:42 +0100 [thread overview] Message-ID: <20201203132543.861591-8-maxime@cerno.tech> (raw) In-Reply-To: <20201203132543.861591-1-maxime@cerno.tech> From: Dave Stevenson <dave.stevenson@raspberrypi.com> BCM2711 DSI1 doesn't have the issue with the ARM not being able to write to the registers, therefore remove the DMA workaround for that compatible string. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> Signed-off-by: Maxime Ripard <maxime@cerno.tech> --- drivers/gpu/drm/vc4/vc4_dsi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c index 82162900e351..a55256ed0955 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c @@ -1324,6 +1324,13 @@ static const struct drm_encoder_helper_funcs vc4_dsi_encoder_helper_funcs = { .mode_fixup = vc4_dsi_encoder_mode_fixup, }; +static const struct vc4_dsi_variant bcm2711_dsi1_variant = { + .port = 1, + .debugfs_name = "dsi1_regs", + .regs = dsi1_regs, + .nregs = ARRAY_SIZE(dsi1_regs), +}; + static const struct vc4_dsi_variant bcm2835_dsi0_variant = { .port = 0, .debugfs_name = "dsi0_regs", @@ -1340,6 +1347,7 @@ static const struct vc4_dsi_variant bcm2835_dsi1_variant = { }; static const struct of_device_id vc4_dsi_dt_match[] = { + { .compatible = "brcm,bcm2711-dsi1", &bcm2711_dsi1_variant }, { .compatible = "brcm,bcm2835-dsi0", &bcm2835_dsi0_variant }, { .compatible = "brcm,bcm2835-dsi1", &bcm2835_dsi1_variant }, {} @@ -1524,8 +1532,8 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) return -ENODEV; } - /* DSI1 has a broken AXI slave that doesn't respond to writes - * from the ARM. It does handle writes from the DMA engine, + /* DSI1 on BCM2835/6/7 has a broken AXI slave that doesn't respond to + * writes from the ARM. It does handle writes from the DMA engine, * so set up a channel for talking to it. */ if (dsi->variant->broken_axi_workaround) { -- 2.28.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Maxime Ripard <maxime@cerno.tech> To: Eric Anholt <eric@anholt.net>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Thomas Zimmermann <tzimmermann@suse.de>, Maxime Ripard <maxime@cerno.tech>, Daniel Vetter <daniel.vetter@intel.com>, David Airlie <airlied@linux.ie> Cc: dri-devel@lists.freedesktop.org, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Dave Stevenson <dave.stevenson@raspberrypi.com> Subject: [PATCH 7/8] drm/vc4: dsi: Add configuration for BCM2711 DSI1 Date: Thu, 3 Dec 2020 14:25:42 +0100 [thread overview] Message-ID: <20201203132543.861591-8-maxime@cerno.tech> (raw) In-Reply-To: <20201203132543.861591-1-maxime@cerno.tech> From: Dave Stevenson <dave.stevenson@raspberrypi.com> BCM2711 DSI1 doesn't have the issue with the ARM not being able to write to the registers, therefore remove the DMA workaround for that compatible string. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> Signed-off-by: Maxime Ripard <maxime@cerno.tech> --- drivers/gpu/drm/vc4/vc4_dsi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c index 82162900e351..a55256ed0955 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c @@ -1324,6 +1324,13 @@ static const struct drm_encoder_helper_funcs vc4_dsi_encoder_helper_funcs = { .mode_fixup = vc4_dsi_encoder_mode_fixup, }; +static const struct vc4_dsi_variant bcm2711_dsi1_variant = { + .port = 1, + .debugfs_name = "dsi1_regs", + .regs = dsi1_regs, + .nregs = ARRAY_SIZE(dsi1_regs), +}; + static const struct vc4_dsi_variant bcm2835_dsi0_variant = { .port = 0, .debugfs_name = "dsi0_regs", @@ -1340,6 +1347,7 @@ static const struct vc4_dsi_variant bcm2835_dsi1_variant = { }; static const struct of_device_id vc4_dsi_dt_match[] = { + { .compatible = "brcm,bcm2711-dsi1", &bcm2711_dsi1_variant }, { .compatible = "brcm,bcm2835-dsi0", &bcm2835_dsi0_variant }, { .compatible = "brcm,bcm2835-dsi1", &bcm2835_dsi1_variant }, {} @@ -1524,8 +1532,8 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) return -ENODEV; } - /* DSI1 has a broken AXI slave that doesn't respond to writes - * from the ARM. It does handle writes from the DMA engine, + /* DSI1 on BCM2835/6/7 has a broken AXI slave that doesn't respond to + * writes from the ARM. It does handle writes from the DMA engine, * so set up a channel for talking to it. */ if (dsi->variant->broken_axi_workaround) { -- 2.28.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-12-03 13:27 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-03 13:25 [PATCH 0/8] drm/vc4: DSI improvements and BCM2711 support Maxime Ripard 2020-12-03 13:25 ` Maxime Ripard 2020-12-03 13:25 ` [PATCH 1/8] drm/vc4: drv: Remove the DSI pointer in vc4_drv Maxime Ripard 2020-12-03 13:25 ` Maxime Ripard 2020-12-09 11:02 ` Nicolas Saenz Julienne 2020-12-09 11:02 ` Nicolas Saenz Julienne 2020-12-03 13:25 ` [PATCH 2/8] drm/vc4: dsi: Correct DSI register definition Maxime Ripard 2020-12-03 13:25 ` Maxime Ripard 2020-12-08 8:34 ` Frieder Schrempf 2020-12-08 8:34 ` Frieder Schrempf 2020-12-09 11:04 ` Nicolas Saenz Julienne 2020-12-09 11:04 ` Nicolas Saenz Julienne 2020-12-11 10:17 ` Maxime Ripard 2020-12-11 10:17 ` Maxime Ripard 2020-12-03 13:25 ` [PATCH 3/8] drm/vc4: dsi: Use snprintf for the PHY clocks instead of an array Maxime Ripard 2020-12-03 13:25 ` Maxime Ripard 2020-12-03 13:25 ` [PATCH 4/8] drm/vc4: dsi: Introduce a variant structure Maxime Ripard 2020-12-03 13:25 ` Maxime Ripard 2020-12-03 13:25 ` [PATCH 5/8] drm/vc4: dsi: Add support for DSI0 Maxime Ripard 2020-12-03 13:25 ` Maxime Ripard 2020-12-03 13:25 ` [PATCH 6/8] dt-bindings: Add compatible for BCM2711 DSI1 Maxime Ripard 2020-12-03 13:25 ` Maxime Ripard 2020-12-03 13:25 ` Maxime Ripard [this message] 2020-12-03 13:25 ` [PATCH 7/8] drm/vc4: dsi: Add configuration " Maxime Ripard 2020-12-03 13:25 ` [PATCH 8/8] ARM: dts: bcm2711: Use compatible string " Maxime Ripard 2020-12-03 13:25 ` Maxime Ripard 2020-12-21 12:18 ` Nicolas Saenz Julienne 2020-12-21 12:18 ` Nicolas Saenz Julienne 2020-12-03 15:19 ` [PATCH 0/8] drm/vc4: DSI improvements and BCM2711 support Dave Stevenson 2020-12-03 15:19 ` Dave Stevenson 2020-12-07 9:34 ` Maxime Ripard 2020-12-07 9:34 ` Maxime Ripard
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201203132543.861591-8-maxime@cerno.tech \ --to=maxime@cerno.tech \ --cc=airlied@linux.ie \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=daniel.vetter@intel.com \ --cc=dave.stevenson@raspberrypi.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=eric@anholt.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-rpi-kernel@lists.infradead.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=tzimmermann@suse.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.