hwc: Add support for HDMI as Primary display
We are adding support for HDMI as Primary to the display HAL.
The HAL must be able to support boot-up use cases and cable
connect/disconnect events as follows:
1. Boot up with HDMI cable connected
For this scenario we read the best mode supported by the
HDMI TV and set that as the current and default mode for
subsequent boot up.
2. Boot up without HDMI cable connected
We read a default resolution from the driver by reading vscreen
and reporting this as the display resolution to SF.
3. Switch the display to active state when we receive first frame
When HDMI is primary we should rely on the first valid
draw call in order to activate the display
4. Update handling of uevents when HDMI is primary
a) Do not send hot plug when the cable is connected/disconnected.
b) Use the correct display ID in uevents when HDMI is primary
5. Handle display timeout when HDMI is Primary
When HDMI is connected as primary we clean up resources
and call commit to generate a black frame on the interface.
However, we do not call blank since we need the timing
generator and HDMI core to remain turned on.
6. Clear pipe resource when HDMI is disconnected
When HDMI is primary, we need to make sure that SF/HWC does
not have any open fd's when the cable is disconnected.
We clear all pipe resources and call a display commit to ensure
that all the fd's are closed. This will ensure that the HDMI
core turns off and that we receive an event the next time the
cable is connected.
Change-Id: Ice70add583a3859f99bfa2e384fbbb6df4df92e1
diff --git a/libhwcomposer/hwc_uevents.cpp b/libhwcomposer/hwc_uevents.cpp
index 6b2316b..d1c68a5 100644
--- a/libhwcomposer/hwc_uevents.cpp
+++ b/libhwcomposer/hwc_uevents.cpp
@@ -39,11 +39,18 @@
#define HWC_UEVENT_THREAD_NAME "hwcUeventThread"
/* Parse uevent data for devices which we are interested */
-static int getConnectedDisplay(const char* strUdata)
+static int getConnectedDisplay(hwc_context_t* ctx, const char* strUdata)
{
- if(strcasestr("change@/devices/virtual/switch/hdmi", strUdata))
- return HWC_DISPLAY_EXTERNAL;
- return -1;
+ int ret = -1;
+ // Switch node for HDMI as PRIMARY/EXTERNAL
+ if(strcasestr("change@/devices/virtual/switch/hdmi", strUdata)) {
+ if (ctx->mHDMIDisplay->isHDMIPrimaryDisplay()) {
+ ret = HWC_DISPLAY_PRIMARY;
+ } else {
+ ret = HWC_DISPLAY_EXTERNAL;
+ }
+ }
+ return ret;
}
static bool getPanelResetStatus(hwc_context_t* ctx, const char* strUdata, int len)
@@ -86,7 +93,7 @@
return;
}
- int dpy = getConnectedDisplay(udata);
+ int dpy = getConnectedDisplay(ctx, udata);
if(dpy < 0) {
ALOGD_IF(UEVENT_DEBUG, "%s: Not disp Event ", __FUNCTION__);
return;
@@ -108,16 +115,16 @@
}
ctx->mDrawLock.lock();
- destroyCompositionResources(ctx, dpy);
- ctx->mHDMIDisplay->teardown();
- resetDisplayInfo(ctx, dpy);
+ handle_offline(ctx, dpy);
ctx->mDrawLock.unlock();
/* We need to send hotplug to SF only when we are disconnecting
- * HDMI */
- ALOGE_IF(UEVENT_DEBUG,"%s:Sending EXTERNAL OFFLINE hotplug"
- "event", __FUNCTION__);
- ctx->proc->hotplug(ctx->proc, dpy, EXTERNAL_OFFLINE);
+ * HDMI as an external display. */
+ if(dpy == HWC_DISPLAY_EXTERNAL) {
+ ALOGE_IF(UEVENT_DEBUG,"%s:Sending EXTERNAL OFFLINE hotplug"
+ "event", __FUNCTION__);
+ ctx->proc->hotplug(ctx->proc, dpy, EXTERNAL_OFFLINE);
+ }
break;
}
case EXTERNAL_ONLINE:
@@ -128,19 +135,29 @@
"for display: %d", __FUNCTION__, dpy);
break;
}
- ctx->mDrawLock.lock();
- //Force composition to give up resources like pipes and
- //close fb. For example if assertive display is going on,
- //fb2 could be open, thus connecting Layer Mixer#0 to
- //WriteBack module. If HDMI attempts to open fb1, the driver
- //will try to attach Layer Mixer#0 to HDMI INT, which will
- //fail, since Layer Mixer#0 is still connected to WriteBack.
- //This block will force composition to close fb2 in above
- //example.
- ctx->dpyAttr[dpy].isConfiguring = true;
- ctx->mDrawLock.unlock();
- ctx->proc->invalidate(ctx->proc);
+ if (ctx->mHDMIDisplay->isHDMIPrimaryDisplay()) {
+ ctx->mDrawLock.lock();
+ handle_online(ctx, dpy);
+ ctx->mDrawLock.unlock();
+
+ ctx->proc->invalidate(ctx->proc);
+ break;
+ } else {
+ ctx->mDrawLock.lock();
+ //Force composition to give up resources like pipes and
+ //close fb. For example if assertive display is going on,
+ //fb2 could be open, thus connecting Layer Mixer#0 to
+ //WriteBack module. If HDMI attempts to open fb1, the driver
+ //will try to attach Layer Mixer#0 to HDMI INT, which will
+ //fail, since Layer Mixer#0 is still connected to WriteBack.
+ //This block will force composition to close fb2 in above
+ //example.
+ ctx->dpyAttr[dpy].isConfiguring = true;
+ ctx->mDrawLock.unlock();
+
+ ctx->proc->invalidate(ctx->proc);
+ }
//2 cycles for slower content
usleep(ctx->dpyAttr[HWC_DISPLAY_PRIMARY].vsync_period
* 2 / 1000);