Linaro-mm-sig

linaro-mm-sig@lists.linaro.org

11 participants
2530 discussions

[PATCH] gpu: ion: Copy name string in client and heap create functions

by Johan Mossberg

ion_client_create and ion_heap_create assumes the caller will keep the name string valid forever. In my opinion this is not the expected behavior, it also makes it difficult to have dynamically created names. Signed-off-by: Johan Mossberg <johan.mossberg(a)stericsson.com> --- drivers/gpu/ion/ion.c | 11 +++++++---- drivers/gpu/ion/ion_heap.c | 3 ++- drivers/gpu/ion/ion_priv.h | 4 +++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/ion/ion.c b/drivers/gpu/ion/ion.c index 8fd61b3..b0ad01b 100644 --- a/drivers/gpu/ion/ion.c +++ b/drivers/gpu/ion/ion.c @@ -57,6 +57,8 @@ struct ion_device { struct dentry *debug_root; }; +#define CLIENT_NAME_LEN 16 + /** * struct ion_client - a process/hw block local address space * @node: node in the tree of all clients @@ -75,7 +77,7 @@ struct ion_client { struct ion_device *dev; struct rb_root handles; struct mutex lock; - const char *name; + char name[CLIENT_NAME_LEN]; struct task_struct *task; pid_t pid; struct dentry *debug_root; @@ -598,14 +600,14 @@ static int ion_debug_client_show(struct seq_file *s, void *unused) names[id] = handle->buffer->heap->name; sizes[id] += handle->buffer->size; } - mutex_unlock(&client->lock); - seq_printf(s, "%16.16s: %16.16s\n", "heap_name", "size_in_bytes"); for (i = 0; i < ION_NUM_HEAP_IDS; i++) { if (!names[i]) continue; seq_printf(s, "%16.16s: %16u\n", names[i], sizes[i]); } + mutex_unlock(&client->lock); + return 0; } @@ -655,7 +657,8 @@ struct ion_client *ion_client_create(struct ion_device *dev, client->dev = dev; client->handles = RB_ROOT; mutex_init(&client->lock); - client->name = name; + strncpy(client->name, name, CLIENT_NAME_LEN); + client->name[CLIENT_NAME_LEN - 1] = '\0'; client->task = task; client->pid = pid; diff --git a/drivers/gpu/ion/ion_heap.c b/drivers/gpu/ion/ion_heap.c index 225ef94..96dd70b 100644 --- a/drivers/gpu/ion/ion_heap.c +++ b/drivers/gpu/ion/ion_heap.c @@ -160,7 +160,8 @@ struct ion_heap *ion_heap_create(struct ion_platform_heap *heap_data) return ERR_PTR(-EINVAL); } - heap->name = heap_data->name; + strncpy(heap->name, heap_data->name, HEAP_NAME_LEN); + heap->name[HEAP_NAME_LEN - 1] = '\0'; heap->id = heap_data->id; return heap; } diff --git a/drivers/gpu/ion/ion_priv.h b/drivers/gpu/ion/ion_priv.h index c116921..3296ba4 100644 --- a/drivers/gpu/ion/ion_priv.h +++ b/drivers/gpu/ion/ion_priv.h @@ -107,6 +107,8 @@ struct ion_heap_ops { struct vm_area_struct *vma); }; +#define HEAP_NAME_LEN 16 + /** * struct ion_heap - represents a heap in the system * @node: rb node to put the heap on the device's tree of heaps @@ -131,7 +133,7 @@ struct ion_heap { enum ion_heap_type type; struct ion_heap_ops *ops; unsigned int id; - const char *name; + char name[HEAP_NAME_LEN]; int (*debug_show)(struct ion_heap *heap, struct seq_file *, void *); }; -- 1.7.4.3

11 years, 9 months

[RFC][PATCH 00/30] staging: Android sync driver

by John Stultz

