Linaro-mm-sig

linaro-mm-sig@lists.linaro.org

15 participants
3030 discussions

[PATCH] cma: increase CMA_ALIGNMENT upper limit to 12

by Marc Carino

Certain platforms contain peripherals which have contiguous memory alignment requirements, necessitating the use of the alignment argument when obtaining CMA memory. The current default maximum CMA_ALIGNMENT of order 9 translates into a 1MB alignment on systems with a 4K page size. To accommodate systems with peripherals with even larger alignment requirements, increase the upper-bound of CMA_ALIGNMENT from order 9 to order 12. Marc Carino (1): cma: increase CMA_ALIGNMENT upper limit to 12 drivers/base/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1

11 years, 4 months

[PATCH v1 00/19] Add DRM for stih4xx platforms

by Benjamin Gaignard

This series of patches add the support of DRM/KMS drivers for STMicroelectronics chipsets stih416 and stih407. Hardware is split in two main blocks: Compositor and TVout. Each of them includes specific hardware IPs and the display timing are controlled by a specific Video Timing Generator hardware IP (VTG). Compositor is made of the follow hardware IPs: - GDP (Generic Display Pipeline) which is an entry point for graphic (RGB) buffers - VDP (Video Diplay Pipeline) which is an entry point for video (YUV) buffers - HQVDP (High Quality Video Display Processor) that supports scaling, deinterlacing and some miscellaneous image quality improvements. It fetches the Video decoded buffers from memory, processes them and pushes them to the Compositor through a HW dedicated bus. - Mixer is responsible of mixing all the entries depending of their respective z-order and layout TVout is divided in 3 parts: - HDMI to generate HDMI signals, depending of chipset version HDMI phy can change. - HDA to generate signals for HD analog TV - VIP to control/switch data path coming from Compositor On stih416 compositor and Tvout are on different dies so a Video Trafic Advance inter-die Communication mechanism (VTAC) is needed. +---------------------------------------------+ +----------------------------------------+ | +-------------------------------+ +----+ | | +----+ +--------------------------+ | | | | | | | | | | | +---------+ +----+ | | | | +----+ +------+ | | | | | | | | | VIP |---->|HDMI| | | | | |GPD +------------->| | | | | | | | | | | | +----+ | | | | +----+ |Mixer |--|-->| | | | | |---|->| switcher| | | | | | | | | | | | | | | | | +----+ | | | | | | | | | | | | | | | |---->|HDA | | | | | +------+ | |VTAC|========>|VTAC| | +---------+ +----+ | | | | | | | | | | | | | | | | Compositor | | | | | | | | TVout | | | +-------------------------------+ | | | | | | +--------------------------+ | | ^ | | | | | | ^ | | | | | | | | | | | | +--------------+ | | | | | | +-------------+ | | | VTG (master) |----->| | | | | |----->| VTG (slave) | | | +--------------+ +----+ | | +----+ +-------------+ | |Digital die | | Analog Die| +---------------------------------------------+ +----------------------------------------+ On stih407 Compositor and Tvout are on the same die +-----------------------------------------------------------------+ | +-------------------------------+ +--------------------------+ | | | | | +---------+ +----+ | | | | +----+ +------+ | | | VIP |---->|HDMI| | | | | |GPD +------------->| | | | | | +----+ | | | | +----+ |Mixer |--|--|->| switcher| | | | | +----+ +-----+ | | | | | | +----+ | | | | |VDP +-->+HQVDP+--->| | | | | |---->|HDA | | | | | +----+ +-----+ +------+ | | +---------+ +----+ | | | | | | | | | | Compositor | | TVout | | | +-------------------------------+ +--------------------------+ | | ^ ^ | | | | | | +--------------+ | | | VTG | | | +--------------+ | |Digital die | +-----------------------------------------------------------------+ In addition of the drivers for the IPs listed before a thin I2C driver (hdmiddc) is used by HDMI driver to retrieve EDID for monitor. To unify interfaces of GDP and VDP we create a "layer" interface called by compositor to control both GPD and VDP. Hardware have memory contraints (alignment, contiguous) so we use CMA drm helpers functions to allocate frame buffer. File naming convention is: - sti_* for IPs drivers - sti_drm_* for drm functions implementation. Benjamin Gaignard (18): drm: sti: add bindings for DRM driver drm: sti: add VTG driver drm: sti: add VTAC drivers drm: sti: add HDMI driver drm: sti: add I2C client driver for HDMI drm: sti: add HDA driver drm: sti: add TVOut driver drm: sti: add sti layer interface definition drm: sti: add GDP layer drm: sti: add VID layer drm: sti: add Mixer drm: sti: add Compositor drm: sti: add debug to GDP drm: sti: add debug to VID drm: sti: add debug to TVout drm: sti: add debug to mixer drm: sti: Add DRM driver itself drm: sti: add HQVDP driver Vincent Abriou (1): drm: sti: rename mixer registers to be main/aux independent .../devicetree/bindings/gpu/st,stih4xx.txt | 177 ++++ drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/sti/Kconfig | 26 + drivers/gpu/drm/sti/Makefile | 23 + drivers/gpu/drm/sti/sti_compositor.c | 189 ++++ drivers/gpu/drm/sti/sti_compositor.h | 84 ++ drivers/gpu/drm/sti/sti_ddc.c | 56 + drivers/gpu/drm/sti/sti_drm_connector.c | 195 ++++ drivers/gpu/drm/sti/sti_drm_connector.h | 16 + drivers/gpu/drm/sti/sti_drm_crtc.c | 440 ++++++++ drivers/gpu/drm/sti/sti_drm_crtc.h | 21 + drivers/gpu/drm/sti/sti_drm_drv.c | 484 +++++++++ drivers/gpu/drm/sti/sti_drm_drv.h | 48 + drivers/gpu/drm/sti/sti_drm_encoder.c | 201 ++++ drivers/gpu/drm/sti/sti_drm_encoder.h | 16 + drivers/gpu/drm/sti/sti_drm_plane.c | 195 ++++ drivers/gpu/drm/sti/sti_drm_plane.h | 16 + drivers/gpu/drm/sti/sti_gdp.c | 726 +++++++++++++ drivers/gpu/drm/sti/sti_gdp.h | 75 ++ drivers/gpu/drm/sti/sti_hda.c | 826 +++++++++++++++ drivers/gpu/drm/sti/sti_hda.h | 14 + drivers/gpu/drm/sti/sti_hdmi.c | 1045 +++++++++++++++++++ drivers/gpu/drm/sti/sti_hdmi.h | 198 ++++ drivers/gpu/drm/sti/sti_hdmi_tx3g0c55phy.c | 398 +++++++ drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.c | 224 ++++ drivers/gpu/drm/sti/sti_hqvdp.c | 1089 ++++++++++++++++++++ drivers/gpu/drm/sti/sti_hqvdp.h | 55 + drivers/gpu/drm/sti/sti_hqvdp_lut.h | 373 +++++++ drivers/gpu/drm/sti/sti_layer.c | 324 ++++++ drivers/gpu/drm/sti/sti_layer.h | 116 +++ drivers/gpu/drm/sti/sti_mixer.c | 405 ++++++++ drivers/gpu/drm/sti/sti_mixer.h | 54 + drivers/gpu/drm/sti/sti_tvout.c | 863 ++++++++++++++++ drivers/gpu/drm/sti/sti_tvout.h | 105 ++ drivers/gpu/drm/sti/sti_vid.c | 259 +++++ drivers/gpu/drm/sti/sti_vid.h | 34 + drivers/gpu/drm/sti/sti_vtac_rx.c | 140 +++ drivers/gpu/drm/sti/sti_vtac_tx.c | 152 +++ drivers/gpu/drm/sti/sti_vtac_utils.h | 52 + drivers/gpu/drm/sti/sti_vtg.c | 438 ++++++++ drivers/gpu/drm/sti/sti_vtg.h | 20 + drivers/gpu/drm/sti/sti_vtg_utils.c | 99 ++ drivers/gpu/drm/sti/sti_vtg_utils.h | 29 + 44 files changed, 10303 insertions(+) create mode 100644 Documentation/devicetree/bindings/gpu/st,stih4xx.txt create mode 100644 drivers/gpu/drm/sti/Kconfig create mode 100644 drivers/gpu/drm/sti/Makefile create mode 100644 drivers/gpu/drm/sti/sti_compositor.c create mode 100644 drivers/gpu/drm/sti/sti_compositor.h create mode 100644 drivers/gpu/drm/sti/sti_ddc.c create mode 100644 drivers/gpu/drm/sti/sti_drm_connector.c create mode 100644 drivers/gpu/drm/sti/sti_drm_connector.h create mode 100644 drivers/gpu/drm/sti/sti_drm_crtc.c create mode 100644 drivers/gpu/drm/sti/sti_drm_crtc.h create mode 100644 drivers/gpu/drm/sti/sti_drm_drv.c create mode 100644 drivers/gpu/drm/sti/sti_drm_drv.h create mode 100644 drivers/gpu/drm/sti/sti_drm_encoder.c create mode 100644 drivers/gpu/drm/sti/sti_drm_encoder.h create mode 100644 drivers/gpu/drm/sti/sti_drm_plane.c create mode 100644 drivers/gpu/drm/sti/sti_drm_plane.h create mode 100644 drivers/gpu/drm/sti/sti_gdp.c create mode 100644 drivers/gpu/drm/sti/sti_gdp.h create mode 100644 drivers/gpu/drm/sti/sti_hda.c create mode 100644 drivers/gpu/drm/sti/sti_hda.h create mode 100644 drivers/gpu/drm/sti/sti_hdmi.c create mode 100644 drivers/gpu/drm/sti/sti_hdmi.h create mode 100644 drivers/gpu/drm/sti/sti_hdmi_tx3g0c55phy.c create mode 100644 drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.c create mode 100644 drivers/gpu/drm/sti/sti_hqvdp.c create mode 100644 drivers/gpu/drm/sti/sti_hqvdp.h create mode 100644 drivers/gpu/drm/sti/sti_hqvdp_lut.h create mode 100644 drivers/gpu/drm/sti/sti_layer.c create mode 100644 drivers/gpu/drm/sti/sti_layer.h create mode 100644 drivers/gpu/drm/sti/sti_mixer.c create mode 100644 drivers/gpu/drm/sti/sti_mixer.h create mode 100644 drivers/gpu/drm/sti/sti_tvout.c create mode 100644 drivers/gpu/drm/sti/sti_tvout.h create mode 100644 drivers/gpu/drm/sti/sti_vid.c create mode 100644 drivers/gpu/drm/sti/sti_vid.h create mode 100644 drivers/gpu/drm/sti/sti_vtac_rx.c create mode 100644 drivers/gpu/drm/sti/sti_vtac_tx.c create mode 100644 drivers/gpu/drm/sti/sti_vtac_utils.h create mode 100644 drivers/gpu/drm/sti/sti_vtg.c create mode 100644 drivers/gpu/drm/sti/sti_vtg.h create mode 100644 drivers/gpu/drm/sti/sti_vtg_utils.c create mode 100644 drivers/gpu/drm/sti/sti_vtg_utils.h -- 1.9.0

