From 2a6aac596191c08d957a2d0f0dbe5ed6caac1ca5 Mon Sep 17 00:00:00 2001 From: Abhisek Devkota Date: Thu, 7 Jan 2016 21:28:34 -0800 Subject: Revert "libhardware: Only support tertiary display in QTI_BSP is defined" This reverts commit 18396d486dfc07119706370f6e3256bc6de88d30. Change-Id: I8468f31c4c8a9dc8dc23d2190441d635c9ed0f44 --- include/hardware/hwcomposer_defs.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/include/hardware/hwcomposer_defs.h b/include/hardware/hwcomposer_defs.h index a90822a..9c7d790 100644 --- a/include/hardware/hwcomposer_defs.h +++ b/include/hardware/hwcomposer_defs.h @@ -207,26 +207,17 @@ enum { enum { HWC_DISPLAY_PRIMARY = 0, HWC_DISPLAY_EXTERNAL = 1, // HDMI, DP, etc. -#ifdef QTI_BSP HWC_DISPLAY_TERTIARY = 2, HWC_DISPLAY_VIRTUAL = 3, HWC_NUM_PHYSICAL_DISPLAY_TYPES = 3, HWC_NUM_DISPLAY_TYPES = 4, -#else - HWC_DISPLAY_VIRTUAL = 2, - - HWC_NUM_PHYSICAL_DISPLAY_TYPES = 2, - HWC_NUM_DISPLAY_TYPES = 3, -#endif }; enum { HWC_DISPLAY_PRIMARY_BIT = 1 << HWC_DISPLAY_PRIMARY, HWC_DISPLAY_EXTERNAL_BIT = 1 << HWC_DISPLAY_EXTERNAL, -#ifdef QTI_BSP HWC_DISPLAY_TERTIARY_BIT = 1 << HWC_DISPLAY_TERTIARY, -#endif HWC_DISPLAY_VIRTUAL_BIT = 1 << HWC_DISPLAY_VIRTUAL, }; -- cgit v1.1 From 598fdccb0ba155c11857eba320e3673f756518d0 Mon Sep 17 00:00:00 2001 From: "Arun Kumar K.R" Date: Wed, 2 Dec 2015 18:58:50 -0800 Subject: hardware/libhw: Add display_defs.h to declare custom enums/flags hwcomposer: Add HWC_BLIT compositiontype value - HWC_BLIT this layer will be handled in the HWC, using a blit engine - setting this will inform Surfaceflinger to flip FB_TARGET change-Id: I25d19ec41b57863d451c3e390109c912faf1381c libhardware: Disable rotation animation on External - Added two new flags to used to inform HWC about rotation and roation animation to HWC - This is used to disable rotation animation on external change-Id: I05a9796781dcda088ae6cd64481cd4e581d5cf9e Change-Id: Idbc7e43d4fa8ec2299b4c7ee8378a1afd710cdf1 --- include/hardware/display_defs.h | 67 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 include/hardware/display_defs.h diff --git a/include/hardware/display_defs.h b/include/hardware/display_defs.h new file mode 100644 index 0000000..669ef78 --- /dev/null +++ b/include/hardware/display_defs.h @@ -0,0 +1,67 @@ +/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef ANDROID_INCLUDE_DISPLAY_DEFS_H +#define ANDROID_INCLUDE_DISPLAY_DEFS_H + +#include +#include + +#include + +__BEGIN_DECLS + +/* Will need to update below enums if hwcomposer_defs.h is updated */ + +/* Extended events for hwc_methods::eventControl() */ +enum { + HWC_EVENT_ORIENTATION = HWC_EVENT_VSYNC + 1 +}; + + +/* Extended hwc_layer_t::compositionType values */ +enum { + /* this layer will be handled in the HWC, using a blit engine */ + HWC_BLIT = 0xFF +}; + +/* Extended hwc_layer_t::flags values + * Flags are set by SurfaceFlinger and read by the HAL + */ +enum { + /* + * HWC_SCREENSHOT_ANIMATOR_LAYER is set by surfaceflinger to indicate + * that this layer is a screenshot animating layer. HWC uses this + * info to disable rotation animation on External Display + */ + HWC_SCREENSHOT_ANIMATOR_LAYER = 0x00000004 +}; + +__END_DECLS + +#endif /* ANDROID_INCLUDE_DISPLAY_DEFS_H*/ -- cgit v1.1 From a9d594346e338b571713654b839be333b447e8c5 Mon Sep 17 00:00:00 2001 From: Abhisek Devkota Date: Fri, 8 Jan 2016 11:40:13 -0800 Subject: Revert "Revert "libhardware: Only support tertiary display in QTI_BSP is defined"" This reverts commit 2a6aac596191c08d957a2d0f0dbe5ed6caac1ca5. Change-Id: Ibca901e9f3939b333c767e5cbe6f7849757675f3 --- include/hardware/hwcomposer_defs.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/hardware/hwcomposer_defs.h b/include/hardware/hwcomposer_defs.h index 9c7d790..a90822a 100644 --- a/include/hardware/hwcomposer_defs.h +++ b/include/hardware/hwcomposer_defs.h @@ -207,17 +207,26 @@ enum { enum { HWC_DISPLAY_PRIMARY = 0, HWC_DISPLAY_EXTERNAL = 1, // HDMI, DP, etc. +#ifdef QTI_BSP HWC_DISPLAY_TERTIARY = 2, HWC_DISPLAY_VIRTUAL = 3, HWC_NUM_PHYSICAL_DISPLAY_TYPES = 3, HWC_NUM_DISPLAY_TYPES = 4, +#else + HWC_DISPLAY_VIRTUAL = 2, + + HWC_NUM_PHYSICAL_DISPLAY_TYPES = 2, + HWC_NUM_DISPLAY_TYPES = 3, +#endif }; enum { HWC_DISPLAY_PRIMARY_BIT = 1 << HWC_DISPLAY_PRIMARY, HWC_DISPLAY_EXTERNAL_BIT = 1 << HWC_DISPLAY_EXTERNAL, +#ifdef QTI_BSP HWC_DISPLAY_TERTIARY_BIT = 1 << HWC_DISPLAY_TERTIARY, +#endif HWC_DISPLAY_VIRTUAL_BIT = 1 << HWC_DISPLAY_VIRTUAL, }; -- cgit v1.1