As proposed yesterday, here's the Android sync driver patches for staging. I've preserved the commit history, but moved all the changes over to be against the staging directory (instead of drivers/base). The goal of submitting this driver to staging is to try to get more collaberation, as there are some similar efforts going on in the community with dmabuf-fences. My email from yesterday with more details for how I hope this goes is here: http://comments.gmane.org/gmane.linux.kernel/1448420 Erik also provided a nice background on the patch set in his reply yesterday, which I'll quote here: "In Honeycomb where we introduced the Hardware Composer HAL. This is a userspace layer that allows composition acceleration on a per platform basis. Different SoC vendors have implemented this using overlays, 2d blitters, a combinations of both, or other clever/disgusting means. Along with the HWC we consolidated a lot of our camera and media pipeline to allow their input to be fed into the GPU or display(overlay.) In order to exploit parallelism the the graphics pipeline, this introduced lots of implicit synchronization dependancies. After a couple years of working with many different SoC vendors, we found that it was really difficult to communicate our system's expectations of the implicit contract and it was difficult for the SoC vendors to properly implement the implicit contract in each of their IP blocks (display, gpu, camera, video codecs). It was also incredibly difficult to debug when problems/deadlocks arose. In an effort to clean up the situation we decided to create set of simple synchronization primitives and have our compositor (SurfaceFlinger) manage the synchronization contract explicitly. We designed these primitives so that they can be passed across processes (much like ion/dma_buf handles), can be backed by hardware synchronization primitives, and can be combined with other sync dependancies in a heterogeneous manner. We also added enough debugging information to make pinpointing a synchronization deadlock bug easier. There are also OpenGL extensions added (which I believe have been ratified by Khronos) to convert a "native" sync object to a gl fence object and vise versa. So far shipped this system on two products (the Nexus 10 and 4) with two different SoCs (Samsung Exynos5250 and Qualcomm MSM8064.) These two projects were much easier to work out the kinks in the graphics/compositing pipelines. In addition we were able to use the telemetry and tracing features to track down the causes of dropped frames aka "jank." As for the implementation, I started with having the main driver op primitive be a wait() op. I quickly noticed that most of the tricky race condition prone code was ending up in the drivers wait() op. It also made handling asynchronous waits of more than one type of sync_pt difficult to manage. In the end I opted for something roughly like poll() where all the heavy lifting is done at the high level and the drivers only need to implement a simple check function." Anyway, let me know what you think of the patches, and hopefully this is something that could be considered for staging for 3.10 thanks -john Cc: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> Cc: Erik Gilling <konkers(a)android.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Rob Clark <robclark(a)gmail.com> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: Greg KH <gregkh(a)linuxfoundation.org> Cc: dri-devel(a)lists.freedesktop.org Cc: linaro-mm-sig(a)lists.linaro.org Cc: Android Kernel Team <kernel-team(a)android.com> Erik Gilling (26): staging: sync: Add synchronization framework staging: sw_sync: Add cpu based sync driver staging: sync: Add timestamps to sync_pts staging: sync: Add debugfs support staging: sw_sync: Add debug support staging: sync: Add ioctl to get fence data staging: sw_sync: Add fill_driver_data support staging: sync: Add poll support staging: sync: Allow async waits to be canceled staging: sync: Export sync API symbols staging: sw_sync: Export sw_sync API staging: sync: Reorder sync_fence_release staging: sync: Optimize fence merges staging: sync: Add internal refcounting to fences staging: sync: Add reference counting to timelines staging: sync: Change wait timeout to mirror poll semantics staging: sync: Dump sync state to console on timeout staging: sync: Improve timeout dump messages staging: sync: Dump sync state on fence errors staging: sync: Protect unlocked access to fence status staging: sync: Update new fence status with sync_fence_signal_pt staging: sync: Use proper barriers when waiting indefinitely staging: sync: Refactor sync debug printing staging: sw_sync: Convert to use new value_str debug ops staging: sync: Add tracepoint support staging: sync: Don't log wait timeouts when timeout = 0 Jamie Gennis (1): staging: sync: Fix timeout = 0 wait behavior Rebecca Schultz Zavin (2): staging: sync: Fix error paths staging: sw_sync: Fix error paths Ørjan Eide (1): staging: sync: Fix race condition between merge and signal drivers/staging/android/Kconfig | 27 + drivers/staging/android/Makefile | 2 + drivers/staging/android/sw_sync.c | 263 +++++++++ drivers/staging/android/sw_sync.h | 58 ++ drivers/staging/android/sync.c | 1016 ++++++++++++++++++++++++++++++++++ drivers/staging/android/sync.h | 426 ++++++++++++++ drivers/staging/android/trace/sync.h | 82 +++ 7 files changed, 1874 insertions(+) create mode 100644 drivers/staging/android/sw_sync.c create mode 100644 drivers/staging/android/sw_sync.h create mode 100644 drivers/staging/android/sync.c create mode 100644 drivers/staging/android/sync.h create mode 100644 drivers/staging/android/trace/sync.h -- 1.7.10.4

11 years, 9 months

Summary of CDF BoF @ELC 2013

by Laurent Pinchart

