diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0261-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0261-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0261-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch b/target/linux/bcm27xx/patches-5.4/950-0261-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch index 9fd796850f..1b13a16e31 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0261-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0261-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch @@ -11,7 +11,7 @@ Signed-off-by: Chris G Miller <chris@creative-electronics.net> --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c -@@ -1485,9 +1485,11 @@ static int vc4_dsi_bind(struct device *d +@@ -1483,9 +1483,11 @@ static int vc4_dsi_bind(struct device *d /* DSI1 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. @@ -24,7 +24,7 @@ Signed-off-by: Chris G Miller <chris@creative-electronics.net> &dsi->reg_dma_paddr, GFP_KERNEL); if (!dsi->reg_dma_mem) { -@@ -1506,6 +1508,8 @@ static int vc4_dsi_bind(struct device *d +@@ -1504,6 +1506,8 @@ static int vc4_dsi_bind(struct device *d return ret; } @@ -33,7 +33,7 @@ Signed-off-by: Chris G Miller <chris@creative-electronics.net> /* Get the physical address of the device's registers. The * struct resource for the regs gives us the bus address * instead. -@@ -1532,7 +1536,7 @@ static int vc4_dsi_bind(struct device *d +@@ -1530,7 +1534,7 @@ static int vc4_dsi_bind(struct device *d if (ret) { if (ret != -EPROBE_DEFER) dev_err(dev, "Failed to get interrupt: %d\n", ret); @@ -42,7 +42,7 @@ Signed-off-by: Chris G Miller <chris@creative-electronics.net> } dsi->escape_clock = devm_clk_get(dev, "escape"); -@@ -1540,7 +1544,7 @@ static int vc4_dsi_bind(struct device *d +@@ -1538,7 +1542,7 @@ static int vc4_dsi_bind(struct device *d ret = PTR_ERR(dsi->escape_clock); if (ret != -EPROBE_DEFER) dev_err(dev, "Failed to get escape clock: %d\n", ret); @@ -51,7 +51,7 @@ Signed-off-by: Chris G Miller <chris@creative-electronics.net> } dsi->pll_phy_clock = devm_clk_get(dev, "phy"); -@@ -1548,7 +1552,7 @@ static int vc4_dsi_bind(struct device *d +@@ -1546,7 +1550,7 @@ static int vc4_dsi_bind(struct device *d ret = PTR_ERR(dsi->pll_phy_clock); if (ret != -EPROBE_DEFER) dev_err(dev, "Failed to get phy clock: %d\n", ret); @@ -60,7 +60,7 @@ Signed-off-by: Chris G Miller <chris@creative-electronics.net> } dsi->pixel_clock = devm_clk_get(dev, "pixel"); -@@ -1556,7 +1560,7 @@ static int vc4_dsi_bind(struct device *d +@@ -1554,7 +1558,7 @@ static int vc4_dsi_bind(struct device *d ret = PTR_ERR(dsi->pixel_clock); if (ret != -EPROBE_DEFER) dev_err(dev, "Failed to get pixel clock: %d\n", ret); @@ -69,7 +69,7 @@ Signed-off-by: Chris G Miller <chris@creative-electronics.net> } ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, -@@ -1571,26 +1575,28 @@ static int vc4_dsi_bind(struct device *d +@@ -1569,26 +1573,28 @@ static int vc4_dsi_bind(struct device *d if (ret == -ENODEV) return 0; @@ -103,7 +103,7 @@ Signed-off-by: Chris G Miller <chris@creative-electronics.net> if (dsi->port == 1) vc4->dsi1 = dsi; -@@ -1602,7 +1608,7 @@ static int vc4_dsi_bind(struct device *d +@@ -1600,7 +1606,7 @@ static int vc4_dsi_bind(struct device *d ret = drm_bridge_attach(dsi->encoder, dsi->bridge, NULL); if (ret) { dev_err(dev, "bridge attach failed: %d\n", ret); @@ -112,7 +112,7 @@ Signed-off-by: Chris G Miller <chris@creative-electronics.net> } /* Disable the atomic helper calls into the bridge. We * manually call the bridge pre_enable / enable / etc. calls -@@ -1619,6 +1625,11 @@ static int vc4_dsi_bind(struct device *d +@@ -1617,6 +1623,11 @@ static int vc4_dsi_bind(struct device *d pm_runtime_enable(dev); return 0; @@ -124,7 +124,7 @@ Signed-off-by: Chris G Miller <chris@creative-electronics.net> } static void vc4_dsi_unbind(struct device *dev, struct device *master, -@@ -1633,6 +1644,8 @@ static void vc4_dsi_unbind(struct device +@@ -1631,6 +1642,8 @@ static void vc4_dsi_unbind(struct device vc4_dsi_encoder_destroy(dsi->encoder); |