aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-07-05dma: tegra: avoid channel lock up after freeDmitry Osipenko1-0/+1
Lock scenario: Channel 1 was allocated and prepared as slave_sg, used and freed. Now preparation of cyclic dma on channel 1 will fail with err "DMA configuration conflict" because tdc->isr_handler still setted to handle_once_dma_done. This happens because tegra_dma_abort_all() won't be called on channel freeing if pending list is empty and channel not busy. We need to clear isr_handler on channel freeing to avoid locking. Signed-off-by: Dmitry Osipenko <[email protected]> Acked-by: Stephen Warren <[email protected]> Acked-by: Laxman Dewangan <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05dma: tegra20-apbdma: err message correctionDmitry Osipenko1-1/+1
Fixed err msg params order on irq request fail. Signed-off-by: Dmitry Osipenko <[email protected]> Acked-by: Stephen Warren <[email protected]> Acked-by: Laxman Dewangan <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05dw_dmac: remove inline marking of EXPORT_SYMBOL functionsDenis Efremov1-2/+2
EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Denis Efremov <[email protected]> Acked-by: Viresh Kumar <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05dma: timb_dma: remove unnecessary platform_set_drvdata()Jingoo Han1-2/+0
The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL. Signed-off-by: Jingoo Han <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05dma: at_hdmac: remove unnecessary platform_set_drvdata()Jingoo Han1-2/+0
The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL. Signed-off-by: Jingoo Han <[email protected]> Acked-by: Nicolas Ferre <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05dma: mxs-dma: Staticize mxs_dma_xlateFabio Estevam1-1/+1
Fix the following sparse warning: drivers/dma/mxs-dma.c:696:17: warning: symbol 'mxs_dma_xlate' was not declared. Should it be static? Signed-off-by: Fabio Estevam <[email protected]> Acked-by: Shawn Guo <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05dma: use platform_{get,set}_drvdata()Jingoo Han2-6/+4
Use the wrapper functions for getting and setting the driver data using platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev, so we can directly pass a struct platform_device. Also, unnecessary dev_set_drvdata() is removed, because the driver core clears the driver data to NULL after device_release or on probe failure. Signed-off-by: Jingoo Han <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05DMA: AT91: Get residual bytes in dma bufferElen Song2-18/+115
Add support for returning the residue for current transfer cookie by reading the transfered buffer size(BTSIZE) in CTRLA register. For a single buffer cookie, the descriptor length minus BTSIZE can get the residue. For a lli cookie, remain_desc will record remain descriptor length when last descriptor finish, the remain_desc minus BTSIZE can get the current residue. If the cookie has completed successfully, the residue will be zero. If the cookie is in progress, it will be the number of bytes yet to be transferred. If get residue error, the cookie will be turn into error status. Check dma fifo to see if data remain, let issue pending finish remain work if there is. Signed-off-by: Elen Song <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05DMA: AT91: Get transfer widthElen Song2-0/+5
In one dma transfer, the data transfer width can be configured and it is limited by source or destination peripheral width, tx_width will save the transfer width, but for memcpy, either source or destination transfer width is taken as tx_width. Signed-off-by: Elen Song <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05dmaengine: at_hdmac/trivial: rearrange CFG register bits assignmentNicolas Ferre1-5/+4
No modification in CFG register configuration, just rearrange bits directives to group logically and make it more readable. Signed-off-by: Nicolas Ferre <[email protected]> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05dmaengine: at_hdmac: extend hardware handshaking interface identificationNicolas Ferre2-0/+6
Peripheral handshaking identification numbers can be bigger than 15, so new fields have been created in the CFG register. Add macros to take this modification into account and use them in at_dma_xlate() function. Signed-off-by: Nicolas Ferre <[email protected]> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05dmaengine: at_hdmac/trivial: correct typo in commentNicolas Ferre1-1/+1
Signed-off-by: Nicolas Ferre <[email protected]> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05DMA: imx-dma: imxdma->dev used uninitializedMarkus Pargmann1-1/+1
imxdma->dev is used for dev_warn before it was set. Signed-off-by: Markus Pargmann <[email protected]> Reviewed-by: Shawn Guo <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05dma: imx-dma: Add oftree supportMarkus Pargmann3-4/+125
Adding devicetree support for imx-dma driver. Use driver name for function 'imx_dma_is_general_purpose' because the devicename for devicetree initialized devices is different. Signed-off-by: Markus Pargmann <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]> Reviewed-by: Shawn Guo <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-07-05Merge branch 'drm-nouveau-next' of ↵Dave Airlie48-10986/+11568
git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next - GF117 acceleration support - GK110 acceleration-with-blob-ucode support, and initial work towards fixing our own ucode to be suitable. - Large cleanups of fermi/kepler context handling * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (22 commits) drm/nva3/disp: Fix HDMI audio regression drm/nv50-/disp: Use output specific mask in interrupt drm/nouveau: use vmalloc for pgt allocation drm/nvc0-/gr: remove some more of the hardcoded register writes drm/nvc0-/gr: factor out yet more unknown magic into versioned functions drm/nvd7/devinit: use fermi class, not tesla drm/nvf0-/gr: ctxsw scratch reg count got bumped to 16 drm/nvc0-/gr: remove hardcoding of UNK count/mask in GPCCS ucode drm/nvf0/gr: build cs ucode for GK110 drm/nvc0-/gr: extend one of the magic calculations for >4 GPCs drm/nvf0/gr: fix ddx shaders locking up on me drm/nvc0/devinit: minor typo drm/nvf0/gr: enable support, if external cs ucode is available drm/nvf0/gr: magic sequence that makes PGRAPH come out of hiding drm/nvf0/ce: enable support drm/nvf0/fifo: enable support drm/nvd7/gr: initial support drm/nvc0-/gr: generate cs register lists from grctx data drm/nvc0-/gr: tpc regs a subset of gpc, add separate list for gpc/unk regs drm/nve0-/gr: some new gpc registers can have multiple copies ...
2013-07-05drm/cma: remove GEM CMA specific dma_buf functionalityJoonyoung Shim2-292/+0
We can use prime helpers instead. Signed-off-by: Joonyoung Shim <[email protected]> Acked-by: Laurent Pinchart <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2013-07-05drm/cma: add low-level hook functions to use prime helpersJoonyoung Shim2-0/+88
Instead of using the dma_buf functionality for GEM CMA, we can use prime helpers if we can provide low-level hook functions for GEM CMA. Signed-off-by: Joonyoung Shim <[email protected]> Acked-by: Laurent Pinchart <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2013-07-05drm: add mmap function to prime helpersJoonyoung Shim2-1/+9
This adds to call low-level mmap() from prime helpers. Signed-off-by: Joonyoung Shim <[email protected]> Acked-by: Laurent Pinchart <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2013-07-05drm/prime: fix sgt NULL checkingJoonyoung Shim1-5/+6
The drm_gem_map_detach() can be called with sgt is NULL. Signed-off-by: Joonyoung Shim <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2013-07-05Merge branch 'exynos-drm-next' of ↵Dave Airlie7-31/+29
git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next This is final pull request for 3.11. This resolves some memory leak issues, and includes some code and dt document file cleanups; just removed unnecessary descriptions. And the patch work for enhancing hdmiphy driver isn't in progress so this patch may go to 3.12. * 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: drm/exynos: remove duplicated error routine and unnecessary assign drm/exynos: fix pages allocation size in lowlevel_buffer_allocate drm/exynos: use drm_calloc_large when allocates pointer array drm/exynos: add error check routine in exynos_drm_open drm/exynos: initialize the buf_num in vp_video_buffer drm/exynos: remove dead code in vidi_power_on drm/exynos: fix not to remain exynos_gem_obj as a leak of/documentation: Update hpd gpio property for exynos_hdmi
2013-07-05drm/rcar-du: Fix buffer pitch alignmentLaurent Pinchart3-2/+22
The DU requires a 16 pixels pitch alignement. Make sure dumb buffers are allocated with the correct pitch, and validate the pitch when creating frame buffers. Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2013-07-05drm/rcar-du: Don't ignore rcar_du_crtc_create() return valueLaurent Pinchart1-2/+5
Handle error cases correctly. Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2013-07-05drm/nva3/disp: Fix HDMI audio regressionIlia Mirkin1-0/+4
This is the nva3 counterpart to commit beba44b17 (drm/nv84/disp: Fix HDMI audio regression). The regression happened as a result of refactoring in commit 8e9e3d2de (drm/nv84/disp: move hdmi control into core). Reported-and-tested-by: Max Baldwin <[email protected]> Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]> Cc: [email protected]
2013-07-05drm/nv50-/disp: Use output specific mask in interruptEmil Velikov1-1/+5
The commit commit 476e84e126171d809f9c0b5d97137f5055f95ca8 Author: Ben Skeggs <[email protected]> Date: Mon Feb 11 09:24:23 2013 +1000 drm/nv50-/disp: initial supervisor support for off-chip encoders changed the write mask in one of the interrupt functions for on-chip encoders, causing a regression in certain VGA dual-head setups. This commit reintroduces the mask thus resolving the regression Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66129 Reported-and-Tested-by: Yves-Alexis <[email protected]> Cc: [email protected] [3.9+] CC: Ben Skeggs <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nouveau: use vmalloc for pgt allocationMarcin Slusarz1-3/+3
Page tables on nv50 take 48kB, which can be hard to allocate in one piece. Let's use vmalloc. Signed-off-by: Marcin Slusarz <[email protected]> Cc: [email protected] [3.7+] Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvc0-/gr: remove some more of the hardcoded register writesBen Skeggs3-28/+6
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvc0-/gr: factor out yet more unknown magic into versioned functionsBen Skeggs9-14/+42
NVC1/NVD9 are the only chipsets that should have anything different happen on them after this. We previously weren't doing these register modifications, and NVIDIA do. Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvd7/devinit: use fermi class, not teslaBen Skeggs1-1/+1
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvf0-/gr: ctxsw scratch reg count got bumped to 16Ben Skeggs12-3034/+3303
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvc0-/gr: remove hardcoding of UNK count/mask in GPCCS ucodeBen Skeggs4-95/+129
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvf0/gr: build cs ucode for GK110Ben Skeggs6-0/+1431
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvc0-/gr: extend one of the magic calculations for >4 GPCsBen Skeggs1-6/+11
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvf0/gr: fix ddx shaders locking up on meBen Skeggs3-3/+54
This can be generalised and used on GK104 (probably even GF117), but lets just make it work for now. Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvc0/devinit: minor typoBen Skeggs1-1/+1
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvf0/gr: enable support, if external cs ucode is availableBen Skeggs2-1/+6
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvf0/gr: magic sequence that makes PGRAPH come out of hidingBen Skeggs2-4/+48
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvf0/ce: enable supportBen Skeggs1-1/+1
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvf0/fifo: enable supportBen Skeggs2-2/+4
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvd7/gr: initial supportMaarten Lankhorst22-20/+1930
Signed-off-by: Maarten Lankhorst <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvc0-/gr: generate cs register lists from grctx dataBen Skeggs11-2073/+1152
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvc0-/gr: tpc regs a subset of gpc, add separate list for gpc/unk regsBen Skeggs8-34/+52
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nve0-/gr: some new gpc registers can have multiple copiesBen Skeggs4-180/+227
GK110 exposes more than one, and needs to be dealt with in the ctxsw ucode just like the TPC sets are. Broadcast is at +0xe00. Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvc0-/gr: pull out a group of separately context-switched gpc regsBen Skeggs6-96/+68
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05drm/nvc0-/gr: make register lists from initvals functionsBen Skeggs21-8423/+6124
Generated context verified to be the same for all supported chipsets. Signed-off-by: Ben Skeggs <[email protected]>
2013-07-05Merge branch 'qxl-next' of git://people.freedesktop.org/~airlied/linux into ↵Dave Airlie8-128/+326
drm-next Adds 3 features that UMS had to the KMS driver. dynamic resizing - resizing remote-viewer makes guest resize multiple crtcs - remote-viewer can access > 1 crtc. suspend/resume/hibernate: guests can do suspend/resume/hibernate now. * 'qxl-next' of git://people.freedesktop.org/~airlied/linux: qxl: use drm helper hotplug support qxl: add suspend/resume/hibernate support. qxl: add fb and ttm entry points for use by suspend/resume. qxl: add ring prep code for s/r qxl: prepare memslot code for suspend/resume qxl: split monitors_config object creation out. drm/qxl: set time on drawables from userspace drm/qxl: add support for > 1 output drm/qxl: make dynamic resizing work properly.
2013-07-05qxl: use drm helper hotplug supportDave Airlie2-1/+6
This uses the helper to deal with hotplug so fbdev gets included. Signed-off-by: Dave Airlie <[email protected]>
2013-07-05qxl: add suspend/resume/hibernate support.Dave Airlie3-8/+132
This adds suspend/resume and hibernate support for the KMS driver. it evicts all the objects, turns off the outputs, and waits for the hw to go idle, On resume, it resets the memslots, rings, monitors object and forces modeset. Signed-off-by: Dave Airlie <[email protected]>
2013-07-05qxl: add fb and ttm entry points for use by suspend/resume.Dave Airlie3-0/+18
This just ports some APIs like radeon uses to provide hooks for s/r to call. Signed-off-by: Dave Airlie <[email protected]>
2013-07-05qxl: add ring prep code for s/rDave Airlie2-2/+9
This prepare the ring code for s/r additions, the release ring will need reinitialising. Signed-off-by: Dave Airlie <[email protected]>
2013-07-05qxl: prepare memslot code for suspend/resumeDave Airlie2-4/+19
this splits out initing the hw memslots from the guest info, and creates an entrypoint for s/r to use. Signed-off-by: Dave Airlie <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.