Hi everybody, Here's a summary of the CDF BoF that took place at the ELC 2013. I'd like to start by thanking all the participants who provided valuable feedback (and those who didn't, but who now know a bit more about CDF and will, I have no doubt about that, contribute in the future :-)). Thank you also to Linus Walleij and Jesse Barker for taking notes during the meeting while I was presenting. And obviously, thank you to Jesse Barker for organizing the BoF. I've tried to be as accurate as possible in this summary, but I might have made mistakes. If you have attended the meeting, please point out any issue, inconsistency, or just points I might have forgotten. ---- As not all attendees were familiar with CDF I started by briefly introducing the problems that prompted me to start working on CDF. CDF started as GPF, the Generic Panel Framework. While working on DT support for a display controller driver I realized that panel control code was located in board file. Moving the code somewhere in drivers/ was thus a prerequisite, but it turned out that no framework existed in the kernel to support that tasks. Several major display controller drivers (TI DSS and Samsung Exynos to name a few) had a platform-specific panel driver framework, but the resulting panel drivers wouldn't be reusable across different display controllers. A need for a new framework became pretty evident to me. After drafting an initial proposal and discussing it with several people online and offline (in Helsinki with Tomi Valkeinen from TI, in Copenhagen at Linaro Connect with Marcus Lorentzon from ST-Ericsson, and in Brussels during a BoF at the FOSDEM) the need to support encoders in addition to panels quickly arose, and GPF turned into CDF. I then pursued with an overview of the latest CDF code and its key concepts. While I was expecting this to be a short overview followed by more in-depth discussions, it turned out to support our discussions for the whole 2 hours meeting. The latest available version at the time of the BoF (posted to the linaro-mm- sig mailing list in reply to the BoF's annoucement) was the "non-quite-v3" version. It incorporated feedback received on v2 but hadn't been properly tested yet. The basic CDF building block is called a display entity, modeled as an instance of struct display_entity. They have sink ports through which they receive video data and/or source ports through which they transmit video data. Entities are chained via their ports to create a display pipeline. >From the outside world entities are interfaced through two sets of abstract operations they must provide: - Control operations are called from "upper layers" (usually to implement userspace requests) to get and set entity parameters (such as the physical size, video modes, operation states, bus parameters, ...). Those operations are implemented at the entity level. Google asked how partial updates were handled, I answered they're not handled yet (this is a key concept behind the CDF RFCs: while I try to make sure all devices can be supported, I first concentrate on hardware features required for the devices I work on). Linus Walleij mentioned he thought that partial updates were becoming out of fashion, but larger display sizes might keep them useful in the future. - Video operations control video streams. They're implemented by entities on their source ports, and are called in the upstream (from a video pipeline point of view) direction. A panel will call video operations of the entity it gets its video stream from (this could be an HDMI transmitter, the display controller directly, ...) to control the video stream it receives. Video operations are split in a set of common operations and sets of display bus specific operations (for DPI, DBI, DSI, ...). Some discussion around ops that might be needed in some cases but not others indicate that the ops structures are not quite finished for all bus types (and/or that some ops might be considered for "promotion" to common). In particular the current DSI implementation is copied from a proposal posted by Tomasz Figa from Samsung. As I have no DSI hardware to test it on I have kept it as-is. Jesse Barker pointed out that to make this fly we willl need to get CDF into a number of implementations, in particular the Samsung Exynos SoCs (needing DSI). Several efforts are ongoing: - Marcus Lorentzon (ST Ericsson, Linaro) is working on porting ST Ericsson code to CDF, and in particular on the DSI interface. - Tomasz Figa (Samsung) has worked on porting the Exynos display controller driver to CDF and provided a DSI implementation. - Tomi Valkeinen (TI) is working on porting the TI DSS driver to CDF (or rather his own version of CDF as a first step, to avoid depending on an ever- moving target right now) independently from Linaro. - Alison Chaiken (Mentor Embedded Software) mentioned that Pengutronix is working on panels support for the Freescale i.MX family. - Linaro can probably also help extending the test coverage to various platforms from its member companies. - Finally, I'm working on CDF support for two display controllers found in Renesas SoCs. One of them support DBI and DPI, the other supports DPI only. However, I can't easily test DBI support, as I don't have access to the necessary hardware. I explained at that point that there is currently no clear agreement on a bus and operations model. The initial CDF proposal created a Linux busses for DBI and DSI (similar to I2C and SPI busses), with access to the control bus implemented through those Linux busses, and access to the video bus implemented through video operations on display entities. Tomi Valkeinen then advocated for getting rid of the DBI and DSI Linux busses and implementing access to both control and video through the display entity operations, while Marcus Lorentzon wanted to implement all those operations at the Linux bus level instead. The best way to arbitrate this will probably to work on several implementations and find out which one works better. SONY Mobile currently supports DSI auto-probing, with plug-n-play detection of DSI panels. The panel ID is first retrieved, and the correct panel driver is then loaded. We will likely need to support a similar model. Another option would be to write a single panel-dcs driver to support all DSI panels that conform with the DSI and DCS standards (although we will very likely need panel-specific quirks in that case). The two options could also coexist. We then moved to how display entities should be handled by KMS drivers and mapped to KMS objects. The KMS model hardcodes the following fixed pipeline CRTC -> encoder -> connector The CRTC is controlled by the display controller driver, and panels can be mapped to KMS connector objects. What goes in-between is more of a gray area, as hardware pipeline can have several encoders chained together. I've presented one possible control flow that could solution the problem by grouping multiple objects into an abstract entity. The right-most entity would be a standalone entity, and every encoder but the left-most one in the chain would hide the entities connected at their output. This results in a "russian dolls" model, where encoders forward control operations to the entities they embed, and forward video operations to the entity at their sink side. This can quickly become very complex, especially when locking and reference counting are added to the model. Furthermore, this solution could only handle linear pipelines, which will likely become a severe limitation in the future, especially on embedded devices (for instance splitting a video stream between two panels at the encoder level is a common use case, or driving a two-inputs panel from two CRTCs). Google asked whether this model tries to address both panels and VGA(/HDMI/...) outputs. From what I've seen so far the only limits come from the hardware engineers (often^H^H^H^H^Hsometimes troubled) minds, all kinds of data streams may appear in practice. As most systems will have one CRTS, one encoder and one panel (or connector), we should probably try to keep the model simple to start with with 1:1 mappings between the KMS CRTC/encoder/connector model and the CDF model. If we try to solve every possible problem right now the complexity will explode and we won't be able to handle it. Getting a simple solution upstream now and refactoring it later (there is no userspace API involved, so no backward compatibility issue) might be the right answer. I have no strong feeling about it, but I certainly want something I can get upstream in a reasonable time frame. Keith Packard bluntly (and totally rightfully) whether CDF is not just duplicating part of the KMS API, and whether we shouldn't instead extend the in-kernel KMS model to handle multiple encoders. One reason that drove the creation of CDF outside of KMS was to support sharing a single driver between multiple subsystems. For instance an HDMI encoder could be connected to the output of a display controller handled by a KMS driver on one board, and to the output of a video processor handled by a V4L2 driver on another board. A panel could also be connected to a display controller handled by a KMS driver on one board, and to a display controller handled by an FBDEV driver on another board. Having a single driver for those encoders or panels is one of the goals of CDF. After publishing the first CDF RFC I realized there was a global consensus in the kernel display community to deprecate FBDEV at some point. Sharing panel drivers between KMS and FBDEV then became a "nice to have, but not important" feature. As V4L2 doesn't handle panels (and shouldn't be extended to do so) only encoders drivers would need to be shared, between KMS and V4L2. It's important to note here that we don't need to share a given encoder between two subsystems at runtime. On a given board the encoder will need to be controlled by KMS or V4L2, but never both at the same time. In the CDF context driver sharing refers to the ability to control a given driver from either the KMS or V4L2 subsystem. The discussion then moved to why V4L2 drivers for devices connected to an encoder couldn't be moved to KMS. All display devices should be handled by KMS, but we still have use cases where V4L2 need to handle video outputs. For instance a system with the following pipeline HDMI con. -> HDMI RX -> Processing Engine -> HDMI TX -> HDMI con. doesn't involve memory buffers in the processing pipeline. This can't be handled by KMS, as KMS cannot reporesent a video pipeline without memory in- between the receiving side and the display side. Hans Verkuil also mentioned that for certain applications one prefers to center the API around frames, and that V4L2 is ideal for instance for video conferencing/telephony. Keith Packard thought we should just extend KMS to handle the V4L2 use cases. V4L2 would then (somehow) plug its infrastructure into KMS. This topic has already been discussed in the past, and I agree that extending the KMS model to support "live sources" for CRTCs will be needed in the near future. This could be the basis of other KMS enhancements to support more complex pipelines. Making KMS and V4L2 cooperate is also desirable on the display side to write the output of the CRTC back to memory. KMS has no write-back feature in the API, V4L2 could come to the rescue there. With this kind of extension it might be possible to handle the display part of memory-less pipelines in KMS, although that might be quite a challenge. There was no clear consensus on whether this was desirable. Furthermore, only two HDMI encoders currently need to be shared (both are only supported out-of-tree at the moment). As we don't expect more than a handful of such use cases in the near future, it might not be worth the hasle to create a complete infrastructure to handle a use case that might disappear if we later move all the display-side drivers to KMS. Another solution mentioned by Hans Verkuil would be to create helper functions to translate V4L2 calls to KMS calls (to be clear, this only covers in-kernel calls to encoders). There was no clear consensus on this topic. We then moved on to the hot-plug (and hot-unplug) issues following a question from Google. Hot-plug is currently not supported. We would need to add hot- plugging notifiers and possibly a couple of other operations. However, the video common operations structure has bind/unbind operations, that can serve as a basis. The hard part in hot-plugging support is actually hot-unplugging, as we need to ensure that devices don't disappear all of a sudden while still in use. This was a design goal of CDF from the start, and any issue there will need to be resolved. Panels shouldn't be handled differently than HDMI connectors, CDF will provide a common hot-plugging model. Keith Packard then explained that DRM and KMS will likely be split in the future. The main link between the DRM and KMS APIs is GEM objects. With the recent addition of dmabuf to the Linux kernel the DRM and KMS APIs could be split and use dmabuf to share buffers. DRM and KMS would then be exposed on two separate device nodes. It would be a good idea to revisit the whole KMS/V4L2 unification discussion when DRM and KMS will be split. We briefly touched the subject of namespaces, and whether CDF should use the KMS namespace (drm_*). There is some resistance on the V4L2 side on having CDF structures be KMS objects. It was then time to wrap up the meeting, and I asked the audience one final question: should we shoehorn complex pipelines into the KMS three-stages model, or should we extend the KMS model? That was unfortunately answered by silence, showing that more thinking is needed. A couple more minutes of offline discussions briefly touched the topics of GPU driver reverse engineering and whether we could, after the KMS/DRM split, set a kernel-side standard for embedded GPU drivers. As interesting as this topic is, CDF will not solve that problem :-) -- Regards, Laurent Pinchart

