| Message ID | 1326483687-458-1-git-send-email-rob.clark@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Fri, Jan 13, 2012 at 1:41 PM, Rob Clark <rob.clark@linaro.org> wrote: > From: Rob Clark <rob@ti.com> > > Register OMAP DRM/KMS platform device, and reserve a CMA region for > the device to use for buffer allocation. > > Signed-off-by: Rob Clark <rob@ti.com> > --- > arch/arm/plat-omap/Makefile | 2 +- > arch/arm/plat-omap/common.c | 2 + > arch/arm/plat-omap/drm.c | 88 +++++++++++++++++++++++++++++++++++++++++++ > arch/arm/plat-omap/drm.h | 37 ++++++++++++++++++ > 4 files changed, 128 insertions(+), 1 deletions(-) > create mode 100644 arch/arm/plat-omap/drm.c > create mode 100644 arch/arm/plat-omap/drm.h > > diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile > index 9a58461..b86e6cb 100644 > --- a/arch/arm/plat-omap/Makefile > +++ b/arch/arm/plat-omap/Makefile > @@ -4,7 +4,7 @@ > > # Common support > obj-y := common.o sram.o clock.o devices.o dma.o mux.o \ > - usb.o fb.o counter_32k.o > + usb.o fb.o counter_32k.o drm.o > obj-m := > obj-n := > obj- := > diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c > index 06383b5..caf6082 100644 > --- a/arch/arm/plat-omap/common.c > +++ b/arch/arm/plat-omap/common.c > @@ -24,6 +24,7 @@ > > #include <plat/omap-secure.h> > > +#include "drm.h" > > #define NO_LENGTH_CHECK 0xffffffff > > @@ -65,6 +66,7 @@ const void *__init omap_get_var_config(u16 tag, size_t *len) > > void __init omap_reserve(void) > { > + omapdrm_reserve_vram(); > omapfb_reserve_sdram_memblock(); > omap_vram_reserve_sdram_memblock(); > omap_dsp_reserve_sdram_memblock(); > diff --git a/arch/arm/plat-omap/drm.c b/arch/arm/plat-omap/drm.c > new file mode 100644 > index 0000000..5d8588f > --- /dev/null > +++ b/arch/arm/plat-omap/drm.c > @@ -0,0 +1,88 @@ > +/* > + * File: arch/arm/plat-omap/drm.c > + * > + * DRM/KMS device registration for TI OMAP platforms > + * > + * Copyright (C) 2011 Texas Instruments > + * Author: Rob Clark <rob.clark@linaro.org> > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License version 2 as published by > + * the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + * > + * You should have received a copy of the GNU General Public License along with > + * this program. If not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include <linux/module.h> > +#include <linux/kernel.h> > +#include <linux/mm.h> > +#include <linux/init.h> > +#include <linux/platform_device.h> > +#include <linux/dma-mapping.h> > +#ifdef CONFIG_CMA > +# include <linux/dma-contiguous.h> > +#endif > + > +#include <plat/omap_device.h> > +#include <plat/omap_hwmod.h> > + > +#include "drm.h" > + > +/* files from staging that contain platform data structure definitions */ > +#include "../../../drivers/staging/omapdrm/omap_priv.h" > +#include "../../../drivers/staging/omapdrm/omap_dmm_tiler.h" btw, I'm not a huge fan of doing #includes this way, so if someone has a better suggestion (given that staging drivers should not have headers outside of drivers/staging) please let me know BR, -R > +#if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE) > + > +static struct omap_drm_platform_data omapdrm_platdata; > +static struct omap_dmm_platform_data dmm_platdata; > + > +static struct platform_device omap_drm_device = { > + .dev = { > + .coherent_dma_mask = DMA_BIT_MASK(32), > + .platform_data = &omapdrm_platdata, > + }, > + .name = "omapdrm", > + .id = 0, > +}; > + > +static int __init omap_init_gpu(void) > +{ > + struct omap_hwmod *oh = NULL; > + > + /* lookup and populate the DMM information, if present - OMAP4+ */ > + oh = omap_hwmod_lookup("dmm"); > + > + if (oh) { > + dmm_platdata.base = omap_hwmod_get_mpu_rt_va(oh); > + dmm_platdata.irq = oh->mpu_irqs[0].irq; > + > + if (dmm_platdata.base) > + omapdrm_platdata.dmm_pdata = &dmm_platdata; > + } > + > + return platform_device_register(&omap_drm_device); > +} > + > +arch_initcall(omap_init_gpu); > + > +void omapdrm_reserve_vram(void) > +{ > +#ifdef CONFIG_CMA > + /* Create private 32MiB contiguous memory area for omapdrm.0 device > + * TODO revisit size.. if uc/wc buffers are allocated from CMA pages > + * then the amount of memory we need goes up.. > + */ > + dma_declare_contiguous(&omap_drm_device.dev, 32*SZ_1M, 0, 0); > +#else > +# warning "CMA is not enabled, there may be limitations about scanout buffer allocations on OMAP3 and earlier" > +#endif > +} > + > +#endif > diff --git a/arch/arm/plat-omap/drm.h b/arch/arm/plat-omap/drm.h > new file mode 100644 > index 0000000..56e0c0e > --- /dev/null > +++ b/arch/arm/plat-omap/drm.h > @@ -0,0 +1,37 @@ > +/* > + * File: arch/arm/plat-omap/drm.c > + * > + * DRM/KMS device registration for TI OMAP platforms > + * > + * Copyright (C) 2011 Texas Instruments > + * Author: Rob Clark <rob.clark@linaro.org> > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License version 2 as published by > + * the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + * > + * You should have received a copy of the GNU General Public License along with > + * this program. If not, see <http://www.gnu.org/licenses/>. > + */ > + > +#ifndef __PLAT_OMAP_DRM_H__ > +#define __PLAT_OMAP_DRM_H__ > + > +#if defined(CONFIG_DRM_OMAP) || defined(CONFIG_DRM_OMAP_MODULE) > + > +void omapdrm_reserve_vram(void); > + > +#else > + > +static inline void omapdrm_reserve_vram(void) > +{ > +} > + > +#endif > + > +#endif /* __PLAT_OMAP_DRM_H__ */ > -- > 1.7.5.4 >
On Fri, Jan 13, 2012 at 9:46 PM, Rob Clark <rob@ti.com> wrote: > On Fri, Jan 13, 2012 at 1:41 PM, Rob Clark <rob.clark@linaro.org> wrote: >> +/* files from staging that contain platform data structure definitions */ >> +#include "../../../drivers/staging/omapdrm/omap_priv.h" >> +#include "../../../drivers/staging/omapdrm/omap_dmm_tiler.h" > > btw, I'm not a huge fan of doing #includes this way, so if someone has > a better suggestion (given that staging drivers should not have > headers outside of drivers/staging) please let me know Move those structs to /arch/arm/plat-omap/drm.h?
Hi Rob, Minor nitpicks. On Fri, Jan 13, 2012 at 1:41 PM, Rob Clark <rob.clark@linaro.org> wrote: > From: Rob Clark <rob@ti.com> > > Register OMAP DRM/KMS platform device, and reserve a CMA region for > the device to use for buffer allocation. > > Signed-off-by: Rob Clark <rob@ti.com> > --- > arch/arm/plat-omap/Makefile | 2 +- > arch/arm/plat-omap/common.c | 2 + > arch/arm/plat-omap/drm.c | 88 +++++++++++++++++++++++++++++++++++++++++++ > arch/arm/plat-omap/drm.h | 37 ++++++++++++++++++ > 4 files changed, 128 insertions(+), 1 deletions(-) > create mode 100644 arch/arm/plat-omap/drm.c > create mode 100644 arch/arm/plat-omap/drm.h > > diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile > index 9a58461..b86e6cb 100644 > --- a/arch/arm/plat-omap/Makefile > +++ b/arch/arm/plat-omap/Makefile > @@ -4,7 +4,7 @@ > > # Common support > obj-y := common.o sram.o clock.o devices.o dma.o mux.o \ > - usb.o fb.o counter_32k.o > + usb.o fb.o counter_32k.o drm.o > obj-m := > obj-n := > obj- := > diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c > index 06383b5..caf6082 100644 > --- a/arch/arm/plat-omap/common.c > +++ b/arch/arm/plat-omap/common.c > @@ -24,6 +24,7 @@ > > #include <plat/omap-secure.h> > > +#include "drm.h" > > #define NO_LENGTH_CHECK 0xffffffff > > @@ -65,6 +66,7 @@ const void *__init omap_get_var_config(u16 tag, size_t *len) > > void __init omap_reserve(void) > { > + omapdrm_reserve_vram(); > omapfb_reserve_sdram_memblock(); > omap_vram_reserve_sdram_memblock(); > omap_dsp_reserve_sdram_memblock(); > diff --git a/arch/arm/plat-omap/drm.c b/arch/arm/plat-omap/drm.c > new file mode 100644 > index 0000000..5d8588f > --- /dev/null > +++ b/arch/arm/plat-omap/drm.c > @@ -0,0 +1,88 @@ > +/* > + * File: arch/arm/plat-omap/drm.c I believe keeping a file path is frowned upon. > + * > + * DRM/KMS device registration for TI OMAP platforms > + * > + * Copyright (C) 2011 Texas Instruments Happy new year! (2012?) :) > + * Author: Rob Clark <rob.clark@linaro.org> > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License version 2 as published by > + * the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + * > + * You should have received a copy of the GNU General Public License along with > + * this program. If not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include <linux/module.h> > +#include <linux/kernel.h> > +#include <linux/mm.h> > +#include <linux/init.h> > +#include <linux/platform_device.h> > +#include <linux/dma-mapping.h> > +#ifdef CONFIG_CMA > +# include <linux/dma-contiguous.h> > +#endif > + > +#include <plat/omap_device.h> > +#include <plat/omap_hwmod.h> > + > +#include "drm.h" > + > +/* files from staging that contain platform data structure definitions */ > +#include "../../../drivers/staging/omapdrm/omap_priv.h" > +#include "../../../drivers/staging/omapdrm/omap_dmm_tiler.h" > + > +#if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE) > + > +static struct omap_drm_platform_data omapdrm_platdata; > +static struct omap_dmm_platform_data dmm_platdata; > + > +static struct platform_device omap_drm_device = { > + .dev = { > + .coherent_dma_mask = DMA_BIT_MASK(32), > + .platform_data = &omapdrm_platdata, > + }, > + .name = "omapdrm", > + .id = 0, > +}; > + > +static int __init omap_init_gpu(void) > +{ > + struct omap_hwmod *oh = NULL; > + > + /* lookup and populate the DMM information, if present - OMAP4+ */ > + oh = omap_hwmod_lookup("dmm"); > + > + if (oh) { > + dmm_platdata.base = omap_hwmod_get_mpu_rt_va(oh); > + dmm_platdata.irq = oh->mpu_irqs[0].irq; > + > + if (dmm_platdata.base) > + omapdrm_platdata.dmm_pdata = &dmm_platdata; > + } > + > + return platform_device_register(&omap_drm_device); > +} > + > +arch_initcall(omap_init_gpu); > + > +void omapdrm_reserve_vram(void) > +{ > +#ifdef CONFIG_CMA > + /* Create private 32MiB contiguous memory area for omapdrm.0 device > + * TODO revisit size.. if uc/wc buffers are allocated from CMA pages > + * then the amount of memory we need goes up.. > + */ > + dma_declare_contiguous(&omap_drm_device.dev, 32*SZ_1M, 0, 0); > +#else > +# warning "CMA is not enabled, there may be limitations about scanout buffer allocations on OMAP3 and earlier" > +#endif > +} > + > +#endif > diff --git a/arch/arm/plat-omap/drm.h b/arch/arm/plat-omap/drm.h > new file mode 100644 > index 0000000..56e0c0e > --- /dev/null > +++ b/arch/arm/plat-omap/drm.h > @@ -0,0 +1,37 @@ > +/* > + * File: arch/arm/plat-omap/drm.c Again here. (The path is incorrect anyways) > + * > + * DRM/KMS device registration for TI OMAP platforms > + * > + * Copyright (C) 2011 Texas Instruments 2012 also here. > + * Author: Rob Clark <rob.clark@linaro.org> > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License version 2 as published by > + * the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + * > + * You should have received a copy of the GNU General Public License along with > + * this program. If not, see <http://www.gnu.org/licenses/>. > + */ > + > +#ifndef __PLAT_OMAP_DRM_H__ > +#define __PLAT_OMAP_DRM_H__ > + > +#if defined(CONFIG_DRM_OMAP) || defined(CONFIG_DRM_OMAP_MODULE) > + > +void omapdrm_reserve_vram(void); > + > +#else > + > +static inline void omapdrm_reserve_vram(void) > +{ > +} > + > +#endif > + > +#endif /* __PLAT_OMAP_DRM_H__ */ > -- > 1.7.5.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jan 13, 2012 at 1:49 PM, Felipe Contreras <felipe.contreras@gmail.com> wrote: > On Fri, Jan 13, 2012 at 9:46 PM, Rob Clark <rob@ti.com> wrote: >> On Fri, Jan 13, 2012 at 1:41 PM, Rob Clark <rob.clark@linaro.org> wrote: >>> +/* files from staging that contain platform data structure definitions */ >>> +#include "../../../drivers/staging/omapdrm/omap_priv.h" >>> +#include "../../../drivers/staging/omapdrm/omap_dmm_tiler.h" >> >> btw, I'm not a huge fan of doing #includes this way, so if someone has >> a better suggestion (given that staging drivers should not have >> headers outside of drivers/staging) please let me know > > Move those structs to /arch/arm/plat-omap/drm.h? Can I do that? Maybe it depends of if you consider those structs as part of the driver, or part of the platform? I guess that looks like how it was handled for dspbridge, so maybe that means it is a suitable precedent.. BR, -R > -- > Felipe Contreras > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jan 13, 2012 at 1:51 PM, Aguirre, Sergio <saaguirre@ti.com> wrote: >> + * >> + * DRM/KMS device registration for TI OMAP platforms >> + * >> + * Copyright (C) 2011 Texas Instruments > > Happy new year! (2012?) :) well, the patch did start life last year.. I can update these ;-) BR, -R
On Fri, Jan 13, 2012 at 9:53 PM, Rob Clark <rob@ti.com> wrote: > On Fri, Jan 13, 2012 at 1:49 PM, Felipe Contreras > <felipe.contreras@gmail.com> wrote: >> On Fri, Jan 13, 2012 at 9:46 PM, Rob Clark <rob@ti.com> wrote: >>> On Fri, Jan 13, 2012 at 1:41 PM, Rob Clark <rob.clark@linaro.org> wrote: >>>> +/* files from staging that contain platform data structure definitions */ >>>> +#include "../../../drivers/staging/omapdrm/omap_priv.h" >>>> +#include "../../../drivers/staging/omapdrm/omap_dmm_tiler.h" >>> >>> btw, I'm not a huge fan of doing #includes this way, so if someone has >>> a better suggestion (given that staging drivers should not have >>> headers outside of drivers/staging) please let me know >> >> Move those structs to /arch/arm/plat-omap/drm.h? > > Can I do that? Maybe it depends of if you consider those structs as > part of the driver, or part of the platform? Why not? The platform is using them in arch/arm/plat-omap/drm.c. > I guess that looks like how it was handled for dspbridge, so maybe > that means it is a suitable precedent.. Indeed, the way I see it is this: imagine there's another driver in staging (or maybe even out of tree), that requires this data. It would simply include plat-omap/drm.h to fill this. OK, this is pretty far-fetched, but demonstrates the point: platform data should be completely independent of the drivers. Cheers.
On Fri, Jan 13, 2012 at 2:23 PM, Felipe Contreras <felipe.contreras@gmail.com> wrote: > On Fri, Jan 13, 2012 at 9:53 PM, Rob Clark <rob@ti.com> wrote: >> On Fri, Jan 13, 2012 at 1:49 PM, Felipe Contreras >> <felipe.contreras@gmail.com> wrote: >>> On Fri, Jan 13, 2012 at 9:46 PM, Rob Clark <rob@ti.com> wrote: >>>> On Fri, Jan 13, 2012 at 1:41 PM, Rob Clark <rob.clark@linaro.org> wrote: >>>>> +/* files from staging that contain platform data structure definitions */ >>>>> +#include "../../../drivers/staging/omapdrm/omap_priv.h" >>>>> +#include "../../../drivers/staging/omapdrm/omap_dmm_tiler.h" >>>> >>>> btw, I'm not a huge fan of doing #includes this way, so if someone has >>>> a better suggestion (given that staging drivers should not have >>>> headers outside of drivers/staging) please let me know >>> >>> Move those structs to /arch/arm/plat-omap/drm.h? >> >> Can I do that? Maybe it depends of if you consider those structs as >> part of the driver, or part of the platform? > > Why not? The platform is using them in arch/arm/plat-omap/drm.c. > >> I guess that looks like how it was handled for dspbridge, so maybe >> that means it is a suitable precedent.. > > Indeed, the way I see it is this: imagine there's another driver in > staging (or maybe even out of tree), that requires this data. It would > simply include plat-omap/drm.h to fill this. OK, this is pretty > far-fetched, but demonstrates the point: platform data should be > completely independent of the drivers. yeah, makes sense.. I'm about to send v2 of this patch. BR, -R > Cheers. > > -- > Felipe Contreras > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jan 13, 2012 at 9:41 PM, Rob Clark <rob.clark@linaro.org> wrote: > +void omapdrm_reserve_vram(void) > +{ > +#ifdef CONFIG_CMA > + /* Create private 32MiB contiguous memory area for omapdrm.0 device > + * TODO revisit size.. if uc/wc buffers are allocated from CMA pages > + * then the amount of memory we need goes up.. > + */ /* * Foo. */ > + dma_declare_contiguous(&omap_drm_device.dev, 32*SZ_1M, 0, 0); 32 * SZ1_M > +#else > +# warning "CMA is not enabled, there may be limitations about scanout buffer allocations on OMAP3 and earlier" > +#endif > +} > + > +#endif > diff --git a/arch/arm/plat-omap/drm.h b/arch/arm/plat-omap/drm.h > new file mode 100644 > index 0000000..56e0c0e > --- /dev/null > +++ b/arch/arm/plat-omap/drm.h Maybe this should go to include/plat > +#ifndef __PLAT_OMAP_DRM_H__ > +#define __PLAT_OMAP_DRM_H__ I see a lot of headers using this form: __ARCH_OMAP_FOO_H Cheers.
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index 9a58461..b86e6cb 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -4,7 +4,7 @@ # Common support obj-y := common.o sram.o clock.o devices.o dma.o mux.o \ - usb.o fb.o counter_32k.o + usb.o fb.o counter_32k.o drm.o obj-m := obj-n := obj- := diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 06383b5..caf6082 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -24,6 +24,7 @@ #include <plat/omap-secure.h> +#include "drm.h" #define NO_LENGTH_CHECK 0xffffffff @@ -65,6 +66,7 @@ const void *__init omap_get_var_config(u16 tag, size_t *len) void __init omap_reserve(void) { + omapdrm_reserve_vram(); omapfb_reserve_sdram_memblock(); omap_vram_reserve_sdram_memblock(); omap_dsp_reserve_sdram_memblock(); diff --git a/arch/arm/plat-omap/drm.c b/arch/arm/plat-omap/drm.c new file mode 100644 index 0000000..5d8588f --- /dev/null +++ b/arch/arm/plat-omap/drm.c @@ -0,0 +1,88 @@ +/* + * File: arch/arm/plat-omap/drm.c + * + * DRM/KMS device registration for TI OMAP platforms + * + * Copyright (C) 2011 Texas Instruments + * Author: Rob Clark <rob.clark@linaro.org> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/mm.h> +#include <linux/init.h> +#include <linux/platform_device.h> +#include <linux/dma-mapping.h> +#ifdef CONFIG_CMA +# include <linux/dma-contiguous.h> +#endif + +#include <plat/omap_device.h> +#include <plat/omap_hwmod.h> + +#include "drm.h" + +/* files from staging that contain platform data structure definitions */ +#include "../../../drivers/staging/omapdrm/omap_priv.h" +#include "../../../drivers/staging/omapdrm/omap_dmm_tiler.h" + +#if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE) + +static struct omap_drm_platform_data omapdrm_platdata; +static struct omap_dmm_platform_data dmm_platdata; + +static struct platform_device omap_drm_device = { + .dev = { + .coherent_dma_mask = DMA_BIT_MASK(32), + .platform_data = &omapdrm_platdata, + }, + .name = "omapdrm", + .id = 0, +}; + +static int __init omap_init_gpu(void) +{ + struct omap_hwmod *oh = NULL; + + /* lookup and populate the DMM information, if present - OMAP4+ */ + oh = omap_hwmod_lookup("dmm"); + + if (oh) { + dmm_platdata.base = omap_hwmod_get_mpu_rt_va(oh); + dmm_platdata.irq = oh->mpu_irqs[0].irq; + + if (dmm_platdata.base) + omapdrm_platdata.dmm_pdata = &dmm_platdata; + } + + return platform_device_register(&omap_drm_device); +} + +arch_initcall(omap_init_gpu); + +void omapdrm_reserve_vram(void) +{ +#ifdef CONFIG_CMA + /* Create private 32MiB contiguous memory area for omapdrm.0 device + * TODO revisit size.. if uc/wc buffers are allocated from CMA pages + * then the amount of memory we need goes up.. + */ + dma_declare_contiguous(&omap_drm_device.dev, 32*SZ_1M, 0, 0); +#else +# warning "CMA is not enabled, there may be limitations about scanout buffer allocations on OMAP3 and earlier" +#endif +} + +#endif diff --git a/arch/arm/plat-omap/drm.h b/arch/arm/plat-omap/drm.h new file mode 100644 index 0000000..56e0c0e --- /dev/null +++ b/arch/arm/plat-omap/drm.h @@ -0,0 +1,37 @@ +/* + * File: arch/arm/plat-omap/drm.c + * + * DRM/KMS device registration for TI OMAP platforms + * + * Copyright (C) 2011 Texas Instruments + * Author: Rob Clark <rob.clark@linaro.org> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __PLAT_OMAP_DRM_H__ +#define __PLAT_OMAP_DRM_H__ + +#if defined(CONFIG_DRM_OMAP) || defined(CONFIG_DRM_OMAP_MODULE) + +void omapdrm_reserve_vram(void); + +#else + +static inline void omapdrm_reserve_vram(void) +{ +} + +#endif + +#endif /* __PLAT_OMAP_DRM_H__ */