diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-01-15 21:06:12 +0100 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-01-16 14:42:39 -0800 |
| commit | 3d05f9cfbd996f52c0bd6307a80beaabc4e58140 (patch) | |
| tree | 421ed9012dfbcdbc463f52b13c3c835023df7ea3 /modules/gralloc/framebuffer.cpp | |
| parent | 158549c89405186d9ecaefd3811cfae3949056ee (diff) | |
| download | hardware_libhardware-3d05f9cfbd996f52c0bd6307a80beaabc4e58140.zip hardware_libhardware-3d05f9cfbd996f52c0bd6307a80beaabc4e58140.tar.gz hardware_libhardware-3d05f9cfbd996f52c0bd6307a80beaabc4e58140.tar.bz2 | |
Merge 80d3699c: gralloc: Fix division-by-0 during system emulation.
This patch avoids a division-by-0 when the system is running
under emulation (the kernel driver reports pixclock as 0, for
some reason). Which results in a SIGFPE during the boot sequence.
Change-Id: Ia9febdf143dcbce9837ca89c641e95dce3a888bb
Diffstat (limited to 'modules/gralloc/framebuffer.cpp')
| -rw-r--r-- | modules/gralloc/framebuffer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp index a487b5d..59c5001 100644 --- a/modules/gralloc/framebuffer.cpp +++ b/modules/gralloc/framebuffer.cpp @@ -213,13 +213,17 @@ int mapFrameBufferLocked(struct private_module_t* module) if (ioctl(fd, FBIOGET_VSCREENINFO, &info) == -1) return -errno; - int refreshRate = 1000000000000000LLU / + uint64_t refreshQuotient = ( uint64_t( info.upper_margin + info.lower_margin + info.yres ) * ( info.left_margin + info.right_margin + info.xres ) * info.pixclock ); + /* Beware, info.pixclock might be 0 under emulation, so avoid a + * division-by-0 here (SIGFPE on ARM) */ + int refreshRate = refreshQuotient > 0 ? (int)(1000000000000000LLU / refreshQuotient) : 0; + if (refreshRate == 0) { // bleagh, bad info from the driver refreshRate = 60*1000; // 60 Hz |