11 years, 9 months

[RFD] Proposal for merging Android sync driver in staging

by John Stultz

I'd like to get a discussion going about submitting the Android sync driver to staging. I know there is currently some very similar work going on with the dmabuf-fences, and rather then both approaches being worked out individually on their own, I suspect there could be better collaboration around this effort. So my proposal is that we merge the Android sync driver into staging. In my mind, this has the following benefits: 1) It allows other drivers that depend on the sync interface to also be submitted to staging, rather then forcing those drivers to be hidden away in various out of tree git repos, location unknown. 2) It would provide a baseline view to the upstream community of the interface Android is using, providing a real-world, active use case of the functionality. Once the sync driver is in staging, if the dmabuf-fences work is fully sufficient to replace the Android sync driver, we should be able to whittle down the sync driver until its just a interface shim (and at which point efforts can be made to convert Android userland over to dmabuf-fences). However, if the dmabuf-fences work is not fully sufficient to replace the android sync driver, we should be able to at least to whittle down the driver to those specific differences, which would provide a concrete example of where the dmabuf-fences, or other work may need to be expanded, or if maybe the sync driver is the better approach. I've gone through the Android tree and reworked the sync driver to live in staging, while still preserving the full patch history/authorship. You can checkout the reworked patch queue here: http://git.linaro.org/gitweb?p=people/jstultz/android-dev.git;a=shortlog;h=… If folks would take a look and let me know what they think of the changes as well as what they think about pushing it to staging, or other ideas for how to improve collaboration so we can have common interfaces here, I'd appreciate it. Also note: I've done this so far without any feedback from the Android devs (despite my reaching out to Erik a few times recently), so if they object to pushing it to staging, in deference to it being their code I'll back off, even though I do think it would be good to have the code get more visibility upstream in staging. I don't mean to step on anyone's toes. :) thanks -john

11 years, 10 months

[GIT PULL]: dma-buf updates for 3.9

by Sumit Semwal

Hi Linus, Here's the 3.9 pull request for dma-buf framework updates: could you please pull? Thanks and best regards, ~Sumit. The following changes since commit d895cb1af15c04c522a25c79cc429076987c089b: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (2013-02-26 20:16:07 -0800) are available in the git repository at: git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git tags/tag-for-linus-3.9 for you to fetch changes up to 495c10cc1c0c359871d5bef32dd173252fc17995: CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap (2013-02-27 15:14:02 +0530) ---------------------------------------------------------------- 3.9: dma-buf updates Refcounting implemented for vmap in core dma-buf ---------------------------------------------------------------- Daniel Vetter (1): dma-buf: implement vmap refcounting in the interface logic John Sheu (1): CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap Documentation/dma-buf-sharing.txt | 6 +++- drivers/base/dma-buf.c | 66 ++++++++++++++++++++++++++++++------- include/linux/dma-buf.h | 4 ++- 3 files changed, 63 insertions(+), 13 deletions(-)

11 years, 10 months

[PATCH v2] lib/scatterlist: add simple page iterator

by Imre Deak