11 years, 4 months

mem-hotplug: Can arm receive memory-hotplug feature from x86 platform

by xiaofeng.yan

Hi all, I found some scenario could need memory-hotplug feature in their product based on platform ARM. A typical scenario can be described as follows: Developer reserve some memory which can't be accessed by kernel and other function can use these memory before system start up. After booting, system can reclaim the memory reserved with memory-hot plug mechanism. for example , user can add the reserved memory by the next command. #echo "PHYSICAL_ADDRESS_OF_MEMORY, SIZE_FOR_ADDING_MEMORY" > /kernel/sys/addmemory/addmemory. PHYSICAL_ADDRESS_OF_MEMORY: the begging position for adding memory SIZE_FOR_ADDING_MEMORY: the memory size you want to add. the unit should be integral multiple of a section size. So my question is whether arm support memory-hot plug or not in next plan. I am very interested to move the feature from x86 to arm. I have finish the above function and realize dynamic memory addition. I can push my patches if possible. Give me your suggestion. Thanks xiaofeng.yan

11 years, 4 months

Re: [Linaro-mm-sig] [RFC] Helper to abstract vma handling in media layer

by Hans Verkuil

On 04/11/2014 12:18 AM, Jan Kara wrote: > On Thu 10-04-14 23:57:38, Jan Kara wrote: >> On Thu 10-04-14 14:22:20, Hans Verkuil wrote: >>> On 04/10/14 14:15, Jan Kara wrote: >>>> On Thu 10-04-14 13:07:42, Hans Verkuil wrote: >>>>> On 04/10/14 12:32, Jan Kara wrote: >>>>>> Hello, >>>>>> >>>>>> On Thu 10-04-14 12:02:50, Marek Szyprowski wrote: >>>>>>> On 2014-03-17 20:49, Jan Kara wrote: >>>>>>>> The following patch series is my first stab at abstracting vma handling >>>>>>> >from the various media drivers. After this patch set drivers have to know >>>>>>>> much less details about vmas, their types, and locking. My motivation for >>>>>>>> the series is that I want to change get_user_pages() locking and I want >>>>>>>> to handle subtle locking details in as few places as possible. >>>>>>>> >>>>>>>> The core of the series is the new helper get_vaddr_pfns() which is given a >>>>>>>> virtual address and it fills in PFNs into provided array. If PFNs correspond to >>>>>>>> normal pages it also grabs references to these pages. The difference from >>>>>>>> get_user_pages() is that this function can also deal with pfnmap, mixed, and io >>>>>>>> mappings which is what the media drivers need. >>>>>>>> >>>>>>>> The patches are just compile tested (since I don't have any of the hardware >>>>>>>> I'm afraid I won't be able to do any more testing anyway) so please handle >>>>>>>> with care. I'm grateful for any comments. >>>>>>> >>>>>>> Thanks for posting this series! I will check if it works with our >>>>>>> hardware soon. This is something I wanted to introduce some time ago to >>>>>>> simplify buffer handling in dma-buf, but I had no time to start working. >>>>>> Thanks for having a look in the series. >>>>>> >>>>>>> However I would like to go even further with integration of your pfn >>>>>>> vector idea. This structure looks like a best solution for a compact >>>>>>> representation of the memory buffer, which should be considered by the >>>>>>> hardware as contiguous (either contiguous in physical memory or mapped >>>>>>> contiguously into dma address space by the respective iommu). As you >>>>>>> already noticed it is widely used by graphics and video drivers. >>>>>>> >>>>>>> I would also like to add support for pfn vector directly to the >>>>>>> dma-mapping subsystem. This can be done quite easily (even with a >>>>>>> fallback for architectures which don't provide method for it). I will try >>>>>>> to prepare rfc soon. This will finally remove the need for hacks in >>>>>>> media/v4l2-core/videobuf2-dma-contig.c >>>>>> That would be a worthwhile thing to do. When I was reading the code this >>>>>> seemed like something which could be done but I delibrately avoided doing >>>>>> more unification than necessary for my purposes as I don't have any >>>>>> hardware to test and don't know all the subtleties in the code... BTW, is >>>>>> there some way to test the drivers without the physical video HW? >>>>> >>>>> You can use the vivi driver (drivers/media/platform/vivi) for this. >>>>> However, while the vivi driver can import dma buffers it cannot export >>>>> them. If you want that, then you have to use this tree: >>>>> >>>>> http://git.linuxtv.org/cgit.cgi/hverkuil/media_tree.git/log/?h=vb2-part4 >>>> Thanks for the pointer that looks good. I've also found >>>> drivers/media/platform/mem2mem_testdev.c which seems to do even more >>>> testing of the area I made changes to. So now I have to find some userspace >>>> tool which can issue proper ioctls to setup and use the buffers and I can >>>> start testing what I wrote :) >>> >>> Get the v4l-utils.git repository (http://git.linuxtv.org/cgit.cgi/v4l-utils.git/). >>> You want the v4l2-ctl tool. Don't use the version supplied by your distro, >>> that's often too old. >>> >>> 'v4l2-ctl --help-streaming' gives the available options for doing streaming. >>> >>> So simple capturing from vivi is 'v4l2-ctl --stream-mmap' or '--stream-user'. >>> You can't test dmabuf unless you switch to the vb2-part4 branch of my tree. >> Great, it seems to be doing something and it shows there's some bug in my >> code. Thanks a lot for help. > OK, so after a small fix the basic functionality seems to be working. It > doesn't seem there's a way to test multiplanar buffers with vivi, is there? For that you need to switch to the vb2-part4 branch as well. That has support for multiplanar. Regards, Hans

11 years, 5 months

Re: [Linaro-mm-sig] [RFC] Helper to abstract vma handling in media layer

by Hans Verkuil

On 04/10/14 14:15, Jan Kara wrote: > On Thu 10-04-14 13:07:42, Hans Verkuil wrote: >> On 04/10/14 12:32, Jan Kara wrote: >>> Hello, >>> >>> On Thu 10-04-14 12:02:50, Marek Szyprowski wrote: >>>> On 2014-03-17 20:49, Jan Kara wrote: >>>>> The following patch series is my first stab at abstracting vma handling >>>> >from the various media drivers. After this patch set drivers have to know >>>>> much less details about vmas, their types, and locking. My motivation for >>>>> the series is that I want to change get_user_pages() locking and I want >>>>> to handle subtle locking details in as few places as possible. >>>>> >>>>> The core of the series is the new helper get_vaddr_pfns() which is given a >>>>> virtual address and it fills in PFNs into provided array. If PFNs correspond to >>>>> normal pages it also grabs references to these pages. The difference from >>>>> get_user_pages() is that this function can also deal with pfnmap, mixed, and io >>>>> mappings which is what the media drivers need. >>>>> >>>>> The patches are just compile tested (since I don't have any of the hardware >>>>> I'm afraid I won't be able to do any more testing anyway) so please handle >>>>> with care. I'm grateful for any comments. >>>> >>>> Thanks for posting this series! I will check if it works with our >>>> hardware soon. This is something I wanted to introduce some time ago to >>>> simplify buffer handling in dma-buf, but I had no time to start working. >>> Thanks for having a look in the series. >>> >>>> However I would like to go even further with integration of your pfn >>>> vector idea. This structure looks like a best solution for a compact >>>> representation of the memory buffer, which should be considered by the >>>> hardware as contiguous (either contiguous in physical memory or mapped >>>> contiguously into dma address space by the respective iommu). As you >>>> already noticed it is widely used by graphics and video drivers. >>>> >>>> I would also like to add support for pfn vector directly to the >>>> dma-mapping subsystem. This can be done quite easily (even with a >>>> fallback for architectures which don't provide method for it). I will try >>>> to prepare rfc soon. This will finally remove the need for hacks in >>>> media/v4l2-core/videobuf2-dma-contig.c >>> That would be a worthwhile thing to do. When I was reading the code this >>> seemed like something which could be done but I delibrately avoided doing >>> more unification than necessary for my purposes as I don't have any >>> hardware to test and don't know all the subtleties in the code... BTW, is >>> there some way to test the drivers without the physical video HW? >> >> You can use the vivi driver (drivers/media/platform/vivi) for this. >> However, while the vivi driver can import dma buffers it cannot export >> them. If you want that, then you have to use this tree: >> >> http://git.linuxtv.org/cgit.cgi/hverkuil/media_tree.git/log/?h=vb2-part4 > Thanks for the pointer that looks good. I've also found > drivers/media/platform/mem2mem_testdev.c which seems to do even more > testing of the area I made changes to. So now I have to find some userspace > tool which can issue proper ioctls to setup and use the buffers and I can > start testing what I wrote :) Get the v4l-utils.git repository (http://git.linuxtv.org/cgit.cgi/v4l-utils.git/). You want the v4l2-ctl tool. Don't use the version supplied by your distro, that's often too old. 'v4l2-ctl --help-streaming' gives the available options for doing streaming. So simple capturing from vivi is 'v4l2-ctl --stream-mmap' or '--stream-user'. You can't test dmabuf unless you switch to the vb2-part4 branch of my tree. If you need help with testing it's easiest to contact me on the #v4l irc channel. Regards, Hans

11 years, 5 months

Re: [Linaro-mm-sig] [RFC] Helper to abstract vma handling in media layer

by Hans Verkuil

On 04/10/14 12:32, Jan Kara wrote: > Hello, > > On Thu 10-04-14 12:02:50, Marek Szyprowski wrote: >> On 2014-03-17 20:49, Jan Kara wrote: >>> The following patch series is my first stab at abstracting vma handling >> >from the various media drivers. After this patch set drivers have to know >>> much less details about vmas, their types, and locking. My motivation for >>> the series is that I want to change get_user_pages() locking and I want >>> to handle subtle locking details in as few places as possible. >>> >>> The core of the series is the new helper get_vaddr_pfns() which is given a >>> virtual address and it fills in PFNs into provided array. If PFNs correspond to >>> normal pages it also grabs references to these pages. The difference from >>> get_user_pages() is that this function can also deal with pfnmap, mixed, and io >>> mappings which is what the media drivers need. >>> >>> The patches are just compile tested (since I don't have any of the hardware >>> I'm afraid I won't be able to do any more testing anyway) so please handle >>> with care. I'm grateful for any comments. >> >> Thanks for posting this series! I will check if it works with our >> hardware soon. This is something I wanted to introduce some time ago to >> simplify buffer handling in dma-buf, but I had no time to start working. > Thanks for having a look in the series. > >> However I would like to go even further with integration of your pfn >> vector idea. This structure looks like a best solution for a compact >> representation of the memory buffer, which should be considered by the >> hardware as contiguous (either contiguous in physical memory or mapped >> contiguously into dma address space by the respective iommu). As you >> already noticed it is widely used by graphics and video drivers. >> >> I would also like to add support for pfn vector directly to the >> dma-mapping subsystem. This can be done quite easily (even with a >> fallback for architectures which don't provide method for it). I will try >> to prepare rfc soon. This will finally remove the need for hacks in >> media/v4l2-core/videobuf2-dma-contig.c > That would be a worthwhile thing to do. When I was reading the code this > seemed like something which could be done but I delibrately avoided doing > more unification than necessary for my purposes as I don't have any > hardware to test and don't know all the subtleties in the code... BTW, is > there some way to test the drivers without the physical video HW? You can use the vivi driver (drivers/media/platform/vivi) for this. However, while the vivi driver can import dma buffers it cannot export them. If you want that, then you have to use this tree: http://git.linuxtv.org/cgit.cgi/hverkuil/media_tree.git/log/?h=vb2-part4 Regards, Hans

11 years, 5 months

Re: [Linaro-mm-sig] [RFC] Helper to abstract vma handling in media layer

by Marek Szyprowski

Hello, On 2014-03-17 20:49, Jan Kara wrote: > The following patch series is my first stab at abstracting vma handling > from the various media drivers. After this patch set drivers have to know > much less details about vmas, their types, and locking. My motivation for > the series is that I want to change get_user_pages() locking and I want > to handle subtle locking details in as few places as possible. > > The core of the series is the new helper get_vaddr_pfns() which is given a > virtual address and it fills in PFNs into provided array. If PFNs correspond to > normal pages it also grabs references to these pages. The difference from > get_user_pages() is that this function can also deal with pfnmap, mixed, and io > mappings which is what the media drivers need. > > The patches are just compile tested (since I don't have any of the hardware > I'm afraid I won't be able to do any more testing anyway) so please handle > with care. I'm grateful for any comments. Thanks for posting this series! I will check if it works with our hardware soon. This is something I wanted to introduce some time ago to simplify buffer handling in dma-buf, but I had no time to start working. However I would like to go even further with integration of your pfn vector idea. This structure looks like a best solution for a compact representation of the memory buffer, which should be considered by the hardware as contiguous (either contiguous in physical memory or mapped contiguously into dma address space by the respective iommu). As you already noticed it is widely used by graphics and video drivers. I would also like to add support for pfn vector directly to the dma-mapping subsystem. This can be done quite easily (even with a fallback for architectures which don't provide method for it). I will try to prepare rfc soon. This will finally remove the need for hacks in media/v4l2-core/videobuf2-dma-contig.c Thanks for motivating me to finally start working on this! Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland

11 years, 5 months

Re: [Linaro-mm-sig] [PATCH 2/2] dma-buf: update exp_name when using dma_buf_export()

by Daniel Vetter

On Thu, Apr 10, 2014 at 01:30:06AM +0200, Javier Martinez Canillas wrote: > commit c0b00a5 ("dma-buf: update debugfs output") modified the > default exporter name to be the KBUILD_MODNAME pre-processor > macro instead of __FILE__ but the documentation was not updated. > > Also the "Supporting existing mmap interfaces in exporters" section > title seems wrong since talks about the interface used by importers. > > Signed-off-by: Javier Martinez Canillas <javier.martinez(a)collabora.co.uk> Reviewed-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> > --- > Documentation/dma-buf-sharing.txt | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Documentation/dma-buf-sharing.txt b/Documentation/dma-buf-sharing.txt > index 505e711..7d61cef 100644 > --- a/Documentation/dma-buf-sharing.txt > +++ b/Documentation/dma-buf-sharing.txt > @@ -66,7 +66,7 @@ The dma_buf buffer sharing API usage contains the following steps: > > Exporting modules which do not wish to provide any specific name may use the > helper define 'dma_buf_export()', with the same arguments as above, but > - without the last argument; a __FILE__ pre-processor directive will be > + without the last argument; a KBUILD_MODNAME pre-processor directive will be > inserted in place of 'exp_name' instead. > > 2. Userspace gets a handle to pass around to potential buffer-users > @@ -352,7 +352,7 @@ Being able to mmap an export dma-buf buffer object has 2 main use-cases: > > No special interfaces, userspace simply calls mmap on the dma-buf fd. > > -2. Supporting existing mmap interfaces in exporters > +2. Supporting existing mmap interfaces in importers > > Similar to the motivation for kernel cpu access it is again important that > the userspace code of a given importing subsystem can use the same interfaces > -- > 1.9.0 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch

11 years, 5 months

Performance issues with dmabuf

by kiran

Hi, I was looking at some code(given below) which seems to perform very badly when attachments and detachments to used to simulate cache coherency. In the code below, when remote_attach is false(ie no remote processors), using just the two A9 cores the following code runs in 8.8 seconds. But when remote_attach is true then even though there are other cores also executing and sharing the workload the following code takes 52.7 seconds. This shows that detach and attach is very heavy for this kind of code. (The system call detach performs dma_buf_unmap_attachment and dma_buf_detach, system call attach performs dma_buf_attach and dma_buf_map_attachment). for (k = 0; k < N; k++) { if(remote_attach) { detach(path) ; attach(path) ; } for(i = start_indx; i < end_indx; i++) { for (j = 0; j < N; j++) { if(path[i][j] < (path[i][k] + path[k][j])) { path[i][j] = path[i][k] + path[k][j] ; } } } } I would like to manage the cache explicitly and flush cache lines rather than pages to reduce overhead. I also want to access these buffers from the userspace. I can change some kernel code for this. Where should I start ? Thanks in advance. --Kiran

11 years, 5 months

[RFC] dma-buf: Implement test module

by Thierry Reding

This is a simple test module that can be used to allocate, export and delete DMA-BUF objects. It can be used to test DMA-BUF sharing in systems that lack a real second driver. Signed-off-by: Thierry Reding <treding(a)nvidia.com> --- drivers/base/Kconfig | 4 + drivers/base/Makefile | 1 + drivers/base/dma-buf-test.c | 308 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 313 insertions(+) create mode 100644 drivers/base/dma-buf-test.c diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index e373671652b0..bed2abb9491b 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig @@ -200,6 +200,10 @@ config DMA_SHARED_BUFFER APIs extension; the file's descriptor can then be passed on to other driver. +config DMA_BUF_TEST + tristate "DMA-BUF test module" + depends on DMA_SHARED_BUFFER + config DMA_CMA bool "DMA Contiguous Memory Allocator" depends on HAVE_DMA_CONTIGUOUS && CMA diff --git a/drivers/base/Makefile b/drivers/base/Makefile index 94e8a80e87f8..cad983b6626f 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile @@ -25,3 +25,4 @@ obj-$(CONFIG_PINCTRL) += pinctrl.o ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG +obj-$(CONFIG_DMA_BUF_TEST) += dma-buf-test.o diff --git a/drivers/base/dma-buf-test.c b/drivers/base/dma-buf-test.c new file mode 100644 index 000000000000..f5498b74a09b --- /dev/null +++ b/drivers/base/dma-buf-test.c @@ -0,0 +1,308 @@ +#include <linux/dma-buf.h> +#include <linux/err.h> +#include <linux/fs.h> +#include <linux/miscdevice.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/uaccess.h> + +struct dmabuf_create { + __u32 flags; + __u32 size; +}; + +#define DMABUF_IOCTL_BASE 'D' +#define DMABUF_IOCTL_CREATE _IOWR(DMABUF_IOCTL_BASE, 0, struct dmabuf_create) +#define DMABUF_IOCTL_DELETE _IOWR(DMABUF_IOCTL_BASE, 1, int) +#define DMABUF_IOCTL_EXPORT _IOWR(DMABUF_IOCTL_BASE, 2, int) + +struct dmabuf_file { + struct dma_buf *buf; + dma_addr_t phys; + size_t size; + void *virt; +}; + +static int dmabuf_attach(struct dma_buf *buf, struct device *dev, + struct dma_buf_attachment *attach) +{ + return 0; +} + +static void dmabuf_detach(struct dma_buf *buf, + struct dma_buf_attachment *attach) +{ +} + +static struct sg_table *dmabuf_map_dma_buf(struct dma_buf_attachment *attach, + enum dma_data_direction dir) +{ + struct dmabuf_file *priv = attach->dmabuf->priv; + struct sg_table *sgt; + + sgt = kmalloc(sizeof(*sgt), GFP_KERNEL); + if (!sgt) + return NULL; + + if (sg_alloc_table(sgt, 1, GFP_KERNEL)) { + kfree(sgt); + return NULL; + } + + sg_dma_address(sgt->sgl) = priv->phys; + sg_dma_len(sgt->sgl) = priv->size; + + return sgt; +} + +static void dmabuf_unmap_dma_buf(struct dma_buf_attachment *attach, + struct sg_table *sgt, + enum dma_data_direction dir) +{ + sg_free_table(sgt); + kfree(sgt); +} + +static void dmabuf_release(struct dma_buf *buf) +{ +} + +static int dmabuf_begin_cpu_access(struct dma_buf *buf, size_t size, + size_t length, + enum dma_data_direction direction) +{ + return 0; +} + +static void dmabuf_end_cpu_access(struct dma_buf *buf, size_t size, + size_t length, + enum dma_data_direction direction) +{ +} + +static void *dmabuf_kmap_atomic(struct dma_buf *buf, unsigned long page) +{ + return NULL; +} + +static void dmabuf_kunmap_atomic(struct dma_buf *buf, unsigned long page, + void *vaddr) +{ +} + +static void *dmabuf_kmap(struct dma_buf *buf, unsigned long page) +{ + return NULL; +} + +static void dmabuf_kunmap(struct dma_buf *buf, unsigned long page, void *vaddr) +{ +} + +static void dmabuf_vm_open(struct vm_area_struct *vma) +{ +} + +static void dmabuf_vm_close(struct vm_area_struct *vma) +{ +} + +static int dmabuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) +{ + return 0; +} + +static const struct vm_operations_struct dmabuf_vm_ops = { + .open = dmabuf_vm_open, + .close = dmabuf_vm_close, + .fault = dmabuf_vm_fault, +}; + +static int dmabuf_mmap(struct dma_buf *buf, struct vm_area_struct *vma) +{ + pgprot_t prot = vm_get_page_prot(vma->vm_flags); + struct dmabuf_file *priv = buf->priv; + + vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP; + vma->vm_ops = &dmabuf_vm_ops; + vma->vm_private_data = priv; + vma->vm_page_prot = pgprot_writecombine(prot); + + return remap_pfn_range(vma, vma->vm_start, priv->phys >> PAGE_SHIFT, + vma->vm_end - vma->vm_start, vma->vm_page_prot); +} + +static void *dmabuf_vmap(struct dma_buf *buf) +{ + return NULL; +} + +static void dmabuf_vunmap(struct dma_buf *buf, void *vaddr) +{ +} + +static const struct dma_buf_ops dmabuf_ops = { + .attach = dmabuf_attach, + .detach = dmabuf_detach, + .map_dma_buf = dmabuf_map_dma_buf, + .unmap_dma_buf = dmabuf_unmap_dma_buf, + .release = dmabuf_release, + .begin_cpu_access = dmabuf_begin_cpu_access, + .end_cpu_access = dmabuf_end_cpu_access, + .kmap_atomic = dmabuf_kmap_atomic, + .kunmap_atomic = dmabuf_kunmap_atomic, + .kmap = dmabuf_kmap, + .kunmap = dmabuf_kunmap, + .mmap = dmabuf_mmap, + .vmap = dmabuf_vmap, + .vunmap = dmabuf_vunmap, +}; + +static int dmabuf_file_open(struct inode *inode, struct file *file) +{ + struct dmabuf_file *priv; + int ret = 0; + + priv = kzalloc(sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + file->private_data = priv; + + return ret; +} + +static int dmabuf_file_release(struct inode *inode, struct file *file) +{ + struct dmabuf_file *priv = file->private_data; + int ret = 0; + + if (priv->virt) + dma_free_writecombine(NULL, priv->size, priv->virt, priv->phys); + + if (priv->buf) + dma_buf_put(priv->buf); + + kfree(priv); + + return ret; +} + +static int dmabuf_ioctl_create(struct dmabuf_file *priv, const void __user *data) +{ + struct dmabuf_create args; + int ret = 0; + + if (priv->buf || priv->virt) + return -EBUSY; + + if (copy_from_user(&args, data, sizeof(args))) + return -EFAULT; + + priv->virt = dma_alloc_writecombine(NULL, args.size, &priv->phys, + GFP_KERNEL | __GFP_NOWARN); + if (!priv->virt) + return -ENOMEM; + + priv->buf = dma_buf_export(priv, &dmabuf_ops, args.size, args.flags); + if (!priv->buf) { + ret = -ENOMEM; + goto free; + } + + if (IS_ERR(priv->buf)) { + ret = PTR_ERR(priv->buf); + goto free; + } + + priv->size = args.size; + + return 0; + +free: + dma_free_writecombine(NULL, priv->size, priv->virt, priv->phys); + priv->virt = NULL; + return ret; +} + +static int dmabuf_ioctl_delete(struct dmabuf_file *priv, unsigned long flags) +{ + dma_free_writecombine(NULL, priv->size, priv->virt, priv->phys); + priv->virt = NULL; + priv->phys = 0; + priv->size = 0; + + dma_buf_put(priv->buf); + priv->buf = NULL; + + return 0; +} + +static int dmabuf_ioctl_export(struct dmabuf_file *priv, unsigned long flags) +{ + int err; + + get_dma_buf(priv->buf); + + err = dma_buf_fd(priv->buf, flags); + if (err < 0) + dma_buf_put(priv->buf); + + return err; +} + +static long dmabuf_file_ioctl(struct file *file, unsigned int cmd, + unsigned long arg) +{ + struct dmabuf_file *priv = file->private_data; + long ret = 0; + + switch (cmd) { + case DMABUF_IOCTL_CREATE: + ret = dmabuf_ioctl_create(priv, (const void __user *)arg); + break; + + case DMABUF_IOCTL_DELETE: + ret = dmabuf_ioctl_delete(priv, arg); + break; + + case DMABUF_IOCTL_EXPORT: + ret = dmabuf_ioctl_export(priv, arg); + break; + + default: + ret = -ENOTTY; + break; + } + + return ret; +} + +static const struct file_operations dmabuf_fops = { + .owner = THIS_MODULE, + .open = dmabuf_file_open, + .release = dmabuf_file_release, + .unlocked_ioctl = dmabuf_file_ioctl, +}; + +static struct miscdevice dmabuf_device = { + .minor = 128, + .name = "dmabuf", + .fops = &dmabuf_fops, +}; + +static int __init dmabuf_init(void) +{ + return misc_register(&dmabuf_device); +} +module_init(dmabuf_init); + +static void __exit dmabuf_exit(void) +{ + misc_deregister(&dmabuf_device); +} +module_exit(dmabuf_exit); + +MODULE_AUTHOR("Thierry Reding <treding(a)nvidia.com>"); +MODULE_DESCRIPTION("DMA-BUF test driver"); +MODULE_LICENSE("GPL v2"); -- 1.8.4.2

11 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Linaro-mm-sig