diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-08-23 11:43:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-08-23 11:43:53 +1000 |
| commit | cf3627fb1af183dc385022029c4b5232f6eb715c (patch) | |
| tree | abb3cd73aa35007168878412eca76e93aaa1f322 /drivers/gpu/drm/arm/display/komeda/komeda_dev.c | |
| parent | dd89c1127f808eff5b09f971758b1095d839b1a4 (diff) | |
| parent | 63daf4e166545363f3b875f5b81aecb46e1e1d19 (diff) | |
| download | linux-cf3627fb1af183dc385022029c4b5232f6eb715c.tar.bz2 | |
Merge tag 'drm-misc-fixes-2019-08-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Fixes for v5.3-rc6:
- dma fix for omap.
- Make output polling work on komeda.
- Fix bpp computing for AFBC formats in komeda.
- Support the memory-region property in komeda.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5f1fdfe3-814e-fad1-663c-7279217fc085@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/arm/display/komeda/komeda_dev.c')
| -rw-r--r-- | drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c index 5a118984de33..a0eabc134dd6 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c @@ -8,6 +8,7 @@ #include <linux/iommu.h> #include <linux/of_device.h> #include <linux/of_graph.h> +#include <linux/of_reserved_mem.h> #include <linux/platform_device.h> #include <linux/dma-mapping.h> #ifdef CONFIG_DEBUG_FS @@ -143,6 +144,12 @@ static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev) return mdev->irq; } + /* Get the optional framebuffer memory resource */ + ret = of_reserved_mem_device_init(dev); + if (ret && ret != -ENODEV) + return ret; + ret = 0; + for_each_available_child_of_node(np, child) { if (of_node_cmp(child->name, "pipeline") == 0) { ret = komeda_parse_pipe_dt(mdev, child); @@ -289,6 +296,8 @@ void komeda_dev_destroy(struct komeda_dev *mdev) mdev->n_pipelines = 0; + of_reserved_mem_device_release(dev); + if (funcs && funcs->cleanup) funcs->cleanup(mdev); |