Add an iterator to walk through a scatter list a page at a time starting at a specific page offset. As opposed to the mapping iterator this is meant to be small, performing well even in simple loops like collecting all pages on the scatterlist into an array or setting up an iommu table based on the pages' DMA address. v2: - In each iteration sg_pgoffset pointed incorrectly at the next page not the current one. Signed-off-by: Imre Deak <imre.deak(a)intel.com> --- include/linux/scatterlist.h | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h index 4bd6c06..72578b5 100644 --- a/include/linux/scatterlist.h +++ b/include/linux/scatterlist.h @@ -231,6 +231,56 @@ size_t sg_copy_to_buffer(struct scatterlist *sgl, unsigned int nents, */ #define SG_MAX_SINGLE_ALLOC (PAGE_SIZE / sizeof(struct scatterlist)) +struct sg_page_iter { + struct scatterlist *sg; + int sg_pgoffset; + struct page *page; +}; + +static inline int +sg_page_cnt(struct scatterlist *sg) +{ + BUG_ON(sg->offset || sg->length & ~PAGE_MASK); + + return sg->length >> PAGE_SHIFT; +} + +static inline struct page * +sg_page_iter_get_page(struct sg_page_iter *iter) +{ + while (iter->sg && iter->sg_pgoffset >= sg_page_cnt(iter->sg)) { + iter->sg_pgoffset -= sg_page_cnt(iter->sg); + iter->sg = sg_next(iter->sg); + } + + return iter->sg ? nth_page(sg_page(iter->sg), iter->sg_pgoffset) : NULL; +} + +static inline void +sg_page_iter_next(struct sg_page_iter *iter) +{ + iter->sg_pgoffset++; + iter->page = sg_page_iter_get_page(iter); +} + +static inline void +sg_page_iter_start(struct sg_page_iter *iter, struct scatterlist *sglist, + unsigned long pgoffset) +{ + iter->sg = sglist; + iter->sg_pgoffset = pgoffset; + iter->page = sg_page_iter_get_page(iter); +} + +/* + * Simple sg page iterator, starting off at the given page offset. Each entry + * on the sglist must start at offset 0 and can contain only full pages. + * iter->page will point to the current page, iter->sg_pgoffset to the page + * offset within the sg holding that page. + */ +#define for_each_sg_page(sglist, iter, pgoffset) \ + for (sg_page_iter_start((iter), (sglist), (pgoffset)); \ + (iter)->page; sg_page_iter_next(iter)) /* * Mapping sg iterator -- 1.7.9.5

11 years, 10 months

Re: [Linaro-mm-sig] [Mesa-dev] [RFC] New dma_buf -> EGLImage EGL extension - Final spec published!

by Tom Cooksey

