diff options
| author | Daniel Brát <danek.brat@gmail.com> | 2021-09-07 09:29:15 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-10-04 12:50:29 +0200 |
| commit | b15b929b4964a1967a60020cb398713b378cc9f9 (patch) | |
| tree | 10d98d513320a215f16d8ca83851f6c0ccc44bf7 /drivers/video | |
| parent | ee05dc28e9985640d5df0b46eb6d5bf8ade2cd85 (diff) | |
| download | barebox-b15b929b4964a1967a60020cb398713b378cc9f9.tar.gz barebox-b15b929b4964a1967a60020cb398713b378cc9f9.tar.xz | |
video: Fix broken bcm2835 fb driver
The bcm2835 framebuffer driver was broken, because the address of video
buffer allocated for us by the GPU and returned through mailbox was
used without converting it back to ARM address space. That unconverted
address was also in the range of peripheral addresses, which caused
other issues later on due to it being filled with garbage data.
The offset by which to convert the address back can vary by device,
so the value is read from devicetree 'dma-ranges' for somewhat portable
operation.
This fix was tested on Raspberry PI B+ and Raspberry PI 3B+.
Signed-off-by: Daniel Brát <danek.brat@gmail.com>
Link: https://lore.barebox.org/20210907072915.18451-1-danek.brat@gmail.com
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/bcm2835.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c index d808bc5c9f..14735fe465 100644 --- a/drivers/video/bcm2835.c +++ b/drivers/video/bcm2835.c @@ -14,6 +14,7 @@ #include <malloc.h> #include <xfuncs.h> +#include <of_address.h> #include <mach/mbox.h> struct bcm2835fb_info { @@ -58,9 +59,24 @@ static int bcm2835fb_probe(struct device_d *dev) BCM2835_MBOX_STACK_ALIGN(struct msg_fb_query, msg_query); BCM2835_MBOX_STACK_ALIGN(struct msg_fb_setup, msg_setup); struct bcm2835fb_info *info; + struct device_node *soc; u32 w, h; + u64 dma_addr, cpu_addr, _region_size; + phys_addr_t buffer_addr; int ret; + soc = of_find_node_by_path("/soc"); + if (!soc) { + dev_err(dev, "could not find required OF node /soc\n"); + return -ENODEV; + } + + ret = of_dma_get_range(soc, &dma_addr, &cpu_addr, &_region_size); + if (ret) { + dev_err(dev, "OF node /soc has no dma-ranges\n"); + return ret; + } + BCM2835_MBOX_INIT_HDR(msg_query); BCM2835_MBOX_INIT_TAG_NO_REQ(&msg_query->physical_w_h, GET_PHYSICAL_W_H); @@ -99,10 +115,11 @@ static int bcm2835fb_probe(struct device_d *dev) return ret; } + buffer_addr = (msg_setup->allocate_buffer.body.resp.fb_address & ~dma_addr) + cpu_addr; + info = xzalloc(sizeof *info); info->fbi.fbops = &bcm2835fb_ops; - info->fbi.screen_base = - (void *)msg_setup->allocate_buffer.body.resp.fb_address; + info->fbi.screen_base = phys_to_virt(buffer_addr); info->fbi.xres = msg_setup->physical_w_h.body.resp.width; info->fbi.yres = msg_setup->physical_w_h.body.resp.height; info->fbi.bits_per_pixel = 16; |