aboutsummaryrefslogtreecommitdiffstats
path: root/include/video
Commit message (Collapse)AuthorAgeFilesLines
* OMAPDSS: implementation of MEM2MEM mode with blanked pannel.Artem Rudenko2012-09-121-0/+4
| | | | | | | This change implements MEM2MEM mode for pannels blanked case. Change-Id: Ic030682e7aaa33dd596d5150da23ab9dc1fc20f7 Signed-off-by: Artem Rudenko <artemrudenko@ti.com>
* OMAPDSS: DSS: Scale DSS OPP according to pixel clock rateTaras Kondratiuk2012-09-041-0/+2
| | | | | | | | | | Before enabling pixel clock DSS should set its OPP for OPP framework to set correct VDD_CORE voltage level. When pixel clock is disabled DSS can set the lowest OPP. Change-Id: Ia1459614ae306dba9b048b149e474442e2880bba Signed-off-by: Taras Kondratiuk <taras@ti.com>
* OMAP4: HDMI : Support default display configuration for HDMIDandawate Saket2012-07-171-0/+1
| | | | | | | | | | | | Added get_resolution and get_fb_resolution function to HDMI driver so that we can configure defaults via board files when HDMI is default panel. Change-Id: I36cafb4b0bd42c150c1c1a03be4607edec31b4db Co-Author-by: Victor Kleinik <x0150886@ti.com> Co-Author-by: Artem Rudenko <artemrudenko@ti.com> Signed-off-by: Dandawate Saket <dsaket@ti.com> Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
* OMAPDSS: OMAPFB : Add support for default display scaling.Dandawate Saket2012-07-171-0/+2
| | | | | | | | | | | | | | | | | | | | Currently it is assumed that frame buffer size is same as default panel size. With this assumption GFX pipeline is always presented to default display FBDev. GFX pipeline cannot scale so we cannot have a frame buffer which is not equal to panel size (LCD | HDMI). Updated the current logic of omapfb to pick video pipelines in case scaling is required for FB to be presented to default panel. To provide FB size option is provided via command line. e.g omapfb.fb_opt=0,720,1280,1,640,480 each element is [fb_ix,width,height] Change-Id: I9e2d40bed34c5fbf2bac31668d210e0bc586bb40 Signed-off-by: Dandawate Saket <dsaket@ti.com> Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
* OMAPDSS: DSS: Add MEM2MEM manager modeMykhailo Denysiuk2012-07-111-0/+3
| | | | | | | | | | | | | This change adds memory-to-memory (M2M) mode with using of the manager. The main idea is to connect write back (WB) pipeline to the manager (overlay, in terms of technical reference manual) which is not in use (physical interface is turned-off) for using advantages of hardware manager in M2M mode. In this case several pipelines can be connected to the manager. Change-Id: Ifa649bd5b18f54f3ce583fdee802c799b2c30711 Co-author: Sergiy Kibrik <sergiikibrik@ti.com> Signed-off-by: Mykhailo Denysiuk <x0172934@ti.com>
* OMAPDSS: DSS: Wait for wb interruptArtem Rudenko2012-06-221-0/+3
| | | | | | | | This patch prevents skipping of frames in case we setup a new composition until WB finishes the previous one. Change-Id: I5793dec7f0856ce94674f326383de59f935a2f07 Signed-off-by: Artem Rudenko <artemrudenko@ti.com>
* OMAP4: HDMI: Fix HDMI_TXPHY_TX_CONTROL.FREQOUT programmingVaradarajan, Charulatha2012-06-191-2/+1
| | | | | | | | | | | According to TRM, the HDMI_TXPHY_TX_CONTROL.FREQOUT bit has to be programmed based on the clock frequency. But this bit is always programmed as 1 in the HDMI driver irrespective of the clock frequency values. Fix this and program HDMI_TXPHY_TX_CONTROL.FREQOUT based on the clock frequency. Change-Id: I25a4c335ec773e241cc0daca5c1c1c8f223cd4a0 Signed-off-by: TAKAHASHI, Masato <m_takahashi@ti.com> Signed-off-by: Varadarajan, Charulatha <charu@ti.com>
* Merge latest changes from google kernel/common.gitRoman Shaposhnikov2012-06-131-0/+5
| | | | | | | Kernel version updated to 3.0.31 Change-Id: Ifbd7150801f3beeec9cbaa566f249d8019ef9348 Signed-off-by: Roman Shaposhnikov <x0166637@ti.com>
* OMAPDSS:DSS: Ignore display resolution for WB source overlayMykola Ostrovskyy2012-06-071-0/+1
| | | | | | | | When WB captures from an overlay in MEM2MEM mode, the captured image may be up-scaled beyond the size of the display. Change-Id: Idac2c5082fb60d68d996c15daf8a13080b1f068e Signed-off-by: Mykola Ostrovskyy <mykola@ti.com>
* OMAPDSS:DSSCOMP: Add mem2mem write back support.Artem Rudenko2012-06-071-0/+18
| | | | | | | Added mem2mem wb mode. Patch supports capturing from pipes. Change-Id: Ia4f30e3e163023832b3b9e91d5d67ffe8ffd7365 Signed-off-by: Artem Rudenko <artemrudenko@ti.com>
* OMAP4: OMAPDSS: Request higher bandwidth for 1080p FBPeter Nordström2012-05-231-0/+1
| | | | | | | | | | Request higher L3 bandwidth when we have 1080p, or higher, resolution framebuffer. This is done to avoid underflow on DSS pipelines. Change-Id: Ieca56ae8bc9ec6147ab9301c267c29279a9399ca Signed-off-by: Dandawate Saket <dsaket@ti.com> Signed-off-by: Peter Nordström <nordstrom@ti.com>
* Merge branch wuxga/p-android-omap-3.0-dev into p-android-omap-3.0-devDima Svetlov2012-05-182-0/+102
|\ | | | | | | | | Change-Id: I695b59aeccd2e5cb5a50c6fc734c5d54795f5615 Signed-off-by: Dima Svetlov <svetlov@ti.com>
| * OMAPDSS: DSSCOMP: extended platform info query for fbmem typeSunita Nadampalli2012-05-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | DSSCOMP query platform ioctl returns the platform specific configuration, platform_info. The platform_info strcuture is extended to hold fbmem type information as well. fbmem type is populated by querying sgx omaplfb platform config data. Change-Id: I09727c4654d09e83e66ca174f71a00136518c164 Signed-off-by: Sunita Nadampalli <sunitan@ti.com> Signed-off-by: Lajos Molnar <lajos@ti.com> Signed-off-by: Dima Svetlov <svetlov@ti.com>
| * OMAPDSS: DSI: Enable DSI and DISPC configuration from board filePeter Nordström2012-05-171-0/+55
| | | | | | | | | | | | | | | | | | | | | | DSI and DISPC parameters cannot always be calculated by the driver, so add fields to allow for providing detailed configuration from the board file. Change-Id: If8ad5c7c6479ae221b5dd8ddd44d845ab5756974 Signed-off-by: Peter Nordström <nordstrom@ti.com> Signed-off-by: Lajos Molnar <lajos@ti.com> Signed-off-by: Dima Svetlov <svetlov@ti.com>
| * OMAPDSS: DSSCOMP: Added platform_info and getterLajos Molnar2012-05-171-0/+41
| | | | | | | | | | | | | | | | | | Get platform information from dss2 driver and android_display, instead of it being hardcoded in dsscomp clients. Change-Id: Icc23245ec93d93dd0d9b9fcd791e546720699dcc Signed-off-by: Lajos Molnar <lajos@ti.com> Signed-off-by: Dima Svetlov <svetlov@ti.com>
* | OMAPDSS: CEC: Adding HDMI CEC supportMuralidhar Dixit2012-05-172-22/+234
| | | | | | | | | | | | | | Adding CEC driver support in HDMI Change-Id: Ia6a7d04b1df3a459ae435f8bec79219b2036dfa0 Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
* | OMAPDSS: CEC: Adding support for CEC in HDMI driverMuralidhar Dixit2012-05-171-0/+40
| | | | | | | | | | | | | | | | Adding support for CEC functionality in OMAP4 HDMI IP specific file Change-Id: I333e8ae484e0e56e0c597bca754f0276614d90ee Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
* | OMAPDSS: CEC: Add callback to CEC driver on HDMI HPDMuralidhar Dixit2012-05-171-0/+1
|/ | | | | | | | Adding support for call back from HDMI to CEC driver on HPD and HDMI enable. Change-Id: I9fff9d41d598e5ef375bc03faafb9a559ce7435a Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
* omap_hwc: Adds a flag to hint omaplfb a blit FB is neededGustavo Diaz Prado2012-04-161-0/+5
| | | | | | | | | | | | | | When HWC generates blits a DSS pipe is configured and assigned for the blit framebuffer, this patch adds a flag to give a hint to omaplfb to use such pipe when it is present. This helps in situations where there are not blits but blit buffers to synchronize with and a blit buffer must be used. In such case the rgz_items and num_ovls from dsscomp where not enough data to recognize this scenario. Change-Id: I70542b5d4a865b783277a46afe5e030d17b90f8f Signed-off-by: Gustavo Diaz Prado <a0273371@ti.com>
* OMAPDSS:DSS: Add write back support.Choraria, Rohit2012-03-301-0/+66
| | | | | | | | | | | | Port write back support from 2.6.35. Support for mem2mem mode with overlay/mgr as input will be added later. Change-Id: I17efea1d9897f8f9cd2ed8f9623198e0a63c8fba Signed-off-by: Mythri P K <mythripk@ti.com> Signed-off-by: Rohit Choraria <rohitkc@ti.com> Signed-off-by: Sreenidhi Koti <sreenidhi@ti.com>
* OMAPDSS: tc358765: expand struct tc358765_board_dataSergiy Kibrik2012-03-271-3/+25
| | | | | | | | Board-specific configuration structure expanded with additional attributes, that will be needed for dynamic D2L bridge configuration. Change-Id: Id908433197bbdedb2e6090b1dd3443cffb55f487 Signed-off-by: Sergiy Kibrik <sergiy.kibrik@globallogic.com>
* OMAP4: HDMI: Fix audio delay in resume from suspendBryan Honza2012-02-291-1/+8
| | | | | | | | | | | | This change is to bypass the wait_for_audio_stop loop if turning off hdmi for resync after resume while playing audio. This fixes slow system response and the delay in the return of audio after resume. OMAPS00260109 Device will become slow if you play music with HDMI while wakeup from suspend. Change-Id: I1dec017fbbe117604885fab1dddbe8411b2844d2 Signed-off-by: Bryan Honza <honza@ti.com>
* omap_hwc: Describe the api agreement with omaplfbTony Lofthouse2012-02-221-0/+67
| | | | | Change-Id: I1ec9348a661999d536dcec1ba47247289075790e Signed-off-by: Tony Lofthouse <a0741364@ti.com>
* ASoC: OMAP: HDMI: Defer audio transfer startAxel Castaneda Gonzalez2012-02-201-1/+4
| | | | | | | | | | | Defer audio transfer after HDMI AUDIO wrapper is enabled. If audio transmit was started along with audio wrapper enabling, spurious data (zeros) was sent at the beginning of the transfer as part of the of audio sample packets, due an AUDIO FIFO UNDERFLOW, which was shifting audio channels. Change-Id: I48d8c02c0467dd3158ac748eb0720173d3b209ca Signed-off-by: Axel Castaneda Gonzalez <x0055901@ti.com>
* OMAP DSI: Fix consecutive bus unlocks for manual mode panel.Sreenidhi Koti Ananda Rao2012-02-171-0/+1
| | | | | | | | | | | | | | | | Description: In manual mode panels, a semphore is used to keep track of display queue and release. Upon the condition of framedone timeout error the semaphore is released once by the callback handler before exiting. If framedone for the timed-out frame arrives after 250 msec and before next frame queuing, it releases the semaphore second time in the callback handler. This results in warnon assert later. This patch puts in proper check before releasing the semaphore. This way we prevent multiple unlocks of the bus.. Change-Id: I7db034de1a286f58a7fb9187b4ff356d7ad4731b Signed-off-by: Sreenidhi Koti <sreenidhi@ti.com> Signed-off-by: Sujeet Barnawal <s-baranwal@ti.com>
* Add header for dsscomp and optional bltsville data from Android HWCTony Lofthouse2012-02-011-0/+27
| | | | | | | | | In order to support the OMAP4470 GC320 blit IP from HWC, we will optionally add blit data to the payload of information passed from HWC to the SGX display driver (OMAPLFB). Change-Id: Ia764810b0db0d5d7b0e3f777eeabf879b4552282 Signed-off-by: Tony Lofthouse <a0741364@ti.com>
* OMAP4: HDCP: Disable HDCP authentication for incorrect AKSV valuessrinivas pulukuru2011-12-281-1/+6
| | | | | | | | When AKSV values loaded in HDCP key memory are incorrect, do not perform HDCP authentication. Change-Id: Ia4f5890df9e2beb0e754331021aa4693c51d9443 Signed-off-by: Srinivas Pulukuru <srinivas.pulukuru@ti.com>
* Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-12-201-1/+9
|\ | | | | | | | | | | | | | | Conflicts: arch/arm/mach-omap2/pm44xx.c drivers/video/omap2/dsscomp/gralloc.c Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * OMAPLFB/DSSCOMP: Added support for non-gralloc layers in Post2Lajos Molnar2011-12-121-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworked OMAPLFB to work with new layer indexing in hwc. Post2 layers are now specified directly (vs. assuming co-ordered dsscomp and post2 layers). This allows specifying non-post2 layers, such as static images that HWC may choose to display on external displays. Added support to display external FBMEM images in addition to the layers passed to Post2. Change-Id: I4f7e4946c7656c0d1c70e4f89649054ea253e92a Signed-off-by: Lajos Molnar <lajos@ti.com>
* | [HDMI] Add HMDI S3D supportAlberto Aguirre2011-12-141-0/+17
| | | | | | | | | | | | | | | | | | Add Video specific infoframe configuration. Add sysfs interface to change s3d type and disable/enable s3d mode. Change-Id: I8dc6621a5d4fab79ba95ecbc8e23ade9b6c5dfab Signed-off-by: Alberto Aguirre <a-aguirre@ti.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-12-141-15/+25
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-omap2/pm44xx.c arch/arm/mach-omap2/smartreflex-class1p5.c arch/arm/mach-omap2/smartreflex.h arch/arm/mach-omap2/voltage.h drivers/remoteproc/remoteproc.c drivers/rpmsg/rpmsg_resmgr.c include/video/dsscomp.h Change-Id: I516310bbf02d4e6fc0d980e1755b2b35dfbc7ed4 Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * OMAP: DSSCOMP: Refine overlay info structureLajos Molnar2011-12-081-14/+25
| | | | | | | | | | | | | | Allow specifying addressing type in overlay info to support addressing by ion handle, gralloc handle, or buffer addresses. Change-Id: I2e0ca57c0d90a60b01bfe44ad14d158c9ee99f66
| * OMAP:DSS:DSSCOMP: Remove name collision for DSSCOMP_SETUP_DISPLAYLajos Molnar2011-12-081-21/+21
| | | | | | | | | | | | | | | | This was used as both an enum flag, and as a ioctl define. Rename ioctls to use DSSCIOC prefix. Change-Id: If8cc46d0ca659e53561b03c74340d6697f07bc78 Signed-off-by: Lajos Molnar <molnar@ti.com>
* | Revert "Revert "DSSCOMP: Added UV buffer user-space address to the API""Pavel Nedev2011-11-101-0/+1
| | | | | | | | | | | | | | This reverts commit 2ca61536d413af33d9ef58db249a327991f62a79. Change-Id: I9d00daf95698b14d5029a49f3802400e8f60d4da Signed-off-by: Pavel Nedev <pnedev@mm-sol.com>
* | OMAP:DSS:DSSCOMP: Remove name collision for DSSCOMP_SETUP_DISPLAYSunita Nadampalli2011-11-031-21/+21
| | | | | | | | | | | | | | | | This was used as both an enum flag, and as a ioctl define. Rename ioctls to use DSSCIOC prefix. Change-Id: Ica0718fde72351ea52087d0b02be229c7961a404 Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-10-241-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * android-omap-3.0: OMAP4: HDCP: Fix crash on cancel_delayed_work OMAP4: HDMI: Audio: poll HDMI display before returning error OMAP4: HDMI: Check AKSV registers before resetting HDMI Wrapper Change-Id: I42af064593ddecbcf93f948b3f7816240ba9bd3e Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * OMAP4: HDMI: Check AKSV registers before resetting HDMI Wrappersrinivas pulukuru2011-10-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | AKSV registers are populated after HDCP_KEYS_MEMORY location is loaded with HDCP Encrypted keys after wrapper reset. On HDMI power_on check if AKSV registers are properly loaded, if not load HDCP keys to HDCP_KEYS_MEMORY location and reset the wrapper Change-Id: I728d50997b63b4eff340933d3b12f86ac034f224 Signed-off-by: Srinivas Pulukuru <Srinivas.pulukuru@ti.com>
* | Revert "DSSCOMP: Added UV buffer user-space address to the API"Dan Murphy2011-10-191-1/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 311630e3f33476df17345b7e47bf52983408ae45. This commit causes the PVR to crash. User space and kernel needs to be aligned. Change-Id: I24366e0b70487b2fcf207eeaf0ab07a7ef0f5934 Signed-off-by: Dan Murphy <dmurphy@ti.com>
* | DSSCOMP: Added UV buffer user-space address to the APIPavel Nedev2011-10-191-0/+1
| | | | | | | | | | | | | | | | | | UV buffer user-space address is added to DSSCOMP API. If it is supplied by the user then it will be used instead of height * stride offset from the main buffer address (only in case of NV12 color format). Change-Id: Ie00cd61befa8cfd3a95d5efc83b2959f51ef87a6 Signed-off-by: Pavel Nedev <pnedev@mm-sol.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-10-181-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * android-omap-3.0: (21 commits) remoteproc: create new event to notify when secure mode is enable or disable OMAP: DSS/DSSCOMP: Remove race conditions on callback setting and error handling OMAP4: HDMI: Read up-to 4 EDID blocks OMAP4: HDMI: Reprogram video wrapper after wrapper reset OMAP4: PM: update ROM return address for OSWR and OFF OMAP4: PM: restore iva/l3inst for GP devices as well OMAP4: SMC: Replace HAL service values with macros to improve readability mfd: twl: Add debug info to twl_i2c_read/write errors rpmsg: suppress rpmsg name service hex dumps remoteproc: add mutex protection for secure requests remoteproc: add protection for crash function omap: rpmsg: adapt to the rproc_event_register changes remoteproc: combine all the block notify head structures into one omap: rpmsg: serialize reset of devices per rproc instead of channel tty: serial: omap: don't lock console in suspend. OMAP2+: DMA: Workaround for invalid source position ASoC: OMAP ABE: Secure aess_pointer function for potential delay of start omap: mailbox: call request_irq after mbox queues are allocated cpufreq: interactive governor: default timer 10ms, maxspeed load 95% net: wireless: bcmdhd: Add proper cleaning for ap_info structure ... Conflicts: arch/arm/mach-omap2/include/mach/omap4-common.h arch/arm/mach-omap2/omap-smp.c arch/arm/mach-omap2/omap4-mpuss-lowpower.c Change-Id: I5cca4f85310013966cd8f18ef0628928a3a876d6 Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * OMAP: DSS/DSSCOMP: Remove race conditions on callback setting and error handlingLajos Molnar2011-10-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes lockups and crashes observed during display error injection tests. Wrapping prior callback for managers created race condition, where the manager settings could change between setting the manager info and wrapping the callback. Since callbacks are never set on the original managers, this wrapping functionality is removed. The error handling pathway was also prone to race conditions as the settings could have gotten applied between the mgr->apply failure and the unsetting of the callback. Therefore, created a protected method to unregister a callback (given that it has not been applied). Finally, callbacks were not called when set_mgr_info failed, but mgr_apply succeeded. This is now needed as we are not wrapping the callback outside of set_mgr_info. Also fixed two bugs in mgr_blank() where the apply ISR was not registered, and where we did not wait got GO if GO was not already present during configure(). Change-Id: Ifb4e07ea3bc17006c394517b8eb216ebfe154b73 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-10-121-1/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * android-omap-3.0: (25 commits) gpio: omap: leave edge detect bits alone in idle OMAP: DSS/DSSCOMP: Wait until manager blank applies ASoC: DSP: Use START cmd for DSP_TRIGGER_PRE/POST types ASoC: OMAP ABE: Update ping/pong mode to support 4 buffers. OMAP4: sram: Mapping 4K of Public internal memory to kernel OMAP:DSS2: Fix FIFO threshold calculation OMAP DSS: FIFO Threshold Optimization OMAP4: DSS: Enable bufferfilling by default omap: dispc: force L3_1 CD to NOSLEEP when dispc module is active. OMAP4: HDCP: clean up debugging output OMAP4: HDCP: Add menuconfig option for HDCP OMAP4: HDCP: Change authentication sequence and DDCTimeout values OMAP4: HDMI: Load HDCP keys before HDMI power on Notification OMAP4: HDCP: use request_firmware to load keys omap4: HDCP: Add support for omap4_secure_dispatch call OMAP4: HDCP: Register as misc device OMAP4: HDCP: Add interrupt handling to enable HDCP authentication OMAP4: HDCP: Add support for HDCP in OMAP4 driver ASoC: OMAP: HDMI: Set audio configuration after power ON event OMAP4: HDMI: Workaround: wait for audio to be off before cutting PHY power ... Change-Id: Ib1a35e1e2fc66d2a3dce5df4c6c0d929d64ada9a Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * OMAP4: HDCP: Add interrupt handling to enable HDCP authenticationsrinivas pulukuru2011-10-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | Add HPD HI/LO, BCAP, RI_ERR Interrupt handling for HDCP audthentication. Add HDMI-Wrapper reset required so that AKSV is copied into the core registers properly. Change-Id: I14b727a0302cfef2c03fc5c733b396a071692c05 Signed-off-by: Dandawate Saket <dsaket@ti.com> Signed-off-by: Srinivas Pulukuru <srinivas.pulukuru@ti.com>
| * OMAP4: HDCP: Add support for HDCP in OMAP4 driverSelwin Sebastian2011-10-101-0/+6
| | | | | | | | | | | | | | | | | | | | Add support for HDCP driver in OMAP4. Change-Id: Ie4edb46e35562e65b5babfeb3536cdfcf809dc2e Signed-off-by: fabrice Olivero <f-olivero@ti.com> Signed-off-by: Dandawate Saket <dsaket@ti.com> Signed-off-by: Lajos Molnar <molnar@ti.com> Signed-off-by: Srinivas Pulukuru <srinivas.pulukuru@ti.com>
| * ASoC: OMAP: HDMI: Set audio configuration after power ON eventAxel Castaneda Gonzalez2011-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | When HDMI mode is changed, HDMI is powered OFF in order to reconfigure video settings, audio configuration should be updated accordingly during the power ON. A callback is registered to catch power ON notifications, audio is reconfigured based on the updated HDMI mode. Change-Id: Ie9ec21465a11afcf1223536e9d926e4e48418c52 Signed-off-by: Srinivas Pulukuru <srinivas.pulukuru@ti.com> Signed-off-by: Axel Castaneda Gonzalez <x0055901@ti.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-10-071-0/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * android-omap-3.0: (44 commits) OMAP4: PM: Tesla (DSP) power domain doesn't transition to OFF OMAP4: PM: dont program to greater LP state on suspend OMAP4: PM: dont restore to greater LP state on resume OMAP4: PM: Dont write to readonly/reserved powerdomain register on resume OMAP4: PM: Skip resume powerdomain programing if state already achieved OMAP4: PM: Honor powerdomain wakeup ON state in resume reprogramming OMAP4: PM: Skip programming CPU states again on resume OMAP4: PM: Print achieved state on failed transition OMAP4: PM: Refactor resume pd programing OMAP4: PM: Fold saving power state with programming suspend state OMAP4: PM: Restore trim configuration before DPLL restore GPIO: OMAP: set edge trigger for wakeup gpio GPIO: OMAP: Fix GPIO_IRQWAKEN_0 access netfilter: xt_qtaguid: Fix the stats info display order omap: remoteproc: update suspend flag address omap: rpmsg: remove call to rproc_last_busy from mbox callback remoteproc: move remoteproc register dump before error notification remoteproc: make rproc_set_secure a blocking call omap4: add a new misc driver for setting secure mode omap: remoteproc: enable setting iommu ttb ... Change-Id: I05e426b5d2da76f5ba88b6196f268f9744c5f559 Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * OMAP: DSS: Add panel dimensions to the dss device structureLajos Molnar2011-10-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | Created common omapdss_display_get_dimensions() that can retrieve dimensions from either the driver's get_dimension() hook (if provided), or from the panel dimensions. HDMI updates panel dimensions based on the EDID information. Change-Id: Ic47d1bfb96dfde4003ad30830074c44e2a550f6f Signed-off-by: Lajos Molnar <molnar@ti.com>
| * OMAP4: DSS: HDMI: Handle sync lost errors for TVSujeet Baranwal2011-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | The currrent code doesn't handle the SYNC_LOST error. The panel needs to be disabled & enabled in case of SYNC_LOST. To avoid edid read in this case, a flag is added which would not alter the value of custom_edid & edid_set flag. Change-Id: I11a17e5e1eda736c66b6d92973ede085d57dbd9d Signed-off-by: Baranwal Sujeet <s-baranwal@ti.com> Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
* | OMAP4: DSS: HDMI: Handle sync lost errors for TVSujeet Baranwal2011-09-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | The currrent code doesn't handle the SYNC_LOST error. The panel needs to be disabled & enabled in case of SYNC_LOST. To avoid edid read in this case, a flag is added which would not alter the value of custom_edid & edid_set flag. Change-Id: I11a17e5e1eda736c66b6d92973ede085d57dbd9d Signed-off-by: Baranwal Sujeet <s-baranwal@ti.com> Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-09-221-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * android-omap-3.0: Revert "mfd: twl6030 madc: disable when not in use" ASoC: omap-mcbsp: don't change DAI sysclk if stream is active ASoC: DSP: Do trigger start for runtime startup OMAP4 SGX: Enable SUPPORT_LARGE_GENERAL_HEAP ASoc: ABE DSP: Avoid OPP scaling before ABE shutdown ASoC: ABE: Update saturation thresholds for ABE HID: Add null check for hidinput. mfd: twl6030 madc: disable when not in use HID: magicmouse: Add input_register callback. [OMAP4-DSS] Ignoring first sync lost [OMAP4-DSS] Boot Device using Bootloader DSS configuration [OMAP4-DSS] Prevent DSS reset at bootup by HWMOD HID: Add input_register callback. net: wireless: bcmdhd: Update to Version 5.90.125.87 gpu: pvr: Update to DDK 1.8@292423 gpu: pvr: Update to DDK 1.8@292125 gpu: pvr: Update to DDK 1.8@291971 ARM: omap2+: smartreflex: move smartreflex suspend to suspend_noirq Conflicts: drivers/video/omap2/dss/manager.c Change-Id: Ia0d782615e2b3f3465c9f61763c316ac2630fbfc Signed-off-by: Dan Murphy <dmurphy@ti.com>