Hi All, The final spec has had enum values assigned and been published on Khronos: http://www.khronos.org/registry/egl/extensions/EXT/EGL_EXT_image_dma_buf_im… Thanks to all who've provided input. Cheers, Tom > -----Original Message----- > From: mesa-dev-bounces+tom.cooksey=arm.com(a)lists.freedesktop.org [mailto:mesa-dev- > bounces+tom.cooksey=arm.com(a)lists.freedesktop.org] On Behalf Of Tom Cooksey > Sent: 04 October 2012 13:10 > To: mesa-dev(a)lists.freedesktop.org; linaro-mm-sig(a)lists.linaro.org; dri- > devel(a)lists.freedesktop.org; linux-media(a)vger.kernel.org > Subject: [Mesa-dev] [RFC] New dma_buf -> EGLImage EGL extension - New draft! > > Hi All, > > After receiving a fair bit of feedback (thanks!), I've updated the > EGL_EXT_image_dma_buf_import spec > and expanded it to resolve a number of the issues. Please find the latest draft below and let > me > know any additional feedback you might have, either on the lists or by private e-mail - I > don't mind > which. > > I think the only remaining issue now is if we need a mechanism whereby an application can > query > which drm_fourcc.h formats EGL supports or if just failing with EGL_BAD_MATCH when the > application > has use one EGL doesn't support is sufficient. Any thoughts? > > > Cheers, > > Tom > > > --------------------8<-------------------- > > > Name > > EXT_image_dma_buf_import > > Name Strings > > EGL_EXT_image_dma_buf_import > > Contributors > > Jesse Barker > Rob Clark > Tom Cooksey > > Contacts > > Jesse Barker (jesse 'dot' barker 'at' linaro 'dot' org) > Tom Cooksey (tom 'dot' cooksey 'at' arm 'dot' com) > > Status > > DRAFT > > Version > > Version 4, October 04, 2012 > > Number > > EGL Extension ??? > > Dependencies > > EGL 1.2 is required. > > EGL_KHR_image_base is required. > > The EGL implementation must be running on a Linux kernel supporting the > dma_buf buffer sharing mechanism. > > This extension is written against the wording of the EGL 1.2 Specification. > > Overview > > This extension allows creating an EGLImage from a Linux dma_buf file > descriptor or multiple file descriptors in the case of multi-plane YUV > images. > > New Types > > None > > New Procedures and Functions > > None > > New Tokens > > Accepted by the <target> parameter of eglCreateImageKHR: > > EGL_LINUX_DMA_BUF_EXT > > Accepted as an attribute in the <attrib_list> parameter of > eglCreateImageKHR: > > EGL_LINUX_DRM_FOURCC_EXT > EGL_DMA_BUF_PLANE0_FD_EXT > EGL_DMA_BUF_PLANE0_OFFSET_EXT > EGL_DMA_BUF_PLANE0_PITCH_EXT > EGL_DMA_BUF_PLANE1_FD_EXT > EGL_DMA_BUF_PLANE1_OFFSET_EXT > EGL_DMA_BUF_PLANE1_PITCH_EXT > EGL_DMA_BUF_PLANE2_FD_EXT > EGL_DMA_BUF_PLANE2_OFFSET_EXT > EGL_DMA_BUF_PLANE2_PITCH_EXT > EGL_YUV_COLOR_SPACE_HINT_EXT > EGL_SAMPLE_RANGE_HINT_EXT > EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT > EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT > > Accepted as the value for the EGL_YUV_COLOR_SPACE_HINT_EXT attribute: > > EGL_ITU_REC601_EXT > EGL_ITU_REC709_EXT > EGL_ITU_REC2020_EXT > > Accepted as the value for the EGL_SAMPLE_RANGE_HINT_EXT attribute: > > EGL_YUV_FULL_RANGE_EXT > EGL_YUV_NARROW_RANGE_EXT > > Accepted as the value for the EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT & > EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT attributes: > > EGL_YUV_CHROMA_SITING_0_EXT > EGL_YUV_CHROMA_SITING_0_5_EXT > > > Additions to Chapter 2 of the EGL 1.2 Specification (EGL Operation) > > Add to section 2.5.1 "EGLImage Specification" (as defined by the > EGL_KHR_image_base specification), in the description of > eglCreateImageKHR: > > "Values accepted for <target> are listed in Table aaa, below. > > +-------------------------+--------------------------------------------+ > | <target> | Notes | > +-------------------------+--------------------------------------------+ > | EGL_LINUX_DMA_BUF_EXT | Used for EGLImages imported from Linux | > | | dma_buf file descriptors | > +-------------------------+--------------------------------------------+ > Table aaa. Legal values for eglCreateImageKHR <target> parameter > > ... > > If <target> is EGL_LINUX_DMA_BUF_EXT, <dpy> must be a valid display, <ctx> > must be EGL_NO_CONTEXT, and <buffer> must be NULL, cast into the type > EGLClientBuffer. The details of the image is specified by the attributes > passed into eglCreateImageKHR. Required attributes and their values are as > follows: > > * EGL_WIDTH & EGL_HEIGHT: The logical dimensions of the buffer in pixels > > * EGL_LINUX_DRM_FOURCC_EXT: The pixel format of the buffer, as specified > by drm_fourcc.h and used as the pixel_format parameter of the > drm_mode_fb_cmd2 ioctl. > > * EGL_DMA_BUF_PLANE0_FD_EXT: The dma_buf file descriptor of plane 0 of > the image. > > * EGL_DMA_BUF_PLANE0_OFFSET_EXT: The offset from the start of the > dma_buf of the first sample in plane 0, in bytes. > > * EGL_DMA_BUF_PLANE0_PITCH_EXT: The number of bytes between the start of > subsequent rows of samples in plane 0. May have special meaning for > non-linear formats. > > For images in an RGB color-space or those using a single-plane YUV format, > only the first plane's file descriptor, offset & pitch should be specified. > For semi-planar YUV formats, the chroma samples are stored in plane 1 and > for fully planar formats, U-samples are stored in plane 1 and V-samples are > stored in plane 2. Planes 1 & 2 are specified by the following attributes, > which have the same meanings as defined above for plane 0: > > * EGL_DMA_BUF_PLANE1_FD_EXT > * EGL_DMA_BUF_PLANE1_OFFSET_EXT > * EGL_DMA_BUF_PLANE1_PITCH_EXT > * EGL_DMA_BUF_PLANE2_FD_EXT > * EGL_DMA_BUF_PLANE2_OFFSET_EXT > * EGL_DMA_BUF_PLANE2_PITCH_EXT > > In addition to the above required attributes, the application may also > provide hints as to how the data should be interpreted by the GL. If any of > these hints are not specified, the GL will guess based on the pixel format > passed as the EGL_LINUX_DRM_FOURCC_EXT attribute or may fall-back to some > default value. Not all GLs will be able to support all combinations of > these hints and are free to use whatever settings they choose to achieve > the closest possible match. > > * EGL_YUV_COLOR_SPACE_HINT_EXT: The color-space the data is in. Only > relevant for images in a YUV format, ignored when specified for an > image in an RGB format. Accepted values are: > EGL_ITU_REC601_EXT, EGL_ITU_REC709_EXT & EGL_ITU_REC2020_EXT. > > * EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT & > EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT: Where chroma samples are > sited relative to luma samples when the image is in a sub-sampled > format. When the image is not using chroma sub-sampling, the luma and > chroma samples are assumed to be co-sited. Siting is split into the > vertical and horizontal and is in a fixed range. A siting of zero > means the first luma sample is taken from the same position in that > dimension as the chroma sample. This is best illustrated in the > diagram below: > > (0.5, 0.5) (0.0, 0.5) (0.0, 0.0) > + + + + + + + + * + * + > x x x x > + + + + + + + + + + + + > > + + + + + + + + * + * + > x x x x > + + + + + + + + + + + + > > Luma samples (+), Chroma samples (x) Chrome & Luma samples (*) > > Note this attribute is ignored for RGB images and non sub-sampled > YUV images. Accepted values are: EGL_YUV_CHROMA_SITING_0_EXT (0.0) > & EGL_YUV_CHROMA_SITING_0_5_EXT (0.5) > > * EGL_SAMPLE_RANGE_HINT_EXT: The numerical range of samples. Only > relevant for images in a YUV format, ignored when specified for > images in an RGB format. Accepted values are: EGL_YUV_FULL_RANGE_EXT > (0-256) & EGL_YUV_NARROW_RANGE_EXT (16-235). > > > If eglCreateImageKHR is successful for a EGL_LINUX_DMA_BUF_EXT target, the > EGL takes ownership of the file descriptor and is responsible for closing > it, which it may do at any time while the EGLDisplay is initialized." > > > Add to the list of error conditions for eglCreateImageKHR: > > "* If <target> is EGL_LINUX_DMA_BUF_EXT and <buffer> is not NULL, the > error EGL_BAD_PARAMETER is generated. > > * If <target> is EGL_LINUX_DMA_BUF_EXT, and the list of attributes is > incomplete, EGL_BAD_PARAMETER is generated. > > * If <target> is EGL_LINUX_DMA_BUF_EXT, and the EGL_LINUX_DRM_FOURCC_EXT > attribute is set to a format not supported by the EGL, EGL_BAD_MATCH > is generated. > > * If <target> is EGL_LINUX_DMA_BUF_EXT, and the EGL_LINUX_DRM_FOURCC_EXT > attribute indicates a single-plane format, EGL_BAD_ATTRIBUTE is > generated if any of the EGL_DMA_BUF_PLANE1_* or EGL_DMA_BUF_PLANE2_* > attributes are specified. > > * If <target> is EGL_LINUX_DMA_BUF_EXT and the value specified for > EGL_YUV_COLOR_SPACE_HINT_EXT is not EGL_ITU_REC601_EXT, > EGL_ITU_REC709_EXT or EGL_ITU_REC2020_EXT, EGL_BAD_ATTRIBUTE is > generated. > > * If <target> is EGL_LINUX_DMA_BUF_EXT and the value specified for > EGL_SAMPLE_RANGE_HINT_EXT is not EGL_YUV_FULL_RANGE_EXT or > EGL_YUV_NARROW_RANGE_EXT, EGL_BAD_ATTRIBUTE is generated. > > * If <target> is EGL_LINUX_DMA_BUF_EXT and the value specified for > EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT or > EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT is not > EGL_YUV_CHROMA_SITING_0_EXT or EGL_YUV_CHROMA_SITING_0_5_EXT, > EGL_BAD_ATTRIBUTE is generated. > > * If <target> is EGL_LINUX_DMA_BUF_EXT and one or more of the values > specified for a plane's pitch or offset isn't supported by EGL, > EGL_BAD_ACCESS is generated. > > * If <target> is EGL_LINUX_DMA_BUF_EXT and eglCreateImageKHR fails, > EGL does not retain ownership of the file descriptor and it is the > responsibility of the application to close it." > > > Issues > > 1. Should this be a KHR or EXT extension? > > ANSWER: EXT. Khronos EGL working group not keen on this extension as it is > seen as contradicting the EGLStream direction the specification is going in. > The working group recommends creating additional specs to allow an EGLStream > producer/consumer connected to v4l2/DRM or any other Linux interface. > > 2. Should this be a generic any platform extension, or a Linux-only > extension which explicitly states the handles are dma_buf fds? > > ANSWER: There's currently no intention to port this extension to any OS not > based on the Linux kernel. Consequently, this spec can be explicitly written > against Linux and the dma_buf API. > > 3. Does ownership of the file descriptor pass to the EGL library? > > ANSWER: If eglCreateImageKHR is successful, EGL assumes ownership of the > file descriptors and is responsible for closing them. > > 4. How are the different YUV color spaces handled (BT.709/BT.601)? > > ANSWER: The pixel formats defined in drm_fourcc.h only specify how the data > is laid out in memory. It does not define how that data should be > interpreted. Added a new EGL_YUV_COLOR_SPACE_HINT_EXT attribute to allow the > application to specify which color space the data is in to allow the GL to > choose an appropriate set of co-efficients if it needs to convert that data > to RGB for example. > > 5. What chroma-siting is used for sub-sampled YUV formats? > > ANSWER: The chroma siting is not specified by either the v4l2 or DRM APIs. > This is similar to the color-space issue (4) in that the chroma siting > doesn't affect how the data is stored in memory. However, the GL will need > to know the siting in order to filter the image correctly. While the visual > impact of getting the siting wrong is minor, provision should be made to > allow an application to specify the siting if desired. Added additional > EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT & > EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT attributes to allow the siting to > be specified using a set of pre-defined values (0 or 0.5). > > 6. How can an application query which formats the EGL implementation > supports? > > PROPOSAL: Don't provide a query mechanism but instead add an error condition > that EGL_BAD_MATCH is raised if the EGL implementation doesn't support that > particular format. > > 7. Which image formats should be supported and how is format specified? > > Seem to be two options 1) specify a new enum in this specification and > enumerate all possible formats. 2) Use an existing enum already in Linux, > either v4l2_mbus_pixelcode and/or those formats listed in drm_fourcc.h? > > ANSWER: Go for option 2) and just use values defined in drm_fourcc.h. > > 8. How can AYUV images be handled? > > ANSWER: At least on fourcc.org and in drm_fourcc.h, there only seems to be > a single AYUV format and that is a packed format, so everything, including > the alpha component would be in the first plane. > > 9. How can you import interlaced images? > > ANSWER: Interlaced frames are usually stored with the top & bottom fields > interleaved in a single buffer. As the fields would need to be displayed as > at different times, the application would create two EGLImages from the same > buffer, one for the top field and another for the bottom. Both EGLImages > would set the pitch to 2x the buffer width and the second EGLImage would use > a suitable offset to indicate it started on the second line of the buffer. > This should work regardless of whether the data is packed in a single plane, > semi-planar or multi-planar. > > If each interlaced field is stored in a separate buffer then it should be > trivial to create two EGLImages, one for each field's buffer. > > 10. How are semi-planar/planar formats handled that have a different > width/height for Y' and CbCr such as YUV420? > > ANSWER: The spec says EGL_WIDTH & EGL_HEIGHT specify the *logical* width and > height of the buffer in pixels. For pixel formats with sub-sampled Chroma > values, it should be trivial for the EGL implementation to calculate the > width/height of the Chroma sample buffers using the logical width & height > and by inspecting the pixel format passed as the EGL_LINUX_DRM_FOURCC_EXT > attribute. I.e. If the pixel format says it's YUV420, the Chroma buffer's > width = EGL_WIDTH/2 & height =EGL_HEIGHT/2. > > 11. How are Bayer formats handled? > > ANSWER: As of Linux 2.6.34, drm_fourcc.h does not include any Bayer formats. > However, future kernel versions may add such formats in which case they > would be handled in the same way as any other format. > > 12. Should the spec support buffers which have samples in a "narrow range"? > > Content sampled from older analogue sources typically don't use the full > (0-256) range of the data type storing the sample and instead use a narrow > (16-235) range to allow some headroom & toeroom in the signals to avoid > clipping signals which overshoot slightly during processing. This is > sometimes known as signals using "studio swing". > > ANSWER: Add a new attribute to define if the samples use a narrow 16-235 > range or the full 0-256 range. > > 13. Specifying the color space and range seems cumbersome, why not just > allow the application to specify the full YUV->RGB color conversion matrix? > > ANSWER: Some hardware may not be able to use an arbitrary conversion matrix > and needs to select an appropriate pre-defined matrix based on the color > space and the sample range. > > 14. How do you handle EGL implementations which have restrictions on pitch > and/or offset? > > ANSWER: Buffers being imported using dma_buf pretty much have to be > allocated by a kernel-space driver. As such, it is expected that a system > integrator would make sure all devices which allocate buffers suitable for > exporting make sure they use a pitch supported by all possible importers. > However, it is still possible eglCreateImageKHR can fail due to an > unsupported pitch. Added a new error to the list indicating this. > > 15. Should this specification also describe how to export an existing > EGLImage as a dma_buf file descriptor? > > ANSWER: No. Importing and exporting buffers are two separate operations and > importing an existing dma_buf fd into an EGLImage is useful functionality in > itself. Agree that exporting an EGLImage as a dma_buf fd is useful, E.g. it > could be used by an OpenMAX IL implementation's OMX_UseEGLImage function to > give access to the buffer backing an EGLImage to video hardware. However, > exporting can be split into a separate extension specification. > > > Revision History > > #4 (Tom Cooksey, October 04, 2012) > - Fixed issue numbering! > - Added issues 8 - 15. > - Promoted proposal for Issue 3 to be the answer. > - Added an additional attribute to allow an application to specify the color > space as a hint which should address issue 4. > - Added an additional attribute to allow an application to specify the chroma > siting as a hint which should address issue 5. > - Added an additional attribute to allow an application to specify the sample > range as a hint which should address the new issue 12. > - Added language to end of error section clarifying who owns the fd passed > to eglCreateImageKHR if an error is generated. > > #3 (Tom Cooksey, August 16, 2012) > - Changed name from EGL_EXT_image_external and re-written language to > explicitly state this for use with Linux & dma_buf. > - Added a list of issues, including some still open ones. > > #2 (Jesse Barker, May 30, 2012) > - Revision to split eglCreateImageKHR functionality from export > Functionality. > - Update definition of EGLNativeBufferType to be a struct containing a list > of handles to support multi-buffer/multi-planar formats. > > #1 (Jesse Barker, March 20, 2012) > - Initial draft. > > > > > _______________________________________________ > mesa-dev mailing list > mesa-dev(a)lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev

