summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-22hwc: use triple buffer hint for overlay layers for debugTony Lofthouse
This is a cheat to discriminate between blit layers and real overlay engine layers in dumpsys SurfaceFlinger. This patch is benign for an OVERLAY type layer the hints field should have bit 1 set when using dss overlays, and clear when it was blitted. Ported from p-ics-mr1: 1f4cf8b hwc: use triple buffer for overlay layers Change-Id: I7a9afed74c0b2e44bf08d3611775be28530378a1 Signed-off-by: Tony Lofthouse <a0741364@ti.com> (cherry picked from commit 407ca87c9557dfd381f7ce765f080503722e7fd7)
2012-10-22hwc: Add HAL_PIXEL_FORMAT_TI_NV12_1DTony Lofthouse
Ported from p-ics-mr1: 93f38c6 hwc: Add HAL_PIXEL_FORMAT_TI_NV12_1D Change-Id: I6ec62cec7590b90fb58cddfbfb5d253b8a7b469e Signed-off-by: Tony Lofthouse <a0741364@ti.com> (cherry picked from commit 7819b77e1a264805195cfa84c6da22de97b8bfe7)
2012-10-22hwc: save some dumpsys log real-estateTony Lofthouse
With the SurfaceFlinger/GraphicBufferAllocator and gralloc HAL state following the HWC overlay, HWC state often scrolls off the screen. Make the layer dump use fewer lines. Ported from p-ics-mr1: 037dac8 hwc: save some dumpsys log real-estate Change-Id: I15d5e411056c57721105ca47b5deddfb496392d4 Signed-off-by: Tony Lofthouse <a0741364@ti.com> (cherry picked from commit 8e1337a74223aef92748843b80d0886f4c4f3a29)
2012-10-22hwc: move platform specific pixel formats to headerTony Lofthouse
Change-Id: I7033d847621f748d0263d9004cb32f4426c115ef Signed-off-by: Tony Lofthouse <a0741364@ti.com> (cherry picked from commit 1726714f2c75a37bf1c904e32d6c45eb68246ec5) Conflicts: hwc/hwc.c
2012-10-22hwc: remove unused padded nv12 formatTony Lofthouse
The padded NV12 format was never used. Change-Id: I4796c71518edb3cd1c1a5daeed2a0045a45ca539 Signed-off-by: Tony Lofthouse <a0741364@ti.com> (cherry picked from commit e3fe422bac3fba2f72c96b422c5d5a5e9fe04e8d) Conflicts: hwc/hwc.c
2012-10-22hwc: FPS property to show compositor performanceTony Lofthouse
Use setprop debug.hwc.showfps 1 to show the average frames per second displayed over the last 8 compositions. debug.hwc.showfps can be set dynamically, the overhead of accessing Android properties should be minor i.e. an access to an mmap'd() file, so this should not be a significant overhead to composition when disabled. Reworked from p-ics-mr1: 9ea53ce HWC: debug.hwc.showfps Android property shows current FPS 66a531d hwc: enable debug.hwc.showfps to be set dynamically Change-Id: Ie2303e6ae9e73f38cf563d6ed6079928054e4c16 Signed-off-by: Tony Lofthouse <a0741364@ti.com> (cherry picked from commit 69400d18d6cfc7b2b55b5a563b1fd4387887ded4) Conflicts: hwc/hwc.c
2012-10-22hwc: don't force upscaled NV12 layer to SGX when force_sgx is usedLajos Molnar
Let NV12 layer be rendered with overlay even when force_sgx is used, if it is upscaled by more than a configurable limit (default 2x). This will limit video twitching because of SGX limitations when scaling NV12 layer. Rebased from p-ics-mr1: 3eb31b9 hwc: Don't force upscaled NV12 layer to SGX when force_sgx is used. Change-Id: I114633447c2d54677dce45e047c5a121e200185f Signed-Off-By: Rajesh Vandanapu<rajeshv@ti.com> Signed-off-by: Lajos Molnar <lajos@ti.com> Signed-off-by: Tony Lofthouse <a0741364@ti.com> (cherry picked from commit 2b826707289cd0052357187311d8d7bc1d5572a5) Conflicts: hwc/hwc.c
2012-10-22hwc: fix max_hw_overlay calculation in mirroring modeTony Lofthouse
When the protected content is present, we need to have minimum two external overlays to achieve mirroring. Rebase from p-ics-mr1 76f23bf HWC: Fix for max_hw_overlay calcualtion during mirroring mode Change-Id: Ibf95232e5f5d3b11eb05b4b4506fceb118dbfdd9 Signed-off-by: Sunita Nadampalli <sunitan@ti.com> Signed-off-by: Tony Lofthouse <a0741364@ti.com> (cherry picked from commit cb9e6c8c4a37e5e1835cec8a10c774bbcc156637) Conflicts: hwc/hwc.c
2012-10-22hwc: corrected calculation of lcd_xpyOleksandr Lugovyk
On hwc open xpy for lcd is calculated. In case values in mm are not provided (=0) the result of xpy is NaN. That influences further selection of external display resolution and calculation of video dimensions for external tv. Rebased from p-ics-mr1: 8d481bf HWC: corrected calculation of lcd_xpy Change-Id: I3494bd9c7bd797a27e985b474d6390606bb4106d Signed-off-by: Oleksandr Lugovyk <x0158320@ti.com> Signed-off-by: Tony Lofthouse <a0741364@ti.com> (cherry picked from commit 94970d78bf886d766ef37ec29b935c1edb34090d)
2012-10-22hwc: fix checking HW scaling limits for manual panelsSunita Nadampalli
This patch fixes the bug in the logic to check the DSS downscale limits for width. The code should return false incase the downscale limit is greater than the HW supported limit and the decimation limit. It was returning true earlier, because of coding error. Rebased from p-ics-mr1: 1d9d4dc HWC: Fix while checking for HW scaling limits for manual panels Change-Id: Id62494feaaf778f62ed29e170dece647d48fd28a Signed-off-by: Sunita Nadampalli <sunitan@ti.com> (cherry picked from commit 0b72db0376f805b48574e0192d2d3a020550a957)
2012-10-17Remove libdrmdecrypt.Mike J. Chen
It's now generated by the Android.mk in vendor/google_devices/phantasm/liboemcrypto Change-Id: I63e3293f38bd822d22563b50e1b8485dbcfc54cc Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-17Merged hwc with TI mainline versionMike J. Chen
Change-Id: I8390a3422c6ff8fa4bc4c0e6a11c51a884aba3cb Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-17TI mainline's securityMike J. Chen
Change-Id: I0cf5da4d3b5653244b8ffe9178d45c3582b48897 Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-17TI mainline's DOMXMike J. Chen
Change-Id: I1b6fbb3b897e8caa80c605dcace80114b58e4d40 Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-17TI mainline's libionMike J. Chen
Change-Id: I4b65db028d9f53635f193c74662a765408379e65 Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-17header files from TI mainlineMike J. Chen
New ones from TI mainline and some that override/replace those in bionic and system/core. We use LOCAL_C_INCLUDES for projects that need these headers instead of the AOSP ones (used by prime) in bionic and system/core. Change-Id: Ic8e765b13e3abf5a7a7f5868de014763d46be7ee Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-16Remove sgx prebuiltsMike J. Chen
Moving them to device/google/phantasm. Since the userland sgx prebuilts need to match the prebuilt kernel, they are not really generic and it's easier to make changes atomic if we just keep the prebuilts together in the board specific device project. Change-Id: I1b880b938b715a065683d7c650ef5796a1b697c3 Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-16Add ability to force a preferred mode via a property.Mike J. Chen
Useful for testing. Change-Id: I3c6b05a75c360a7dac73270e4059312ba2ef8e88 Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-16Fake VSYNC events if needed.Mike J. Chen
If HWC clients (aka, surface flinger) want to be receiving vsync events, and HDMI is unplugged, fake the events instead. This is particularly important at startup on JB; the system thinks that it has turned the display on and enabled VSYNC events, failure to deliver them results in Bad Things. We cannot rely on HDMI hardware to delvier the events if the HDMI link is not established, so we just fake them instead. (cherry-picked from 25ab304446afba89283c1a7c7225a69cc3cf4385) Change-Id: Id4806f96d37cf8ad5b6a05d9077b3d88fd24f4d5 Signed-off-by: John Grossman <johngro@google.com>
2012-10-16hwc: Stash hdmi mode resolution in a propertyMike J. Chen
The property can be read by apps like YouTube to choose lower resolution videos if the hdmi mode is < 1080p. Saves bandwidth, latency, and time wasted scaling. (cherry picked from commit ce768b26571c66e176fa6d10c64ded578da937d9) Change-Id: Ia44cc0263f3c77444221c96d73cda0979be3ee28 Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-16OMAP4: HWC : Fix overlay assignement issueDandawate Saket
It was found that when there are more than 4 layers overlay 3 was gettig multiple assignements. This was causing the mouse pointer layer not to show on the screen. (cherry picked from commit fc8f4796e2893e4e0d6b9051fa7a37ecf522f0b8) Signed-off-by: Dandawate Saket <dsaket@ti.com> Signed-off-by: Muralidhar Dixit <murali@ti.com> Conflicts: hwc/hwc.c Change-Id: Id91ecb1dc9f1a0ee7c20c1bf804f5440b0c21034
2012-10-16HWC: OMAP4: disable the first frame display resetTravis Geiselbrecht
A hack to reset the display on the first frame was put in previously to allow for a seamless transition between the boot logo from the bootloader to the boot animation. In our case, the kernel/hwc has already scanned and set the proper hdmi mode, so we dont want to bounce the panel. (cherry picked from commit eafa266c88c496aa539f46407fbdab137b86d2c7) Change-Id: I858185c8a8416bff84ee77f67100c25f754c16b9
2012-10-16HDMI: update mode selection logicTravis Geiselbrecht
The kernel now passes all of the modes to user space with flags to specify whether or not it is preferred or not and if the hardware actually supports the mode. With this, we can try to pick modes that match the 'preferred' mode as specified in the EDID from the panel. If the preferred mode is masked due to the driver, the logic will try to favor available modes that match the resolution of the preferred mode. If none of these options are available, fall back to the older logic of trying to find the best mode to match what the current framebuffer is set to. (cherry picked from commit c63364590d5df4837438ba69b4ba7dad66af3321) Conflicts: hwc/hwc.c Change-Id: Ic796819b60665ec34f4c9967f31f0cc1f2cb7a28
2012-10-16Squelch a particular log message about assigning a z-layer to the fb:Travis Geiselbrecht
"**** should have assigned z-layer for fb" Should find the real reason behind it, but for now it's filling up the system logs. (cherry picked from commit e22bec1a7e61fd1d0355587305c3233e5a44508b) Conflicts: hwc/hwc.c Change-Id: Id1d296d1afde25d7b71a70e1a5d4f40dfbe098f6
2012-10-16hwc: disable using DSS for more than one hw RGB32 layer > 1280x720Travis Geiselbrecht
Current dss hardware seems to be able to handle 2 layers of 1080p RGB32 content before buffer underrunning. One layer (OVL3) is always consumed by the framebuffer, so we're left with at most one 1080p layer from surfaceflinger. Add code to punt the 2nd and above 1080p RGB32 layer to the SGX. This works great for games and video content, since they seem to generally be RGB16 and NV12 layers, which DSS can deal with. (cherry picked from commit 299fdc0df5540a56df0796ff82d153f637c26fa1) Conflicts: hwc/hwc.c Change-Id: I095180dedaf16955996804f795a474c08e47a349
2012-10-16hwc: Add support for FB scaling and cloningDandawate Saket
Patch contains following features 1)Large frame buffer support: Transformation matrix for LCD and HDMI added to ensure correct composition and renderring of all UI layers Added support for overlay distrubution based on FB size and target display 2)Default HDMI display support Support for default HDMI display selection. Added HDMI best mode selection on HPD (cherry picked from commit 8e8bf69d94423df082460c43d818e58046b2d1de) Signed-off-by: Dandawate Saket <dsaket@ti.com> Signed-off-by: Lajos Molnar <molnar@ti.com> Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com> Conflicts: hwc/hwc.c Change-Id: I591577b973405197d3254f3c83138036e67e9789
2012-10-16Security: fix llog build error for tf_daemon, tee_client_apiBryan Buckley
Choose correct llog by changing LOCAL_LDFLAGS to LOCAL_LDLIBS for llog. (cherry picked from commit ead6372c32dd20ee4de99ee3a2d6673e3274a861) Change-Id: I86164615edf114d2fdc6a633561c6ce6641afb2e Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
2012-10-16Security: tf_sdk: Update to 1.06Trusted Logic
Remove sdrv_crypto.h (cherry picked from commit d45edb436df2990e792f4ce375e197143de3e201) Change-Id: I85ba6afccf55afd3a5e5c68a5329a09cbfef98d7 Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
2012-10-16Security: Update tee_client_api, tf_daemon, smc_pa_ctrl to 1.06Bryan Buckley
These three components have not changed with this release. Only changing version header for clarity. (cherry picked from commit 54cc5c655243e9bb73763040c8a04cdc366aa25e) Change-Id: Ife51d93403429513bc6a99adccb2f2c88184b0e4 Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
2012-10-16Security: tee_client_api: Update to 1.06e1Trusted Logic
The TEE Client API defines a communications API for connecting Client Applications running in a rich operating environment with the Secure Services running inside the Trusted Foundations execution environment. The TEE Client API is a static library that must be linked with the calling application or library. The TEE Client API is used to implement higher-level APIs, such as cryptography or secure storage. (cherry picked from commit ccc83471b660f62b65fbc8f566e8a7e404c64540) Change-Id: I4f1d40ddf8fb9eec0b62e2982fc0e25db36ce6a0 Signed-off-by: Bryan Buckley <bryan.buckley@ti.com> Signed-off-by: Yong Zhi <y-zhi@ti.com> Signed-off-by: Jorge E. Solano <x0062302@ti.com>
2012-10-16Security: tf_sdk: Update to 1.06e1Trusted Logic
This contains the C header files for compiling both the normal-world and secure-world software. The rest of the SDK is available in the mshield package. Some of these headers are: cryptoki.h - definitions for the External Cry ptographic API sst.h - definitions for the External Secure Storage API mtc.h - definitions for the External Monotonic Counter API ssdi.h - definitions for SSDI tee_client_api.h - definitions for the TF Client API (cherry picked from commit 41ab3216ed1b54184d0575ef9601394e7ba53f0d) Change-Id: I24828f423456ac12f014a406acee42b60b40ae17 Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
2012-10-16Security: tf_daemon: Update to 1.06e1Trusted Logic
The user-space SMC Daemon is takes care in particular of the effective storage of the SMC secure storage within the device file system. The files in which the SMC persistent data are stored are defined in the Normal-World Configuration File. All the security properties such as confidentiality, integrity, atomicity, anti-rollback and bounding to the device are managed at the SMC PA level. (cherry picked from commit c08b0dc330e67f33fa0a8fb9c62f38b07a9103c9) Change-Id: I62714c8bb3b43ef2897a4b0efd49f88700a1ce55 Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
2012-10-16Security: smc_pa_ctrl: Update to 1.06e1Trusted Logic
A user-land tool application used to install the signed SMC PA in the Secure Environment. This application is just needed for the startup of the SMC PA then it is no longer running. (cherry picked from commit b6f0610ea54d990c121761a11e543e716a63c7ec) Change-Id: I01c02f192b843bf8b8f1b12055c828d9b8e5ff12 Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
2012-10-16Change TARGET_BOARD_PLATFORM_VARIANT check to omap4-aahMike J. Chen
Change-Id: Ib0b97b68f186ce56de60a45df2465d86ced67142 Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-16Add libdrmdecrypt and sgxjb-mr1-dev-plus-aospMike J. Chen
These are copied from vendor/ti/proprietary/omap4 at SHA 73ff514f524f75b68d44e5a81ac29db3064c95f0. Modify mk files so that these are only built if TARGET_BOARD_PLATFORM_VARIANT is ahh. This is a step toward moving phantasm over to hardware/ti/omap4-aah. Change-Id: Ie3eb1702b01c45656caea48abf29d44829ea57b9 Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-16Add libdrmdecrypt and sgxMike J. Chen
These are copied from vendor/ti/proprietary/omap4 at SHA 73ff514f524f75b68d44e5a81ac29db3064c95f0. Modify mk files so that these are only built if TARGET_BOARD_PLATFORM_VARIANT is ahh. This is a step toward moving phantasm over to hardware/ti/omap4-aah. Change-Id: Ie3eb1702b01c45656caea48abf29d44829ea57b9 Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-15Add libdrmdecrypt and sgxMike J. Chen
These are copied from vendor/ti/proprietary/omap4 at SHA 73ff514f524f75b68d44e5a81ac29db3064c95f0. Modify mk files so that these are only built if TARGET_BOARD_PLATFORM_VARIANT is ahh. This is a step toward moving phantasm over to hardware/ti/omap4-aah. Change-Id: Ie3eb1702b01c45656caea48abf29d44829ea57b9 Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-12Initial empty repositoryChad Jones
2012-09-12HWC field was renamedJesse Hall
Change-Id: If08258776db427c45d9ba70cfa79f4d290398ca6
2012-08-24Use new surface flinger API.Jeff Brown
Change-Id: I90a00bd284a5d800f0f0eac5616ffa9ce14303c0
2012-08-22Update for cleanups in hwc interfaceJesse Hall
Change-Id: I7851cd5ca7cd826b3b4b35e6df90ce1e2a9f4327
2012-08-21Update the omap4xxx HWC to use the 1.0 interfacesAndy McFadden
Switch to HWC_DEVICE_API_VERSION_1_0 and the corresponding structures. This change removes special-case handling for Panda, which was using v0.2. This will likely break the Panda display. Change-Id: Id9ba6910ae2285d116f697bfa5af2c1f6b022ce0
2012-08-03Merge "Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries"" into jb-mr1-devJames Dong
2012-08-03Merge "Fix the build." into jb-mr1-devJim Miller
2012-08-03Fix the build.Jim Miller
Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries" This reverts commit 6e18d140dfd80193121abf35764b8dad2f369041 Change-Id: Ia2cb66fc1f88298df675b9085b16c83558dede62
2012-08-03Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries"Edwin Wong
This reverts commit 6e18d140dfd80193121abf35764b8dad2f369041 Change-Id: Idcedbc1cc744c42c06e5c731b3c60355414e6add
2012-08-03Merge "Revert Widevine 6.0.0 -> 4.5.0 libraries" into jb-mr1-devEdwin Wong
2012-08-03Revert Widevine 6.0.0 -> 4.5.0 librariesEdwin Wong
Includes Widevine libraries Version 4.5.0.7809 Also fixed samplePlayer's MediaCodec mode not running and WVDrmInfoRequestStatusKey returning incorrect value. Change-Id: I1d7df9cf3935d7fec143e326f142e974979cc69b related-to-bug: 6929628 related-to-bug: 6833718 related-to-bug: 6889322
2012-08-02am 53835e97: Merge "OMAP4:Panda: Use old hwcomposer API version for panda"Jean-Baptiste Queru
* commit '53835e97845edf78d513010ae4faa8fc467f0a6c': OMAP4:Panda: Use old hwcomposer API version for panda
2012-08-02Merge "OMAP4:Panda: Use old hwcomposer API version for panda"Jean-Baptiste Queru
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 03:19:55 +0000