ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am ef64b75a: Don\'t log an error on HWC1.1+ devices with no FB HAL

Browse Source 
* commit 'ef64b75a936ffd194673dbce6766995f86b42ba9':
  Don't log an error on HWC1.1+ devices with no FB HAL
This commit is contained in:
Jesse Hall 2013-03-19 20:49:09 +00:00 committed by Android Git Automerger
commit 4af2b42b58
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
services/surfaceflinger/DisplayHardware/HWComposer.cpp
View File

@ -99,7 +99,7 @@ HWComposer::HWComposer(
bool needVSyncThread = true; bool needVSyncThread = true;
// Note: some devices may insist that the FB HAL be opened before HWC. // Note: some devices may insist that the FB HAL be opened before HWC.
loadFbHalModule(); int fberr = loadFbHalModule();
loadHwcModule(); loadHwcModule();
if (mFbDev && mHwc && hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1)) { if (mFbDev && mHwc && hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1)) {
@ -113,7 +113,8 @@ HWComposer::HWComposer(
// If we have no HWC, or a pre-1.1 HWC, an FB dev is mandatory. // If we have no HWC, or a pre-1.1 HWC, an FB dev is mandatory.
if ((!mHwc || !hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1)) if ((!mHwc || !hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1))
&& !mFbDev) { && !mFbDev) {
ALOGE("ERROR: failed to open framebuffer, aborting"); ALOGE("ERROR: failed to open framebuffer (%s), aborting",
strerror(-fberr));
abort(); abort();
} }
@ -234,20 +235,17 @@ void HWComposer::loadHwcModule()
} }
// Load and prepare the FB HAL, which uses the gralloc module. Sets mFbDev. // Load and prepare the FB HAL, which uses the gralloc module. Sets mFbDev.
void HWComposer::loadFbHalModule() int HWComposer::loadFbHalModule()
{ {
hw_module_t const* module; hw_module_t const* module;
if (hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module) != 0) { int err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module);
if (err != 0) {
ALOGE("%s module not found", GRALLOC_HARDWARE_MODULE_ID); ALOGE("%s module not found", GRALLOC_HARDWARE_MODULE_ID);
return; return err;
} }
int err = framebuffer_open(module, &mFbDev); return framebuffer_open(module, &mFbDev);
if (err) {
ALOGE("framebuffer_open failed (%s)", strerror(-err));
return;
}
} }
status_t HWComposer::initCheck() const { status_t HWComposer::initCheck() const {

2
services/surfaceflinger/DisplayHardware/HWComposer.h
View File

@ -265,7 +265,7 @@ public:
private: private:
void loadHwcModule(); void loadHwcModule();
void loadFbHalModule(); int loadFbHalModule();
LayerListIterator getLayerIterator(int32_t id, size_t index); LayerListIterator getLayerIterator(int32_t id, size_t index);