11 years, 10 months

Reminder: CDF BoF at ELC on Thursday

by Jesse Barker

Hi all, Just a reminder of the BoF on Thursday at 4pm (pacific time) at ELC; in particular, it looks like we'll be in the Mission room of the Parc 55 Wyndham. Remember that you don't need to be registered for the conference to attend the BoF, so Bay Area folks are encouraged to join in. Also, if you know of colleagues that are coming to ELC and might not be on this list, please forward this along so they can attend. Here's a rough agenda: - Aims, goals, and non-goals. - CDFv3 overview. - Considerations for Android. - Future direction. In particular, I think it would be good to call out non-goals, especially for the initial version of the framework so that we have a basis that is genuinely useful to build upon. For reference, the thread on Laurent's report from the FOSDEM BoF http://lists.freedesktop.org/archives/dri-devel/2013-February/034576.html cheers, -- Jesse Barker Principal Software Engineer ARM +1 (408) 576-1423 -- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

11 years, 10 months

dw_mmc build broken in next-20130220 (was Re: [PATCH v3 2/2] lib/scatterlist: use page iterator in the mapping iterator)

by James Hogan

On 13 February 2013 15:10, Imre Deak <imre.deak(a)intel.com> wrote: > For better code reuse use the newly added page iterator to iterate > through the pages. The offset, length within the page is still > calculated by the mapping iterator as well as the actual mapping. > Idea from Tejun Heo <tj(a)kernel.org>. > > Signed-off-by: Imre Deak <imre.deak(a)intel.com> > --- > include/linux/scatterlist.h | 6 +++--- > lib/scatterlist.c | 46 ++++++++++++++++++++----------------------- > 2 files changed, 24 insertions(+), 28 deletions(-) > > diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h > index 788a853..a6cd692 100644 > --- a/include/linux/scatterlist.h > +++ b/include/linux/scatterlist.h > @@ -295,9 +295,9 @@ struct sg_mapping_iter { > size_t consumed; /* number of consumed bytes */ > > /* these are internal states, keep away */ > - struct scatterlist *__sg; /* current entry */ > - unsigned int __nents; /* nr of remaining entries */ > - unsigned int __offset; /* offset within sg */ > + unsigned int __offset; /* offset within page */ > + struct sg_page_iter __piter; /* page iterator */ > + unsigned int __remaining; /* remaining bytes on page */ > unsigned int __flags; > }; Hi, FYI, in next-20130220 this appears to break the build of the dw_mmc driver: drivers/mmc/host/dw_mmc.c In function 'dw_mci_read_data_pio': drivers/mmc/host/dw_mmc.c +1457 : error: 'struct sg_mapping_iter' has no member named '__sg' drivers/mmc/host/dw_mmc.c In function 'dw_mci_write_data_pio': drivers/mmc/host/dw_mmc.c +1512 : error: 'struct sg_mapping_iter' has no member named '__sg' Cheers James

