drm/vc4: Move the DSI clock divider workaround closer to the clock call.
Subsystems (6)
PATCH v6 1/5 drm/vc4: Move the DSI clock divider workaround closer to the clock call.
We want the adjusted_mode->clock to be the actual clock we're expecting to program, so that consumers see the right values for clock and vrefresh.
--- drivers/gpu/drm/vc4/vc4_dsi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/vc4/vc4_dsi.c +6 -6
@@ -859,11 +859,7 @@ static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder, pll_clock = parent_rate / divider; pixel_clock_hz = pll_clock / dsi->divider; -/* Round up the clk_set_rate() request slightly, since -* PLLD_DSI1 is an integer divider and its rate selection will -* never round up. -*/ - adjusted_mode->clock = pixel_clock_hz /1000 +1 ; + adjusted_mode->clock = pixel_clock_hz /1000 ;/* Given the new pixel clock, adjust HFP to keep vrefresh the same. */ adjusted_mode->htotal = pixel_clock_hz / (mode->vrefresh * mode->vtotal);
@@ -900,7 +896,11 @@ static void vc4_dsi_encoder_enable(struct drm_encoder *encoder)vc4_dsi_dump_regs (dsi); } - phy_clock = pixel_clock_hz * dsi->divider; +/* Round up the clk_set_rate() request slightly, since +* PLLD_DSI1 is an integer divider and its rate selection will +* never round up. +*/ + phy_clock = (pixel_clock_hz +1000 ) * dsi->divider; ret =clk_set_rate (dsi->pll_phy_clock, phy_clock);if (ret) { dev_err(&dsi->pdev->dev,
Signature · 6 lines
2.14.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v6 2/5 drm/vc4: Avoid using vrefresh==0 mode in DSI htotal math.
The incoming mode might have a missing vrefresh field if it came from drmModeSetCrtc(), which the kernel is supposed to calculate using drm_mode_vrefresh(). We could either use that or the adjusted_mode's original vrefresh value.
However, we can maintain a more exact vrefresh value (not just the integer approximation), by scaling by the ratio of our clocks.
v2: Use math suggested by Andrzej Hajda instead.
v3: Simplify math now that adjusted_mode->clock isn't padded.
--- drivers/gpu/drm/vc4/vc4_dsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_dsi.c +2 -1
@@ -862,7 +862,8 @@ static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder, adjusted_mode->clock = pixel_clock_hz /1000 ;/* Given the new pixel clock, adjust HFP to keep vrefresh the same. */ - adjusted_mode->htotal = pixel_clock_hz / (mode->vrefresh * mode->vtotal); + adjusted_mode->htotal = (adjusted_mode->clock * mode->htotal / + mode->clock); adjusted_mode->hsync_end += adjusted_mode->htotal - mode->htotal; adjusted_mode->hsync_start += adjusted_mode->htotal - mode->htotal;
Signature · 6 lines
2.14.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v6 2/5] drm/vc4: Avoid using vrefresh==0 mode in DSI htotal math.
Quoted 21 lines · Eric Anholt
The incoming mode might have a missing vrefresh field if it came from
drmModeSetCrtc(), which the kernel is supposed to calculate usingdrm_mode_vrefresh(). We could either use that or the adjusted_mode's original vrefresh value.However, we can maintain a more exact vrefresh value (not just the integer approximation), by scaling by the ratio of our clocks.
v2: Use math suggested by Andrzej Hajda instead.
v3: Simplify math now thatadjusted_mode->clockisn't padded.Signed-off-by Eric Anholt <[email protected]>--- drivers/gpu/drm/vc4/vc4_dsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/vc4/vc4_dsi.c +0
-0
drivers/gpu/drm/vc4/vc4_dsi.c static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder, · line 866
Quoted 6 lines
drivers/gpu/drm/vc4/vc4_dsi.c +2
-1@@ -862,7 +862,8 @@ static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder, adjusted_mode->clock = pixel_clock_hz /1000 ;/* Given the new pixel clock, adjust HFP to keep vrefresh the same. */ - adjusted_mode->htotal = pixel_clock_hz / (mode->vrefresh * mode->vtotal); + adjusted_mode->htotal = (adjusted_mode->clock * mode->htotal / + mode->clock);
Parentheses can be removed.
Beside this:
--
Regards
Andrzej
drivers/gpu/drm/vc4/vc4_dsi.c static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder, · line 869
Quoted 3 lines
drivers/gpu/drm/vc4/vc4_dsi.c +0
-0adjusted_mode->hsync_end += adjusted_mode->htotal - mode->htotal; adjusted_mode->hsync_start += adjusted_mode->htotal - mode->htotal;
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v6 2/5] drm/vc4: Avoid using vrefresh==0 mode in DSI htotal math.
In reply to Eric AnholtQuoted 5 lines · On Tue, 15 Aug 2017 16:47:19 -0700 Eric Anholt <[email protected]> wrote:
The incoming mode might have a missing vrefresh field if it came from
drmModeSetCrtc(), which the kernel is supposed to calculate usingdrm_mode_vrefresh(). We could either use that or the adjusted_mode's original vrefresh value.
Quoted 7 lines
However, we can maintain a more exact vrefresh value (not just the integer approximation), by scaling by the ratio of our clocks.
v2: Use math suggested by Andrzej Hajda instead.
v3: Simplify math now thatadjusted_mode->clockisn't padded.Signed-off-by Eric Anholt <[email protected]>
Quoted 9 lines
--- drivers/gpu/drm/vc4/vc4_dsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/vc4/vc4_dsi.c +0
-0
drivers/gpu/drm/vc4/vc4_dsi.c static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder, · line 869
Quoted 9 lines
drivers/gpu/drm/vc4/vc4_dsi.c +2
-1@@ -862,7 +862,8 @@ static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder, adjusted_mode->clock = pixel_clock_hz /1000 ;/* Given the new pixel clock, adjust HFP to keep vrefresh the same. */ - adjusted_mode->htotal = pixel_clock_hz / (mode->vrefresh * mode->vtotal); + adjusted_mode->htotal = (adjusted_mode->clock * mode->htotal / + mode->clock); adjusted_mode->hsync_end += adjusted_mode->htotal - mode->htotal; adjusted_mode->hsync_start += adjusted_mode->htotal - mode->htotal;
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v6 3/5 drm/vc4: Set up the DSI host at pdev probe time, not component bind.
In reply to Eric AnholtWe need the following things to happen in sequence:
DSI host creation
DSI device creation in the panel driver (needs DSI host) DSI device attach from panel to host.
DSI drm_panel_add()
DSI encoder creation
DSI encoder's DRM panel/bridge attach
Unless we allow device creation while the host isn't up yet, we need to break the -EPROBE_DEFER deadlock between the panel driver looking up the host and the host driver looking up the panel. We can do so by moving the DSI host creation outside of the component bind loop, and the panel/bridge lookup/attach into the component bind process.
--- drivers/gpu/drm/vc4/vc4_dsi.c | 97 +++++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 40 deletions(-)
drivers/gpu/drm/vc4/vc4_dsi.c +57 -40
@@ -33,6 +33,7 @@#include <drm/drm_crtc_helper.h> #include <drm/drm_edid.h> #include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <linux/clk.h> #include <linux/clk-provider.h>
@@ -504,7 +505,6 @@ struct vc4_dsi {struct mipi_dsi_host dsi_host;struct drm_encoder *encoder;struct drm_bridge *bridge; -bool is_panel_bridge;void __iomem *regs;
@@ -1289,7 +1289,6 @@ static int vc4_dsi_host_attach(struct mipi_dsi_host *host, struct mipi_dsi_device *device) {struct vc4_dsi *dsi =host_to_dsi (host); -int ret =0 ; dsi->lanes = device->lanes; dsi->channel = device->channel;
@@ -1324,34 +1323,12 @@ static int vc4_dsi_host_attach(struct mipi_dsi_host *host,return 0 ; } - dsi->bridge =of_drm_find_bridge (device->dev.of_node); -if (!dsi->bridge) { -struct drm_panel *panel = -of_drm_find_panel (device->dev.of_node); - - dsi->bridge =drm_panel_bridge_add (panel, -DRM_MODE_CONNECTOR_DSI ); -if (IS_ERR (dsi->bridge)) { - ret =PTR_ERR (dsi->bridge); - dsi->bridge =NULL ; -return ret; - } - dsi->is_panel_bridge = true; - } - -return drm_bridge_attach (dsi->encoder, dsi->bridge,NULL ); +return 0 ; }static int vc4_dsi_host_detach (struct mipi_dsi_host *host,struct mipi_dsi_device *device) { -struct vc4_dsi *dsi =host_to_dsi (host); - -if (dsi->is_panel_bridge) { -drm_panel_bridge_remove (dsi->bridge); - dsi->bridge =NULL ; - } -return 0 ; }
@@ -1493,16 +1470,13 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)struct platform_device *pdev =to_platform_device (dev);struct drm_device *drm =dev_get_drvdata (master);struct vc4_dev *vc4 =to_vc4_dev (drm); -struct vc4_dsi *dsi; +struct vc4_dsi *dsi =dev_get_drvdata (dev);struct vc4_dsi_encoder *vc4_dsi_encoder; +struct drm_panel *panel;const struct of_device_id *match;dma_cap_mask_t dma_mask;int ret; - dsi =devm_kzalloc (dev,sizeof (*dsi),GFP_KERNEL ); -if (!dsi) -return -ENOMEM ; - match =of_match_device (vc4_dsi_dt_match, dev);if (!match)return -ENODEV ;
@@ -1517,7 +1491,6 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) vc4_dsi_encoder->dsi = dsi; dsi->encoder = &vc4_dsi_encoder->base.base; - dsi->pdev = pdev; dsi->regs =vc4_ioremap_regs (pdev,0 );if (IS_ERR (dsi->regs))return PTR_ERR (dsi->regs);
@@ -1598,6 +1571,18 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)return ret; } + ret =drm_of_find_panel_or_bridge (dev->of_node,0 ,0 , + &panel, &dsi->bridge); +if (ret) +return ret; + +if (panel) { + dsi->bridge =devm_drm_panel_bridge_add (dev, panel, +DRM_MODE_CONNECTOR_DSI ); +if (IS_ERR (dsi->bridge)) +return PTR_ERR (dsi->bridge); + } +/* The esc clock rate is supposed to always be 100Mhz. */ ret =clk_set_rate (dsi->escape_clock,100 *1000000 );if (ret) {
@@ -1616,12 +1601,11 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) DRM_MODE_ENCODER_DSI, NULL);drm_encoder_helper_add (dsi->encoder, &vc4_dsi_encoder_helper_funcs); - dsi->dsi_host.ops = &vc4_dsi_host_ops; - dsi->dsi_host.dev = dev; - -mipi_dsi_host_register (&dsi->dsi_host); - -dev_set_drvdata (dev, dsi); + ret =drm_bridge_attach (dsi->encoder, dsi->bridge,NULL ); +if (ret) { +dev_err (dev,"bridge attach failed: %d\n" , ret); +return ret; + }pm_runtime_enable (dev);
@@ -1639,8 +1623,6 @@ static void vc4_dsi_unbind(struct device *dev, struct device *master,vc4_dsi_encoder_destroy (dsi->encoder); -mipi_dsi_host_unregister (&dsi->dsi_host); -if (dsi->port ==1 ) vc4->dsi1 =NULL ; }
@@ -1652,12 +1634,47 @@ static const struct component_ops vc4_dsi_ops = {static int vc4_dsi_dev_probe (struct platform_device *pdev) { -return component_add (&pdev->dev, &vc4_dsi_ops); +struct device *dev = &pdev->dev; +struct vc4_dsi *dsi; +int ret; + + dsi =devm_kzalloc (dev,sizeof (*dsi),GFP_KERNEL ); +if (!dsi) +return -ENOMEM ; +dev_set_drvdata (dev, dsi); + + dsi->pdev = pdev; + +/* Note, the initialization sequence for DSI and panels is +* tricky. The component bind above won't get past its +* -EPROBE_DEFER until the panel/bridge probes. The +* panel/bridge will return -EPROBE_DEFER until it has a +* mipi_dsi_host to register its device to. So, we register +* the host during pdev probe time, so vc4 as a whole can then +* -EPROBE_DEFER its component bind process until the panel +* successfully attaches. +*/ + dsi->dsi_host.ops = &vc4_dsi_host_ops; + dsi->dsi_host.dev = dev; +mipi_dsi_host_register (&dsi->dsi_host); + + ret =component_add (&pdev->dev, &vc4_dsi_ops); +if (ret) { +mipi_dsi_host_unregister (&dsi->dsi_host); +return ret; + } + +return 0 ; }static int vc4_dsi_dev_remove (struct platform_device *pdev) { +struct device *dev = &pdev->dev; +struct vc4_dsi *dsi =dev_get_drvdata (dev); +component_del (&pdev->dev, &vc4_dsi_ops); +mipi_dsi_host_unregister (&dsi->dsi_host); +return 0 ; }
Signature · 1 line
2.14.1
Re: [PATCH v6 3/5] drm/vc4: Set up the DSI host at pdev probe time, not component bind.
Quoted 9 lines · Eric Anholt
We need the following things to happen in sequence:
DSI host creation
DSI device creation in the panel driver (needs DSI host) DSI device attach from panel to host.
DSIdrm_panel_add()
DSI encoder creation
DSI encoder's DRM panel/bridge attach
Quoted 5 lines
Unless we allow device creation while the host isn't up yet, we need to break the -EPROBE_DEFER deadlock between the panel driver looking up the host and the host driver looking up the panel. We can do so by moving the DSI host creation outside of the component bind loop, and the panel/bridge lookup/attach into the component bind process.
Quoted 193 lines
Signed-off-by Eric Anholt <[email protected]>--- drivers/gpu/drm/vc4/vc4_dsi.c | 97 +++++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 40 deletions(-)drivers/gpu/drm/vc4/vc4_dsi.c +57
-40@@ -33,6 +33,7 @@#include <drm/drm_crtc_helper.h> #include <drm/drm_edid.h> #include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <linux/clk.h> #include <linux/clk-provider.h> @@ -504,7 +505,6 @@ struct vc4_dsi {struct mipi_dsi_host dsi_host;struct drm_encoder *encoder;struct drm_bridge *bridge; -bool is_panel_bridge;void __iomem *regs;@@ -1289,7 +1289,6 @@ static int vc4_dsi_host_attach(struct mipi_dsi_host *host, struct mipi_dsi_device *device) {struct vc4_dsi *dsi =host_to_dsi (host); -int ret =0 ; dsi->lanes = device->lanes; dsi->channel = device->channel;@@ -1324,34 +1323,12 @@ static int vc4_dsi_host_attach(struct mipi_dsi_host *host,return 0 ; } - dsi->bridge =of_drm_find_bridge (device->dev.of_node); -if (!dsi->bridge) { -struct drm_panel *panel = -of_drm_find_panel (device->dev.of_node); - - dsi->bridge =drm_panel_bridge_add (panel, -DRM_MODE_CONNECTOR_DSI ); -if (IS_ERR (dsi->bridge)) { - ret =PTR_ERR (dsi->bridge); - dsi->bridge =NULL ; -return ret; - } - dsi->is_panel_bridge = true; - } - -return drm_bridge_attach (dsi->encoder, dsi->bridge,NULL ); +return 0 ; }static int vc4_dsi_host_detach (struct mipi_dsi_host *host,struct mipi_dsi_device *device) { -struct vc4_dsi *dsi =host_to_dsi (host); - -if (dsi->is_panel_bridge) { -drm_panel_bridge_remove (dsi->bridge); - dsi->bridge =NULL ; - } -return 0 ; }@@ -1493,16 +1470,13 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)struct platform_device *pdev =to_platform_device (dev);struct drm_device *drm =dev_get_drvdata (master);struct vc4_dev *vc4 =to_vc4_dev (drm); -struct vc4_dsi *dsi; +struct vc4_dsi *dsi =dev_get_drvdata (dev);struct vc4_dsi_encoder *vc4_dsi_encoder; +struct drm_panel *panel;const struct of_device_id *match;dma_cap_mask_t dma_mask;int ret; - dsi =devm_kzalloc (dev,sizeof (*dsi),GFP_KERNEL ); -if (!dsi) -return -ENOMEM ; - match =of_match_device (vc4_dsi_dt_match, dev);if (!match)return -ENODEV ;@@ -1517,7 +1491,6 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) vc4_dsi_encoder->dsi = dsi; dsi->encoder = &vc4_dsi_encoder->base.base; - dsi->pdev = pdev; dsi->regs =vc4_ioremap_regs (pdev,0 );if (IS_ERR (dsi->regs))return PTR_ERR (dsi->regs);@@ -1598,6 +1571,18 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)return ret; } + ret =drm_of_find_panel_or_bridge (dev->of_node,0 ,0 , + &panel, &dsi->bridge); +if (ret) +return ret; + +if (panel) { + dsi->bridge =devm_drm_panel_bridge_add (dev, panel, +DRM_MODE_CONNECTOR_DSI ); +if (IS_ERR (dsi->bridge)) +return PTR_ERR (dsi->bridge); + } +/* The esc clock rate is supposed to always be 100Mhz. */ ret =clk_set_rate (dsi->escape_clock,100 *1000000 );if (ret) {@@ -1616,12 +1601,11 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) DRM_MODE_ENCODER_DSI, NULL);drm_encoder_helper_add (dsi->encoder, &vc4_dsi_encoder_helper_funcs); - dsi->dsi_host.ops = &vc4_dsi_host_ops; - dsi->dsi_host.dev = dev; - -mipi_dsi_host_register (&dsi->dsi_host); - -dev_set_drvdata (dev, dsi); + ret =drm_bridge_attach (dsi->encoder, dsi->bridge,NULL ); +if (ret) { +dev_err (dev,"bridge attach failed: %d\n" , ret); +return ret; + }pm_runtime_enable (dev);@@ -1639,8 +1623,6 @@ static void vc4_dsi_unbind(struct device *dev, struct device *master,vc4_dsi_encoder_destroy (dsi->encoder); -mipi_dsi_host_unregister (&dsi->dsi_host); -if (dsi->port ==1 ) vc4->dsi1 =NULL ; }@@ -1652,12 +1634,47 @@ static const struct component_ops vc4_dsi_ops = {static int vc4_dsi_dev_probe (struct platform_device *pdev) { -return component_add (&pdev->dev, &vc4_dsi_ops); +struct device *dev = &pdev->dev; +struct vc4_dsi *dsi; +int ret; + + dsi =devm_kzalloc (dev,sizeof (*dsi),GFP_KERNEL ); +if (!dsi) +return -ENOMEM ; +dev_set_drvdata (dev, dsi); + + dsi->pdev = pdev; + +/* Note, the initialization sequence for DSI and panels is +* tricky. The component bind above won't get past its +* -EPROBE_DEFER until the panel/bridge probes. The +* panel/bridge will return -EPROBE_DEFER until it has a +* mipi_dsi_host to register its device to. So, we register +* the host during pdev probe time, so vc4 as a whole can then +* -EPROBE_DEFER its component bind process until the panel +* successfully attaches. +*/ + dsi->dsi_host.ops = &vc4_dsi_host_ops; + dsi->dsi_host.dev = dev; +mipi_dsi_host_register (&dsi->dsi_host); + + ret =component_add (&pdev->dev, &vc4_dsi_ops); +if (ret) { +mipi_dsi_host_unregister (&dsi->dsi_host); +return ret; + } + +return 0 ; }static int vc4_dsi_dev_remove (struct platform_device *pdev) { +struct device *dev = &pdev->dev; +struct vc4_dsi *dsi =dev_get_drvdata (dev); +component_del (&pdev->dev, &vc4_dsi_ops); +mipi_dsi_host_unregister (&dsi->dsi_host); +return 0 ; }
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v6 3/5] drm/vc4: Set up the DSI host at pdev probe time, not component bind.
In reply to Eric AnholtQuoted 9 lines · On Tue, 15 Aug 2017 16:47:20 -0700 Eric Anholt <[email protected]> wrote:
We need the following things to happen in sequence:
DSI host creation
DSI device creation in the panel driver (needs DSI host) DSI device attach from panel to host.
DSIdrm_panel_add()
DSI encoder creation
DSI encoder's DRM panel/bridge attach
Quoted 7 lines
Unless we allow device creation while the host isn't up yet, we need to break the -EPROBE_DEFER deadlock between the panel driver looking up the host and the host driver looking up the panel. We can do so by moving the DSI host creation outside of the component bind loop, and the panel/bridge lookup/attach into the component bind process.
Signed-off-by Eric Anholt <[email protected]>
Quoted 180 lines
--- drivers/gpu/drm/vc4/vc4_dsi.c | 97 +++++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 40 deletions(-)drivers/gpu/drm/vc4/vc4_dsi.c +52
-40@@ -33,6 +33,7 @@#include <drm/drm_crtc_helper.h> #include <drm/drm_edid.h> #include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <linux/clk.h> #include <linux/clk-provider.h> @@ -504,7 +505,6 @@ struct vc4_dsi {struct mipi_dsi_host dsi_host;struct drm_encoder *encoder;struct drm_bridge *bridge; -bool is_panel_bridge;void __iomem *regs;@@ -1289,7 +1289,6 @@ static int vc4_dsi_host_attach(struct mipi_dsi_host *host, struct mipi_dsi_device *device) {struct vc4_dsi *dsi =host_to_dsi (host); -int ret =0 ; dsi->lanes = device->lanes; dsi->channel = device->channel;@@ -1324,34 +1323,12 @@ static int vc4_dsi_host_attach(struct mipi_dsi_host *host,return 0 ; } - dsi->bridge =of_drm_find_bridge (device->dev.of_node); -if (!dsi->bridge) { -struct drm_panel *panel = -of_drm_find_panel (device->dev.of_node); - - dsi->bridge =drm_panel_bridge_add (panel, -DRM_MODE_CONNECTOR_DSI ); -if (IS_ERR (dsi->bridge)) { - ret =PTR_ERR (dsi->bridge); - dsi->bridge =NULL ; -return ret; - } - dsi->is_panel_bridge = true; - } - -return drm_bridge_attach (dsi->encoder, dsi->bridge,NULL ); +return 0 ; }static int vc4_dsi_host_detach (struct mipi_dsi_host *host,struct mipi_dsi_device *device) { -struct vc4_dsi *dsi =host_to_dsi (host); - -if (dsi->is_panel_bridge) { -drm_panel_bridge_remove (dsi->bridge); - dsi->bridge =NULL ; - } -return 0 ; }@@ -1493,16 +1470,13 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)struct platform_device *pdev =to_platform_device (dev);struct drm_device *drm =dev_get_drvdata (master);struct vc4_dev *vc4 =to_vc4_dev (drm); -struct vc4_dsi *dsi; +struct vc4_dsi *dsi =dev_get_drvdata (dev);struct vc4_dsi_encoder *vc4_dsi_encoder; +struct drm_panel *panel;const struct of_device_id *match;dma_cap_mask_t dma_mask;int ret; - dsi =devm_kzalloc (dev,sizeof (*dsi),GFP_KERNEL ); -if (!dsi) -return -ENOMEM ; - match =of_match_device (vc4_dsi_dt_match, dev);if (!match)return -ENODEV ;@@ -1517,7 +1491,6 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) vc4_dsi_encoder->dsi = dsi; dsi->encoder = &vc4_dsi_encoder->base.base; - dsi->pdev = pdev; dsi->regs =vc4_ioremap_regs (pdev,0 );if (IS_ERR (dsi->regs))return PTR_ERR (dsi->regs);@@ -1598,6 +1571,18 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)return ret; } + ret =drm_of_find_panel_or_bridge (dev->of_node,0 ,0 , + &panel, &dsi->bridge); +if (ret) +return ret; + +if (panel) { + dsi->bridge =devm_drm_panel_bridge_add (dev, panel, +DRM_MODE_CONNECTOR_DSI ); +if (IS_ERR (dsi->bridge)) +return PTR_ERR (dsi->bridge); + } +/* The esc clock rate is supposed to always be 100Mhz. */ ret =clk_set_rate (dsi->escape_clock,100 *1000000 );if (ret) {@@ -1616,12 +1601,11 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) DRM_MODE_ENCODER_DSI, NULL);drm_encoder_helper_add (dsi->encoder, &vc4_dsi_encoder_helper_funcs); - dsi->dsi_host.ops = &vc4_dsi_host_ops; - dsi->dsi_host.dev = dev; - -mipi_dsi_host_register (&dsi->dsi_host); - -dev_set_drvdata (dev, dsi); + ret =drm_bridge_attach (dsi->encoder, dsi->bridge,NULL ); +if (ret) { +dev_err (dev,"bridge attach failed: %d\n" , ret); +return ret; + }pm_runtime_enable (dev);@@ -1639,8 +1623,6 @@ static void vc4_dsi_unbind(struct device *dev, struct device *master,vc4_dsi_encoder_destroy (dsi->encoder); -mipi_dsi_host_unregister (&dsi->dsi_host); -if (dsi->port ==1 ) vc4->dsi1 =NULL ; }@@ -1652,12 +1634,47 @@ static const struct component_ops vc4_dsi_ops = {static int vc4_dsi_dev_probe (struct platform_device *pdev) { -return component_add (&pdev->dev, &vc4_dsi_ops); +struct device *dev = &pdev->dev; +struct vc4_dsi *dsi; +int ret; + + dsi =devm_kzalloc (dev,sizeof (*dsi),GFP_KERNEL ); +if (!dsi) +return -ENOMEM ; +dev_set_drvdata (dev, dsi); + + dsi->pdev = pdev; + +/* Note, the initialization sequence for DSI and panels is +* tricky. The component bind above won't get past its +* -EPROBE_DEFER until the panel/bridge probes. The +* panel/bridge will return -EPROBE_DEFER until it has a +* mipi_dsi_host to register its device to. So, we register +* the host during pdev probe time, so vc4 as a whole can then +* -EPROBE_DEFER its component bind process until the panel +* successfully attaches. +*/ + dsi->dsi_host.ops = &vc4_dsi_host_ops; + dsi->dsi_host.dev = dev; +mipi_dsi_host_register (&dsi->dsi_host); + + ret =component_add (&pdev->dev, &vc4_dsi_ops); +if (ret) { +mipi_dsi_host_unregister (&dsi->dsi_host); +return ret; + } + +return 0 ; }static int vc4_dsi_dev_remove (struct platform_device *pdev)
drivers/gpu/drm/vc4/vc4_dsi.c static const struct component_ops vc4_dsi_ops = { · line 1680
Quoted 10 lines
drivers/gpu/drm/vc4/vc4_dsi.c +5
-0{ +struct device *dev = &pdev->dev; +struct vc4_dsi *dsi =dev_get_drvdata (dev); +component_del (&pdev->dev, &vc4_dsi_ops); +mipi_dsi_host_unregister (&dsi->dsi_host); +return 0 ; }
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v6 4/5 dt-bindings: Document the Raspberry Pi Touchscreen nodes.
In reply to Eric AnholtThis doesn't yet cover input, but the driver does get the display working when the firmware is disabled from talking to our I2C lines.
--- .../panel/raspberrypi,7inch-touchscreen.txt | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.txt
Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.txt new file +49 -0
@@ -0,0 +1,49 @@ +This binding covers the official 7" (800x480) Raspberry Pi touchscreen +panel. + +This DSI panel contains: + +- TC358762 DSI->DPI bridge +- Atmel microcontroller on I2C for power sequencing the DSI bridge and + controlling backlight +- Touchscreen controller on I2C for touch input + +and this binding covers the DSI display parts but not its touch input. + +Required properties: +- compatible: Must be "raspberrypi,7inch-touchscreen-panel" +- reg: Must be "45" +- port: See panel-common.txt + +Example: + +dsi1: dsi@7e700000 { + #address-cells = <1>; + #size-cells = <0>; + <...> + + port { + dsi_out_port: endpoint { + remote-endpoint = <&panel_dsi_port>; + }; + }; +}; + +i2c_dsi: i2c { + compatible = "i2c-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&gpio 28 0 + &gpio 29 0>; + + lcd@45 { + compatible = "raspberrypi,7inch-touchscreen-panel"; + reg = <0x45>; + + port { + panel_dsi_port: endpoint { + remote-endpoint = <&dsi_out_port>; + }; + }; + }; +};
Signature · 6 lines
2.14.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v6 5/5 drm/panel: Add support for the Raspberry Pi 7" Touchscreen.
In reply to Eric AnholtThis driver communicates with the Atmel microcontroller for sequencing the poweron of the TC358762 DSI-DPI bridge and controlling the backlight PWM.
v2: Set the same default orientation as the closed source firmware
used, which is the best for viewing angle.
v3: Rewrite as an i2c client driver after bridge driver rejection.
v4: Finish probe without the DSI host, using the new delayed
registration, and attach to the host during mipi_dsi_driver probe.
v5: Rework to drop the "probe without DSI host" mode again, now that
vc4 will create the host early on.
--- drivers/gpu/drm/panel/Kconfig | 8 + drivers/gpu/drm/panel/Makefile | 1 + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 517 +++++++++++++++++++++ 3 files changed, 526 insertions(+) create mode 100644 drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
drivers/gpu/drm/panel/Kconfig +8 -0
@@ -73,6 +73,14 @@ config DRM_PANEL_PANASONIC_VVX10F034N00 WUXGA (1920x1200) Novatek NT1397-based DSI panel as found in some Xperia Z2 tablets +config DRM_PANEL_RASPBERRYPI_TOUCHSCREEN + tristate "Raspberry Pi 7-inch touchscreen panel" + depends on DRM_MIPI_DSI + help + Say Y here if you want to enable support for the Raspberry + Pi 7" Touchscreen. To compile this driver as a module, + choose M here. + config DRM_PANEL_SAMSUNG_S6E3HA2 tristate "Samsung S6E3HA2 DSI video mode panel" depends on OF
drivers/gpu/drm/panel/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_DRM_PANEL_INNOLUX_P079ZCA) += panel-innolux-p079zca.o obj-$(CONFIG_DRM_PANEL_JDI_LT070ME05000) += panel-jdi-lt070me05000.o obj-$(CONFIG_DRM_PANEL_LG_LG4573) += panel-lg-lg4573.o obj-$(CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00) += panel-panasonic-vvx10f034n00.o +obj-$(CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN) += panel-raspberrypi-touchscreen.o obj-$(CONFIG_DRM_PANEL_SAMSUNG_LD9040) += panel-samsung-ld9040.o obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2) += panel-samsung-s6e3ha2.o obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0) += panel-samsung-s6e8aa0.o
drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c new file +517 -0
517 lines not on this page · raw message
Signature · 6 lines
2.14.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 5 lines · On Tue, 15 Aug 2017 16:47:18 -0700 Eric Anholt <[email protected]> wrote:
We want the
adjusted_mode->clockto be the actual clock we're expecting to program, so that consumers see the right values for clock and vrefresh.Signed-off-by Eric Anholt <[email protected]>
Quoted 24 lines
--- drivers/gpu/drm/vc4/vc4_dsi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/vc4/vc4_dsi.c +1
-5@@ -859,11 +859,7 @@ static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder, pll_clock = parent_rate / divider; pixel_clock_hz = pll_clock / dsi->divider; -/* Round up the clk_set_rate() request slightly, since -* PLLD_DSI1 is an integer divider and its rate selection will -* never round up. -*/ - adjusted_mode->clock = pixel_clock_hz /1000 +1 ; + adjusted_mode->clock = pixel_clock_hz /1000 ;/* Given the new pixel clock, adjust HFP to keep vrefresh the same. */ adjusted_mode->htotal = pixel_clock_hz / (mode->vrefresh * mode->vtotal);@@ -900,7 +896,11 @@ static void vc4_dsi_encoder_enable(struct drm_encoder *encoder)vc4_dsi_dump_regs (dsi); }
drivers/gpu/drm/vc4/vc4_dsi.c static void vc4_dsi_encoder_enable(struct drm_encoder *encoder) · line 906
Quoted 10 lines
drivers/gpu/drm/vc4/vc4_dsi.c +5
-1- phy_clock = pixel_clock_hz * dsi->divider; +/* Round up the clk_set_rate() request slightly, since +* PLLD_DSI1 is an integer divider and its rate selection will +* never round up. +*/ + phy_clock = (pixel_clock_hz +1000 ) * dsi->divider; ret =clk_set_rate (dsi->pll_phy_clock, phy_clock);if (ret) { dev_err(&dsi->pdev->dev,
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel