summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix HDMI unblank behaviorAndy McFadden2012-10-102-2/+4
| | | | | | | | | | | | | | | | | | | Two issues: (1) We were announcing the hotplug event before we were ready to handle blank/unblank events, so we were losing the initial unblank that power manager sends us when HDMI is first plugged in. This left the display blank until you toggled the device power off/on. (2) We were retaining fbTargetHandle for HDMI after the display was disconnected. The value didn't get updated when HDMI was reconnected because the display was blank, so we didn't go through that code path. So, when HDMI was re-connected, we passed stale data into the HWC. Bug 7323938 Change-Id: I2335d24fd7b0f00bb23fc63aa7bcf44cb8857c73
* Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-devMathias Agopian2012-10-091-1/+1
|\
| * fix typo that prevented proper loging of EGL error codeMathias Agopian2012-10-091-1/+1
| | | | | | | | | | | | | | needed for investigating 7309949 Bug: 7309949 Change-Id: If29a5c08d0e87f46b44ba2e1030be61cb4d1403b
* | Merge "don't automatically unblank external displays" into jb-mr1-devJeff Brown2012-10-091-6/+0
|\ \ | |/ |/|
| * don't automatically unblank external displaysMathias Agopian2012-10-091-6/+0
| | | | | | | | | | | | | | | | | | | | this should be handled by the display-manager. we were doing that in SF because until recently we didn't have enough support in the HAL. however, this is now causing other problems when plugging hdmi while the screen is off for instance. Bug: 7150885 Change-Id: I739b209056a765d38d05295cf202f67ee0f506ae
* | Merge "Fence didn't manager sync_wait error codes properly" into jb-mr1-devMathias Agopian2012-10-092-7/+8
|\ \ | |/ |/|
| * Fence didn't manager sync_wait error codes properlyMathias Agopian2012-10-092-7/+8
| | | | | | | | | | | | | | | | | | | | error codes are returned in errno, this caused ::waitForwever() to only wait for 1 second and return improper error code (-1). needed to help debugging 7316632 Bug: 7316632 Change-Id: Ie144f614a88393393972a3a770c6b4b0581f961a
* | Add blankDisplay/unblankDisplay to SurfaceComposerClient.Jeff Brown2012-10-082-0/+14
|/ | | | | Bug: 7309812 Change-Id: Ia401d642094a46c62f0d26c65da1d11341e203a1
* fix dumpsys Layer name when using multiple displaysMathias Agopian2012-10-084-5/+16
| | | | | Bug: 7288401 Change-Id: I14beeef58fac5270cef3b611e18c163060efe6c3
* fix SurfaceFlinger DDMS debuggingMathias Agopian2012-10-072-3/+4
| | | | | | | | | DdmHandleAppName.setAppName() signature changed which broke this debugging feature. Needed for debugging b\7267680 Change-Id: I4482bf5a441e91bef89d1ddea9a4152333be7f88
* Merge "Revert "ugly, temporary, workaroung for a problem where a binder ↵Dave Burke2012-10-071-12/+0
|\ | | | | | | thread spins forever"" into jb-mr1-dev
| * Revert "ugly, temporary, workaroung for a problem where a binder thread ↵Dave Burke2012-10-061-12/+0
| | | | | | | | | | | | | | | | spins forever" This reverts commit 0845d0245e09548110cacb0f20e9934753388aab Change-Id: I395037cb9427cd11f7de6bb78fbdfa917fc6263a
* | Merge "ugly, temporary, workaroung for a problem where a binder thread spins ↵Dave Burke2012-10-051-0/+12
|\ \ | |/ | | | | forever" into jb-mr1-dev
| * ugly, temporary, workaroung for a problem where a binder thread spins foreverMathias Agopian2012-10-051-0/+12
| | | | | | | | | | Bug: 7289992 Change-Id: I0c3d482a1af57e5f444be2ba7f2751ac3e954af2
* | Fix race condition in ConsumerBase::addReleaseFence()Jesse Hall2012-10-054-5/+11
|/ | | | | | | | | | | This needs the ConsumerBase mutex locked, but wasn't locking it. Two of the four places that called it already held the lock so were fine. Now addReleaseFence() takes the lock itself, and I added addReleaseFenceLocked() for the two already-locked callers, since in one of them dropping the lock would be inconvenient. Bug: 7289269 Change-Id: I7a5628adb516f8eec782aa6c14128202f96d7b0a
* Merge "Fix missing parens in CleanSpec.mk." into jb-mr1-devStephen Hines2012-10-041-0/+1
|\
| * Fix missing parens in CleanSpec.mk.Stephen Hines2012-10-041-0/+1
| | | | | | | | Change-Id: I0440a942d3e685d619ec9cc402d3293cb3f52df1
* | Merge "Tone down a fatal assert" into jb-mr1-devMathias Agopian2012-10-041-2/+5
|\ \ | |/ |/|
| * Tone down a fatal assertAndy McFadden2012-10-041-2/+5
| | | | | | | | | | | | | | | | | | The new disconnectDisplay function doesn't handle virtual displays, but it may be called for them. Return without doing anything. Bug 7281786 Change-Id: I62607f2ae6073fa66b393f55932604aeb8e03566
* | Merge "Add GL Error logs (temporary)" into jb-mr1-devChet Haase2012-10-042-1/+13
|\ \
| * | Add GL Error logs (temporary)Chet Haase2012-10-042-1/+13
| | | | | | | | | | | | | | | | | | Adding logs to tell which specific methods throw OpenGL errors. Change-Id: I1d73c7566ed1ea6610392020411762c6255a0ede
* | | Fix broken CleanSpec.mk in libs/guiRaph Levien2012-10-041-1/+1
| |/ |/| | | | | | | | | | | | | | | | | | | The CleanSpec is missing parens, which causes $P to be interpreted as a single variable, and the following printed to the log: Clean step: rm -rf RODUCT_OUT/obj/SHARED_LIBRARIES/libgui_intermediates This patch adds parens as needed. Change-Id: I587998fa67a4884418c286360a577cdbb6ea9a21
* | Ignore display state changes for disconnected displaysJesse Hall2012-10-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | When a display is disconnected, removing it from SurfaceFlinger's display list is non-atomic with removing it from the Display Manager and any in-flight transactions. So SurfaceFlinger might get a display state change transaction for a display it has already forgotten about. Just ignore these. Bug: 7288082 Change-Id: Ic27e55377f3db40fb34e3b1cd67e43297df117a2
* | make sure we don't call into the HWC HAL when not neededMathias Agopian2012-10-045-24/+47
| | | | | | | | | | | | | | | | | | when enabling/disabling vsync we now make sure to not call into the HAL if the state wouldn't change. Bug: 7274951 Change-Id: Ie24a6d68888a51b577acf9c2a973d85437cbacaf
* | Fix crashes after HDMI disconnectAndy McFadden2012-10-043-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The display was being removed from SurfaceFlinger's list before we had a chance to reset HWComposer's layer list, so we were passing stale data into the hardware composer (which has its own per-display data). This resulted in "invalid gralloc handle" complaints. We now clear the layer list immediately after removing the display. The display was being removed while its EGLSurface was still "current", resulting in "cancelBuffer: BufferQueue has been abandoned" complaints. We now call makeCurrent on the primary display before removing the external display. Bug 7274254 Change-Id: Ia59e3a61d7ec46488b96bf93ec5e4ed3488b70e4
* | libgui: enable fence support for exynos5Jamie Gennis2012-10-032-1/+3
| | | | | | | | | | Change-Id: Iffc48412b8c951116a956a3ac7dab8d75eed13da Bug: 7238122
* | libgui: fix up compile optionsJamie Gennis2012-10-034-51/+12
|/ | | | | | | | | This change adds debug info to SurfaceFlinger's dumpsys to indicate that the USE_WAIT_SYNC compile option was enabled, and it removes the ALLOW_DEQUEUE_CURRENT_BUFFER option. Bug: 7238122 Change-Id: I70e08e34c2ef58aa6d2f88229e781a119f84b5a9
* Merge "Fix issue #7271589: Cannot set Ocean HD live wallpaper" into jb-mr1-devDianne Hackborn2012-10-032-2/+2
|\
| * Fix issue #7271589: Cannot set Ocean HD live wallpaperDianne Hackborn2012-10-032-2/+2
| | | | | | | | Change-Id: Id7662c503815293040c240232a6622bd6f6eab37
* | Add Fence::waitForever which logs a warning timeout, and use itJesse Hall2012-10-027-9/+34
|/ | | | | Bug: 7217641 Change-Id: If0c1a613ead307c4045a47824174bf40c72bc7d7
* Revert "improve sensor fusion" -- DO NOT MERGEMathias Agopian2012-10-011-56/+9
| | | | | | | | | | | This reverts commit bdf277355dcd647bd5d27b38fc107243a2247a02. This reverts commit dc5b63e40ee697324d39fe105d6f12c2bb031fc6. it might be responsible for a regression that makes the rotation vector spin. Bug: 7267330 Change-Id: Ifb10e933537e70c1d85a7ba73a7e3ae59002fe62
* Merge "Include Global table in bugreports." into jb-mr1-devJeff Sharkey2012-10-011-1/+1
|\
| * Include Global table in bugreports.Jeff Sharkey2012-10-011-1/+1
| | | | | | | | | | Bug: 7257648 Change-Id: I84c7230fd115cf9d7269bc5367026b52cbcc86ac
* | SurfaceFlinger: reset the FB_TGT acquire fenceJamie Gennis2012-10-011-0/+1
| | | | | | | | | | | | | | | | | | | | This change makes SurfaceFlinger reset the acquire fence fd to -1 after each call to HWComposer::commit. The HWComposer implementation is resonsible for closing the fd, so SurfaceFlinger should make sure not to pass it to HWC multiple times. Change-Id: I79554d9f6d6ef2b77d632d40251516c1f5b16ddb Bug: 7258954
* | Merge "Fix issue #7257947: Need to fix heap limits on Mako" into jb-mr1-devDianne Hackborn2012-10-012-2/+28
|\ \
| * | Fix issue #7257947: Need to fix heap limits on MakoDianne Hackborn2012-09-302-2/+28
| |/ | | | | | | Change-Id: Id8014b19195b8740bccf000ab66c1b599ba3a1a0
* | save/restore viewport properly when taking screenshotMathias Agopian2012-09-302-1/+4
|/ | | | | Bug: 7241739 Change-Id: Iba8b9ffc75ab47fbc56169e65da26d96850a9297
* reset GL viewport and project when caputring the screenMathias Agopian2012-09-283-7/+15
| | | | | Bug: 7241739 Change-Id: I3bb5214b070384de9be2026647865c6c236a4331
* Pass display arg to blank/unblankAndy McFadden2012-09-286-43/+84
| | | | | | | | This allows us to blank and unblank displays other than the built-in display (e.g. HDMI). Bug: 7240511 Change-Id: I89ea13f9e497be74c3e1231d0c62fb558e93e0f8
* Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-devChet Haase2012-09-281-1/+1
|\
| * Re-enable FAST_TLS in gl2 codeChet Haase2012-09-281-1/+1
| | | | | | | | | | | | | | Temporarily changed USE_FAST_TLS_KEY ifdef during debugging. Changing it back now. Change-Id: I7c2fcf7265b3d545e31ff7683bd7614100fad3e5
* | Merge "Add a way to configure an OMX encoder to emit SPS/PPS before IDR ↵Andreas Huber2012-09-281-0/+10
|\ \ | | | | | | | | | frames." into jb-mr1-dev
| * | Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames.Andreas Huber2012-09-281-0/+10
| |/ | | | | | | | | Change-Id: I71ce254533c8e99bc54d199d8a9828397fe3d99d related-to-bug: 7245308
* | SurfaceFlinger: don't always set HWC_GEOM_CHGDJamie Gennis2012-09-271-21/+35
|/ | | | | | | | This change fixes a bug in SurfaceFlinger that caused the HWC_GEOMETRY_CHANGED flag to be set every flip. Change-Id: I4f395a2883bcbb53b23b3d14941aff108739c9f0 Bug: 7234237
* Merge "New compile-time flags to make debugging easier for us poor souls Bug ↵Romain Guy2012-09-271-1/+11
|\ | | | | | | #7195815" into jb-mr1-dev
| * New compile-time flags to make debugging easier for us poor soulsRomain Guy2012-09-271-1/+11
| | | | | | | | | | | | Bug #7195815 Change-Id: I23e7ac991891b9586cb8ed20b1305c8b1b3e2b43
* | Revert "Compatibility work around for bad graphics driver dependency."Iliyan Malchev2012-09-272-14/+0
|/ | | | | | This reverts commit a50b51c03aca449920fc8581a738032a7bce7150 Change-Id: Ibdcd776a7f241dbb2475403ea04f939249774c41
* Merge "assert -eng builds when calling a GL function without a context" into ↵Mathias Agopian2012-09-261-2/+7
|\ | | | | | | jb-mr1-dev
| * assert -eng builds when calling a GL function without a contextMathias Agopian2012-09-261-2/+7
| | | | | | | | | | | | Bug: 7241626 Change-Id: I0f1f9361e75e9186af8cff8d98a7d2224b266765
* | Merge "Recompute visible regions more vigorously" into jb-mr1-devAndy McFadden2012-09-261-3/+3
|\ \ | |/ |/|