11 years, 10 months

[RFC] ARM: iommu: Adding new dma-mappin API to map sgtable

by Nishanth Peethambaran

Adding APIs in arm dma mapping code to map a scatterlist in iommu domain and get dma address. Allocators outside dma-mapping code like ION could allocate pages and devices would need to map them for iommu and obtain a linear dma address. Intention is to re-use the IOVA managment code and "mapping" across allocators. Can the above requirement be done without adding new APIs? APIs available to map an sglist (arm_dma_map_sg) does not provide a linear dma address. Signed-off-by: Nishanth Peethambaran <nishanth(a)broadcom.com> --- arch/arm/include/asm/dma-mapping.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 5b579b9..f9e2f6c 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -268,6 +268,16 @@ extern void arm_dma_sync_sg_for_device(struct device *, struct scatterlist *, in extern int arm_dma_get_sgtable(struct device *dev, struct sg_table *sgt, void *cpu_addr, dma_addr_t dma_addr, size_t size, struct dma_attrs *attrs); +/* + * Map scatterlist pages for the device and return a dma address + */ +extern dma_addr_t arm_dma_map_sgtable(struct device *dev, struct sgtable *sgt, + enum dma_data_direction dir, struct dma_attrs *attrs); +/* + * Unmap the dma address + */ +extern void arm_dma_unmap(struct device *, dma_addr_t iova, int size, + enum dma_data_direction dir, struct dma_attrs *attrs); #endif /* __KERNEL__ */ #endif -- 1.7.9.5

11 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Linaro-mm-sig