| Message ID | 7d079362-3881-6890-3e1f-71aeee06f4fc@xs4all.nl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mach-omap2/devices.c: set dma mask | expand |
On 7/30/19 8:17 AM, Hans Verkuil wrote: > The dma_mask and coherent_dma_mask values were never set. > > This prevented the media omap_vout driver from loading successfully. > > Tested on a Pandaboard and Beagle XM board. > > Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Tony, can you pick this up? Or give an Ack so that it can be merged via the media subsystem if you prefer? Regards, Hans > --- > arch/arm/mach-omap2/devices.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > index cc0d08dad141..5a2e198e7db1 100644 > --- a/arch/arm/mach-omap2/devices.c > +++ b/arch/arm/mach-omap2/devices.c > @@ -10,6 +10,7 @@ > #include <linux/platform_device.h> > #include <linux/io.h> > #include <linux/clk.h> > +#include <linux/dma-mapping.h> > #include <linux/err.h> > #include <linux/slab.h> > #include <linux/of.h> > @@ -43,11 +44,17 @@ static struct resource omap_vout_resource[2] = { > }; > #endif > > +static u64 omap_vout_dma_mask = DMA_BIT_MASK(32); > + > static struct platform_device omap_vout_device = { > .name = "omap_vout", > .num_resources = ARRAY_SIZE(omap_vout_resource), > .resource = &omap_vout_resource[0], > .id = -1, > + .dev = { > + .dma_mask = &omap_vout_dma_mask, > + .coherent_dma_mask = DMA_BIT_MASK(32), > + }, > }; > > int __init omap_init_vout(void) >
* Hans Verkuil <hverkuil@xs4all.nl> [190812 12:50]: > On 7/30/19 8:17 AM, Hans Verkuil wrote: > > The dma_mask and coherent_dma_mask values were never set. > > > > This prevented the media omap_vout driver from loading successfully. > > > > Tested on a Pandaboard and Beagle XM board. > > > > Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> > > Tony, can you pick this up? Or give an Ack so that it can be merged via > the media subsystem if you prefer? Sorry for the delays on this one. Please just merge it via via the media susbsystem since you need it: Acked-by: Tony Lindgren <tony@atomide.com> > > --- > > arch/arm/mach-omap2/devices.c | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > > index cc0d08dad141..5a2e198e7db1 100644 > > --- a/arch/arm/mach-omap2/devices.c > > +++ b/arch/arm/mach-omap2/devices.c > > @@ -10,6 +10,7 @@ > > #include <linux/platform_device.h> > > #include <linux/io.h> > > #include <linux/clk.h> > > +#include <linux/dma-mapping.h> > > #include <linux/err.h> > > #include <linux/slab.h> > > #include <linux/of.h> > > @@ -43,11 +44,17 @@ static struct resource omap_vout_resource[2] = { > > }; > > #endif > > > > +static u64 omap_vout_dma_mask = DMA_BIT_MASK(32); > > + > > static struct platform_device omap_vout_device = { > > .name = "omap_vout", > > .num_resources = ARRAY_SIZE(omap_vout_resource), > > .resource = &omap_vout_resource[0], > > .id = -1, > > + .dev = { > > + .dma_mask = &omap_vout_dma_mask, > > + .coherent_dma_mask = DMA_BIT_MASK(32), > > + }, > > }; > > > > int __init omap_init_vout(void) > > >
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index cc0d08dad141..5a2e198e7db1 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -10,6 +10,7 @@ #include <linux/platform_device.h> #include <linux/io.h> #include <linux/clk.h> +#include <linux/dma-mapping.h> #include <linux/err.h> #include <linux/slab.h> #include <linux/of.h> @@ -43,11 +44,17 @@ static struct resource omap_vout_resource[2] = { }; #endif +static u64 omap_vout_dma_mask = DMA_BIT_MASK(32); + static struct platform_device omap_vout_device = { .name = "omap_vout", .num_resources = ARRAY_SIZE(omap_vout_resource), .resource = &omap_vout_resource[0], .id = -1, + .dev = { + .dma_mask = &omap_vout_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, }; int __init omap_init_vout(void)
The dma_mask and coherent_dma_mask values were never set. This prevented the media omap_vout driver from loading successfully. Tested on a Pandaboard and Beagle XM board. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> --- arch/arm/mach-omap2/devices.c | 7 +++++++ 1 file changed, 7 insertions(+)