aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'linux-omap-pm-3.0' into linux-omap-3.0Dima Zavin2011-06-271-2/+1
|\
| * Revert "OMAP4: hwmod: make dss reset static"Dima Zavin2011-06-271-2/+1
| | | | | | | | This reverts commit 981bf2017465ab1c464e11be73b4b9d6054f51fb.
* | rpmsg_resmgr: improve error reportingIliyan Malchev2011-06-272-17/+30
| | | | | | | | Signed-off-by: Iliyan Malchev <malchev@google.com>
* | Merge remote branch 'omap/linux-omap-mm-3.0' into linux-omap-3.0Dima Zavin2011-06-2412-1097/+1340
|\ \
| * | TILER: Add ION APIs and refactor existing functions to use helper functionsAndy Gross2011-06-172-29/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored alloc_block to use pin_memory(). Standardized ION API to the following functions: tiler_alloc_block_area tiler_free_block_area tiler_pin_block tiler_unpin_block Additional APIs: tiler_map_1d_block tiler_alloc_1d_block_area tiler_pin_memory Change-Id: I9132863d342e0a21ceac00adaba9386d174fc285 Signed-off-by: Andy Gross <andy.gross@ti.com> Signed-off-by: Suman Anna <s-anna@ti.com>
| * | TILER: Simplify alignment and offset usage in driverAndy Gross2011-06-178-154/+70
| | | | | | | | | | | | | | | | | | | | | | | | Slim down APIs by removing alignment and offset. Simplified calculations based off of align/offset. Change-Id: I7d7bdb89668a7f553bbbd836f5dc45f6beceab25 Signed-off-by: Andy Gross <andy.gross@ti.com>
| * | TILER: Make userspace API support a configurable optionAndy Gross2011-06-176-504/+571
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added kernel configuration option for enabling userspace ioctl interfaces. If set, ioctl support will be enabled in the driver. Change-Id: I92ff1bdc2e2b92c9e6d0052967547c23b563377f Signed-off-by: Andy Gross <andy.gross@ti.com>
| * | TILER: Make tiler nv12 support a configuration optionAndy Gross2011-06-177-398/+460
| | | | | | | | | | | | | | | | | | | | | | | | | | | The tiler driver now allows for configuring the nv12 support as a kernel configuration option. If enabled, nv12 support will be compiled into the driver. Change-Id: Ie51517f9fa943af086314caf60ecad5dec52fdb7 Signed-off-by: Andy Gross <andy.gross@ti.com>
| * | TILER: Refactor function names to resemble actual functionalityAndy Gross2011-06-175-37/+39
| | | | | | | | | | | | | | | | | | | | | | | | Change references of mapping to pinning where applicable, so that the new function names resemble more closer to the actual functionality. Change-Id: Ibac1077af189f2e9dcd6a566e8265c1ede1b8b47 Signed-off-by: Andy Gross <andy.gross@ti.com>
| * | TILER: Implement tcm_clear, and initialize TILER containerLajos Molnar2011-06-173-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement tcm_clear and initialize TILER container to a blank page. This eliminates problems from reading into an unmapped TILER page that can happen with 3rd party applications. Change-Id: I6a8fcb54b3e09fe4dc17aa993621a6f411fff981 Signed-off-by: Lajos Molnar <molnar@ti.com> Signed-off-by: Andy Gross <andy.gross@ti.com> Signed-off-by: Suman Anna <s-anna@ti.com>
| * | rpmsg: build only if TI TILER is presentNishanth Menon2011-06-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rpmsg_omx driver will eventually use ION, till then, it depends on TI_TILER being configured in the system. This fixes the build error: 'make CONFIG_DEBUG_SECTION_MISMATCH=y' drivers/built-in.o: In function `_rpmsg_omx_map_buf': drivers/rpmsg/rpmsg_omx.c:108: undefined reference to `tiler_virt2phys' drivers/rpmsg/rpmsg_omx.c:117: undefined reference to `tiler_virt2phys' make: *** [.tmp_vmlinux1] Error 1 Change-Id: I3a5f4aaa59714476a2f7902a2f216dd1e8a58af3 Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Suman Anna <s-anna@ti.com>
* | | Merge branch 'linux-omap-audio-3.0' into linux-omap-3.0Simon Wilson2011-06-248-68/+175
|\ \ \ | | | | | | | | | | | | Signed-off-by: Simon Wilson <simonwilson@google.com>
| * | | ASoC: ABE DAI: support 2 channels for MODEM DAIFrancois Mazard2011-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MODEM DAI needs to support 2 channels for dual-mic on capture and to set the McBSP interface as I2S. Signed-off-by: Francois Mazard <f-mazard@ti.com>
| * | | ASoC: ABE HAL: Fix CMEM address for write_gainMisael Lopez Cruz2011-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CMEM offset used for omap_abe_write_gain(), the address must be aligned to 32-bits. Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| * | | ASoC: ABE DAI: Call modem trigger in bespoke_trigger()Misael Lopez Cruz2011-06-241-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modem DAI is a special case because requires explicit ALSA PCM calls to the DAI associated with the serial port (e.g. McBSP). The trigger() call was missing and the serial port was not initiating any transfer. Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| * | | ASoC: SDP4430: Update McBSP configuration for modem usecaseSebastien Guiriec2011-06-241-17/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configuration of McBSP is not updated when McBSP is not a backend, for example when connected to VX_DL/VX_UL frontends for modem usecases. To ensure McBSP port is properly configured in those cases, we need to explicitly set its parameters when the actual backend is configured. Signed-off-by: Francois Mazard <f-mazard@ti.com> Signed-off-by: Sebastien Guiriec <s-guiriec@ti.com>
| * | | OMAP4: McBSP: Change fclk source names per OMAP versionMisael Lopez Cruz2011-06-242-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMAP4 McBSP FCLK uses clock sources with different names than OMAP3. The names for the clock sources are now associated with the OMAP version. Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| * | | ARM: OMAP4: Enable threshold mode for OMAP4 McBSPMisael Lopez Cruz2011-06-244-40/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Threshold mode is also available for McBSP in OMAP4, FIFO size is 128x32-bit words for all interfaces. Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| * | | OMAP4: hwmod: Fix McBSP irq namesMisael Lopez Cruz2011-06-241-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | McBSP driver expects irq names "tx" and "rx". This notation is used in OMAP2 and OMAP3, hence the hwmod information is updated for OMAP4 McBSP1, McBSP2, McBSP3 and McBSP4 modules. Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
* | | | (TEMP) OMAP: DSS: enable video decodingLajos Molnar2011-06-2320-425/+3461
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add global alpha settings for video 1 overlay in _dispc_setup_global_alpha. On OMAP4 VID1 has global alpha. Change-Id: Iaafaae6283c322a6962d24c0fefa253acd1505f0 Signed-off-by: Lajos Molnar <molnar@ti.com> OMAP4: DSS: Fix incorrect OMAP3-alpha compatibility setting Alpha blending is always enabled on OMAP4. The meaning of the alpha enabled bits in DISPC_CONFIG registers now enabled OMAP3 compatibility mode which disables ZORDER settings. This is not what we want when we set alpha blending. This patch sets alpha blending always to true on OMAP4. It also turns off OMAP3 compatibility mode for now, and reports the compatibility mode results when querying dispc_alpha_blending. Change-Id: Ie7af6835c0415681ae09bc220522e7c692c03e61 Signed-off-by: Lajos Molnar <molnar@ti.com> OMAP: DSS2: Add DISPC VIDEO3 pipeline support VID3 and Writeback pipeline registers have a linear relation, introduce these registers and access these registers in DISPC functions. Add a dss_feature for VIDEO3 pipeline. Configure color conversion and global alpha for this new pipeline. Also, create overlay object for the new video pipe. Signed-off-by: Archit Taneja <archit@ti.com> Signed-off-by: Lajos Molnar <molnar@ti.com> OMAP: DSS2: Add zorder support on OMAP4 Add zorder Support on OMAP4, this feature allows deciding the visibility order of the overlays based on the zorder value provided as a sysfs attribute of the overlay object. Since this feature is not supported on OMAP3 and OMAP2, the sysfs attibutes always return zorder as 0 and do not write to dispc registers for non OMAP4 architectures. Signed-off-by: Sumit Semwal <sumit.semwal@ti.com> Signed-off-by: Archit Taneja <archit@ti.com> Signed-off-by: Mark Tyler <mark.tyler@ti.com> Signed-off-by: Lajos Molnar <molnar@ti.com> OMAP4: DSS: Making the deault color format of framebuffer ARGB32 Earlier the default color format,frmamebuffer has,was xRGB24U but SGX is producing data in ARGB32. Also,SGX,the FB driver user,doesnt negotiates with FB driver for the format and thus FB needs to provide ARGB32 to align with SGX format. http://git.omapzoom.org/?p=kernel/omap.git;a=commit;h=c75a7e1b83d446650b0f393746f8a810242a8739 Signed-off-by: Mark Tyler <mark.tyler@ti.com> OMAP4:DSS: Added TILER support for DSS Added support for displaying buffers located in the TILER 2D containers. Buffers in TILER 1D containers can be displayed using OMAP_DSS_ROT_DMA. Change-Id: I86b231ed5775e410acf31bb49deb817c0989c16b Signed-off-by: Lajos Molnar <molnar@ti.com> OMAP: DSS2: Add callback for tracking overlay/manager changes This patch allows tracking when a particular overlay or manager change has taken place, and when it is eclipsed (no longer used). In DSS2 overlay/manager information travels through 4 stages: 1: (software) overlay/manager info 2: (software) cache (on manager->apply()) 3: (hardware) shadow registers (on configure()) 4: (hardware) DISPC (on vsync or go/enable) Callback information for each settings can be passed as part of the info structure (info->cb), which is the following struct: struct omapdss_ovl_cb { void (*fn)(void *data, int id, int status); void *data; }; id contains to the overlay/manager index. If fn is NULL, no callback will take place. Otherwise, callbacks will be generated on programming (when settings get into the DISPC), when the settings are displayed, and on eclipse (when settings are overwritten by newer settings). Depending on the stage where the eclipse happens, a different callback is generated. Status is one of the DSS_COMPLETION_... enum values specifying the event. DSS_COMPLETION_ECLIPSED_SET - info was overwritten at stage 1 DSS_COMPLETION_ECLIPSED_CACHE - info was overwritten at stage 2 DSS_COMPLETION_ECLIPSED_SHADOW - info was overwritten at stage 3 DSS_COMPLETION_RELEASED - info was overwritten at stage 4 (after successfully being displayed) DSS_COMPLETION_TORN - info was overwritten at stage 4 (before it was successfully displayed) DSS_COMPLETION_PROGRAMMED - info moved from stage 3 to stage 4 (this follows the prior info's callback of DSS_COMPLETION_RELEASED/TORN) DSS_COMPLETION_DISPLAYED - info in stage 4 has been successfully displayed. This callback is received on every frame refresh. If only the first display is required, it needs to be filtered out in the callback. You can use the DSS_COMPLETION_RELEASED flag to see if an info has been eclipsed (so you don't have to check for all 5 values). There is a fundamental issue with tracking DSS settings in the current DSS2 framework. Pipeline/manager settings are programmed first into an info structure that stays around. These settins can be modified piece-by-piece - as they are done using the sysfs framework. Theoretically, these cause the old settings to be eclipsed by the new settings. However, sysfs interface is used to augment the other DSS2 users that would register for these callbacks. Therefore, we need to treat these partial updates specially. For now - if the callback function and data are the same - a different status is used: DSS_COMPLETION_CHANGED_SET. Now these auxiliary interfaces also apply the changes automatically, so a similar method needs to be used at level 2. (DSS_COMPLETION_CHANGED_CACHE) This, however, causes callback info to stay around at the level 1 interface making it not useful for tracking the status. We cannot guarantee that the information is tracked from setting to release/eclipse if future settings may end up reusing (ignorantly) the same callback info. For now the callback info is cleared at level 1 when transferred to level 2. If other - callback unaware - DSS2 users modify overlay/manager settings, (e.g. using sysfs controls in any way), they will not reset the callback. We err on the side of sysfs, and we will not treat a settings application (transferring level 1 info to level 2) as eclipsed if the level-1 callback method is empty. This works for sysfs changes, but we will be a missed callback if V4L2 or FB is changing the base address, and we are using the callbacks to track buffer usage. The other issue is using sysfs to enable/disable an overlay. We may get a RELEASED event on disable, but no usage callback is done on subsequent enable because sysfs will not request a callback. Change-Id: I0b7fdbeefe71e40dc86ec8401dbc7e82374eaeb5 Signed-off-by: Lajos Molnar <molnar@ti.com> Signed-off-by: Mark Tyler <mark.tyler@ti.com> OMAP:DSS:DSSCOMP: New composition module This patch implements a new DSS composition module. DSSCOMP allows specifying a whole composition for a DSS display: 1. set overlay information for all overlays on a manager 2. reroute the overlays to the manager (overlay must be disabled just as when using sysfs) 3. set manager information 4. optionally call manager->apply() that programs the DISPC 4. optionally do an update (after a sync call) DSS already implements coordinated updates by separating overlay information setting from the applicaion of those settings (which happens only in manager->apply()). However current users of DSS call manager->apply() for each change, which make coordinated change impossible. This API also implements auto cropping of all layers to the display region. This makes switching displays and handling display resolution changes easier (without getting "failed to setup overlay" messages.) DSSCOMP operates on 3 levels. base.c contains the basic DSS operations, such as setting DSS overlay and managers using DSSCOMP's setting structures. Theoretically, DSSCOMP could be used via only these operations. queue.c contains the queuing mechanism. This module maintains compositions queued to each overlay manager (the basic DSS composition entity). Each composition is referred to by a unique sync-id. Queueing operations consist of creating a composition, setting/getting manager/overlay information for the composition, applying the composition to the display (which also displays it on manually updated panels), waiting on various states of a composition. For now the basic queuing mechanism of DSSCOMP is "queue and forget". Therefore, it is not necessary to dequeue each frame queued. A consequence of this methodology is that if one applies a composition to a display, any prior unapplied compositions will be dropped. The queuing interface tracks which overlay is assigned to which manager. This is done at the DSS programming level, as that is the most reliable place to monitor overlay ownership. Nonetheless, the device interface uses overlay information to verify overlay ownership - which may be slightly out of sync. The user of DSSCOMP should maintain overlay ownership to ensure flawless sharing of overlays between managers. (E.g. should not use an overlay on a new manager, until the overlay has been disabled on the previous manager, and that composition has been programmed.) device.c contains the device hooks to operating system, and the file interface (via /dev/dsscomp's ioctls). /dev/dsscomp works on top of the queueing mechanism. There are 3 levels of header files. linux/dsscomp.h: basic dsscomp structures and ioctls plat/dsscomp.h: kernel dsscomp interface (on top of linux/dsscomp.h) local dsscomp.h: common implementation structures and shared methods Note: plat/dsscomp.h defines a handle typedef that causes a checkpatch warning. I feel that the creation of a handle typedef is warranted. Limitations: - no WB support - unsure whether to call sync on non-manual update panels - cannot get overlay/manager information on a composition without first having set it - not fully operational - still debugging some unit test issues Change-Id: I5826a409f4fd258c8ce86e782c5e6bdd4bf9bcf4 Signed-off-by: Lajos Molnar <molnar@ti.com> OMAP:DSS:DSSCOMP: Add DSS composition module to build/config system This patch links in the DSS composition (dsscomp) module into the build and configuration system. DSS composition is enabled by default. Change-Id: I5b480dc10b17c5e37f5611baf96a20217cb6ec3e Signed-off-by: Lajos Molnar <molnar@ti.com> Signed-off-by: Mark Tyler <mark.tyler@ti.com> OMAP:OMAPLFB: *HACK* Adapted to DSSCOMP OMAPLFB must call DSSCOMP's apply so that the related overlays are also programmed into DSS. Change-Id: Ia8c1c181028fb7f241677e9657a1d402c8724ee8 Signed-off-by: Mark Tyler <mark.tyler@ti.com> Signed-off-by: Lajos Molnar <molnar@ti.com> OMAP4:DSS: Jumbo patch to enable predecimation Includes the following fixes: - fixed color format modes for non-GFX pipelines - fixed NV12 support in 1D mode buffer - added all color formats to configure_overlay() Predecimation - added predecimation support for NV12/YUV/rotated/SDMA buffers - added scaling decision (predecimation) - added conservative fclk calculation - added sysfs controls - tied into DSSCOMP Signed-off-by: Lajos Molnar <molnar@ti.com> OMAP4:DSS: Fix maxdownscale limits for OMAP4 in DISPC setup plane. Signed-off-by: Mark Tyler <mark.tyler@ti.com>
* | | | rpmsg_sample_client/server: fix section mismatchIliyan Malchev2011-06-232-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | (TEMP) SGX-KM: Increase SGX general heap (work-around)Tony Lofthouse2011-06-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the SGX general heap size at the expense of the parameter buffer. Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | (TEMP) PVR-KM: Allow tiler memory to be wrappedTony Lofthouse2011-06-232-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OSAcquirePhysPageAddr assumed that a given virtual address would map to a page frame number corresponding to memory/ram in the kernel. For tiler memory this assumption would fail as the mapping would be to the tiler virtual address space. This change adjusts this assumption. Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | RPMSG: RESMGR: miscellaneous fixesFernando Guzman Lugo2011-06-233-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes: - Fixed memory leak in rprm_resource_free() - Fixed missing mutex_unlock in rprm_resource_alloc() in case of failure - Move RPMSG_RESMGR option above RPMSG samples in Kconfig (samples should go at the end - Chaged to "default y" option in Kconfig file for RPMSG_RESMGR Signed-off-by: Fernando Guzman Lugo <fernando.lugo@ti.com>
* | | | Merge commit 'v3.0-rc4' into linux-omap-3.0Colin Cross2011-06-22354-2047/+5016
|\ \ \ \
| * | | | Linux 3.0-rc4Linus Torvalds2011-06-201-1/+1
| | | | |
| * | | | vfs: i_state needs to be 'unsigned long' for nowLinus Torvalds2011-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 13e12d14e2dc ("vfs: reorganize 'struct inode' layout a bit") moved things around a bit changed i_state to be unsigned int instead of unsigned long. That was to help structure layout for the 64-bit case, and shrink 'struct inode' a bit (admittedly that only happened when spinlock debugging was on and i_flags didn't pack with i_lock). However, Meelis Roos reports that this results in unaligned exceptions on sprc, and it turns out that the bit-locking primitives that we use for the I_NEW bit want to use the bitops. Which want 'unsigned long', not 'unsigned int'. We really should fix the bit locking code to not have that kind of requirement, but that's a much bigger change. So for now, revert that field back to 'unsigned long' (but keep the other re-ordering changes from the commit that caused this). Andi points out that we have played games with this in 'struct page', so it's solvable with other hacks too, but since right now the struct inode size advantage only happens with some rare config options, it's not worth fighting. It _would_ be worth fixing the bitlocking code, though. Especially since there is no type safety in the bitlocking code (this never caused any warnings, and worked fine on x86-64, because the bitlocks take a 'void *' and x86-64 doesn't care that deeply about alignment). So it's currently a very easy problem to trigger by mistake and never notice. Reported-by: Meelis Roos <mroos@linux.ee> Cc: Andi Kleen <andi@firstfloor.org> Cc: David Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| * | | | Merge branch 'drm-fixes' of ↵Linus Torvalds2011-06-2010-61/+84
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms/r6xx+: voltage fixes drm/nouveau: drop leftover debugging drm/radeon: avoid warnings from r600/eg irq handlers on powered off card. drm/radeon/kms: add missing param for dce3.2 DP transmitter setup drm/radeon/kms/atom: fix duallink on some early DCE3.2 cards drm/nouveau: fix assumption that semaphore dmaobj is valid in x-chan sync drm/nv50/disp: fix gamma with page flipping overlay turned on drm/nouveau/pm: Prevent overflow in nouveau_perf_init() drm/nouveau: fix big-endian switch
| | * | | | drm/radeon/kms/r6xx+: voltage fixesAlex Deucher2011-06-214-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xff01 is not an actual voltage value, but a flag for the driver. If the power state as that value, skip setting the voltage. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| | * | | | drm/nouveau: drop leftover debuggingDave Airlie2011-06-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this printk isn't really useful, just drop it for now. Signed-off-by: Dave Airlie <airlied@redhat.com>
| | * | | | Merge branch 'drm-nouveau-fixes' of ↵Dave Airlie2011-06-204-39/+46
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes * 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau: fix assumption that semaphore dmaobj is valid in x-chan sync drm/nv50/disp: fix gamma with page flipping overlay turned on drm/nouveau/pm: Prevent overflow in nouveau_perf_init() drm/nouveau: fix big-endian switch
| | | * | | | drm/nouveau: fix assumption that semaphore dmaobj is valid in x-chan syncBen Skeggs2011-06-181-34/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DDX modifies DMA_SEMAPHORE on nv50 in order to implement sync-to-vblank, things will go very wrong for cross-channel sync after this. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | | * | | | drm/nv50/disp: fix gamma with page flipping overlay turned onBen Skeggs2011-06-181-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | | * | | | drm/nouveau/pm: Prevent overflow in nouveau_perf_init()Emil Velikov2011-06-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While parsing the perf table, there is no check if the num of entries read from the vbios is less than the currently allocated number. In case of a buggy vbios this will cause overwriting of kernel memory, causing aditional problems. Add a simple check in order to prevent the case Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | | * | | | drm/nouveau: fix big-endian switchBen Skeggs2011-06-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * | | | | drm/radeon: avoid warnings from r600/eg irq handlers on powered off card.Dave Airlie2011-06-202-18/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we were calling the wptr function before checking if the IH was even enabled, or the GPU wasn't shutdown, we'd get spam in the logs when the GPU readback 0xffffffff. This reorders things so we return early in the no IH and GPU shutdown cases. Reported-and-tested-by: ManDay on #radeon Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| | * | | | | drm/radeon/kms: add missing param for dce3.2 DP transmitter setupAlex Deucher2011-06-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used during phy init to set up the phy for DP. This may fix DP problems on DCE3.2 cards. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| | * | | | | drm/radeon/kms/atom: fix duallink on some early DCE3.2 cardsAlex Deucher2011-06-201-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain revisions of the vbios on DCE3.2 cards have a bug in the transmitter control table which prevents duallink from being enabled properly on some cards. The action switch statement jumps to the wrong offset for the OUTPUT_ENABLE action. The fix is to use the ENABLE action rather than the OUTPUT_ENABLE action on the affected cards. In fixed version of the vbios, both actions jump to the same offset, so the change should be safe. Reported-and-tested-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Cc: stable@kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | | | | | Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msmLinus Torvalds2011-06-201-3/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm: msm: timer: Fix DGT rate on 8960 and 8660 msm: timer: compensate for timer shift in msm_read_timer_count msm: timer: Fix SMP build error
| | * | | | | | msm: timer: Fix DGT rate on 8960 and 8660Stephen Boyd2011-06-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DGT runs at 27 MHz divided by 4 on 8660 and 8960. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: David Brown <davidb@codeaurora.org>
| | * | | | | | msm: timer: compensate for timer shift in msm_read_timer_countJeff Ohlstein2011-06-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some msm targets have timers whose lower bits are unreliable. So, we present our timers as lower frequency than they actually are, and ignore the bottom 5 bits on such targets. This compensation was erroneously removed from the msm_read_timer_count function, so restore it. This was broken by 94790ec25 "msm: timer: SMP timer support for msm". Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
| | * | | | | | msm: timer: Fix SMP build errorStephen Boyd2011-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build breakage on SMP=y builds due to 0f7b332 (ARM: consolidate SMP cross call implementation, 2011-04-03) arch/arm/mach-msm/timer.c: In function 'local_timer_setup': arch/arm/mach-msm/timer.c:295: error: implicit declaration of function 'gic_enable_ppi' Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: David Brown <davidb@codeaurora.org>
| * | | | | | | Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2011-06-205-21/+25
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-2.6.40' of git://linux-nfs.org/~bfields/linux: nfsd4: fix break_lease flags on nfsd open nfsd: link returns nfserr_delay when breaking lease nfsd: v4 support requires CRYPTO nfsd: fix dependency of nfsd on auth_rpcgss
| | * | | | | | | nfsd4: fix break_lease flags on nfsd openJ. Bruce Fields2011-06-201-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Casey Bodley for pointing out that on a read open we pass 0, instead of O_RDONLY, to break_lease, with the result that a read open is treated like a write open for the purposes of lease breaking! Reported-by: Casey Bodley <cbodley@citi.umich.edu> Cc: stable@kernel.org Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| | * | | | | | | nfsd: link returns nfserr_delay when breaking leaseCasey Bodley2011-06-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for commit 4795bb37effb7b8fe77e2d2034545d062d3788a8, nfsd: break lease on unlink, link, and rename if the LINK operation breaks a delegation, it returns NFS4ERR_NOENT (which is not a valid error in rfc 5661) instead of NFS4ERR_DELAY. the return value of nfsd_break_lease() in nfsd_link() must be converted from host_err to err Signed-off-by: Casey Bodley <cbodley@citi.umich.edu> Cc: stable@kernel.org Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| | * | | | | | | nfsd: v4 support requires CRYPTORandy Dunlap2011-06-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nfsd V4 support uses crypto interfaces, so select CRYPTO to fix build errors in 2.6.39: ERROR: "crypto_destroy_tfm" [fs/nfsd/nfsd.ko] undefined! ERROR: "crypto_alloc_base" [fs/nfsd/nfsd.ko] undefined! Reported-by: Wakko Warner <wakko@animx.eu.org> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: stable@kernel.org Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| | * | | | | | | nfsd: fix dependency of nfsd on auth_rpcgssJ. Bruce Fields2011-06-063-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit b0b0c0a26e84 "nfsd: add proc file listing kernel's gss_krb5 enctypes" added an nunnecessary dependency of nfsd on the auth_rpcgss module. It's a little ad hoc, but since the only piece of information nfsd needs from rpcsec_gss_krb5 is a single static string, one solution is just to share it with an include file. Cc: stable@kernel.org Reported-by: Michael Guntsche <mike@it-loops.com> Cc: Kevin Coffman <kwc@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| * | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-06-2048-77/+563
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits) pxa168_eth: fix race in transmit path. ipv4, ping: Remove duplicate icmp.h include netxen: fix race in skb->len access sgi-xp: fix a use after free hp100: fix an skb->len race netpoll: copy dev name of slaves to struct netpoll ipv4: fix multicast losses r8169: fix static initializers. inet_diag: fix inet_diag_bc_audit() gigaset: call module_put before restart of if_open() farsync: add module_put to error path in fst_open() net: rfs: enable RFS before first data packet is received fs_enet: fix freescale FCC ethernet dp buffer alignment netdev: bfin_mac: fix memory leak when freeing dma descriptors vlan: don't call ndo_vlan_rx_register on hardware that doesn't have vlan support caif: Bugfix - XOFF removed channel from caif-mux tun: teach the tun/tap driver to support netpoll dp83640: drop PHY status frames in the driver. dp83640: fix phy status frame event parsing phylib: Allow BCM63XX PHY to be selected only on BCM63XX. ...
| | * | | | | | | | pxa168_eth: fix race in transmit path.Richard Cochran2011-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the socket buffer is freed in the completion interrupt, it is not safe to access it after submitting it to the hardware. Cc: stable@kernel.org Cc: Sachin Sanap <ssanap@marvell.com> Cc: Zhangfei Gao <zgao6@marvell.com> Cc: Philip Rakity <prakity@marvell.com> Signed-off-by: Richard Cochran <richard.cochran@omicron.at> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | | | | | | | ipv4, ping: Remove duplicate icmp.h includeJesper Juhl2011-06-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the duplicate inclusion of net/icmp.h from net/ipv4/ping.c Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: David S. Miller <davem@davemloft.net>