sdm: Add independent hardware event thread for display events
- Add independent hardware event thread and interface to allow
individual displays to register for events such as vsync or
CEC messages
- Add support for polling, reading and sending CEC messages
to the CEC HAL layer
CRs-Fixed: 814136
Change-Id: Ia2e59c7541b1448b1772e5bfa13e28533ec1ea30
diff --git a/sdm/include/core/display_interface.h b/sdm/include/core/display_interface.h
index 0416daa..a74b34b 100644
--- a/sdm/include/core/display_interface.h
+++ b/sdm/include/core/display_interface.h
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2014 - 2015, The Linux Foundation. All rights reserved.
+* Copyright (c) 2014 - 2016, 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:
@@ -144,6 +144,16 @@
*/
virtual DisplayError Refresh() = 0;
+ /*! @brief Event handler for CEC messages.
+
+ @details This event is dispatched to send CEC messages to the CEC HAL.
+
+ @param[in] message message to be sent
+
+ @return \link DisplayError \endlink
+ */
+ virtual DisplayError CECMessage(char *message) = 0;
+
protected:
virtual ~DisplayEventHandler() { }
};
diff --git a/sdm/libs/core/Android.mk b/sdm/libs/core/Android.mk
index 218ff98..5e88683 100644
--- a/sdm/libs/core/Android.mk
+++ b/sdm/libs/core/Android.mk
@@ -29,6 +29,7 @@
$(LOCAL_HW_INTF_PATH)/hw_hdmi.cpp \
$(LOCAL_HW_INTF_PATH)/hw_virtual.cpp \
$(LOCAL_HW_INTF_PATH)/hw_color_manager.cpp \
- $(LOCAL_HW_INTF_PATH)/hw_scale.cpp
+ $(LOCAL_HW_INTF_PATH)/hw_scale.cpp \
+ $(LOCAL_HW_INTF_PATH)/hw_events.cpp
include $(BUILD_SHARED_LIBRARY)
diff --git a/sdm/libs/core/display_base.cpp b/sdm/libs/core/display_base.cpp
index 7580c79..9fce6a6 100644
--- a/sdm/libs/core/display_base.cpp
+++ b/sdm/libs/core/display_base.cpp
@@ -117,6 +117,8 @@
comp_manager_->UnregisterDisplay(display_comp_ctx_);
+ HWEventsInterface::Destroy(hw_events_intf_);
+
return kErrorNone;
}
diff --git a/sdm/libs/core/display_base.h b/sdm/libs/core/display_base.h
index 8251d20..27d10f6 100644
--- a/sdm/libs/core/display_base.h
+++ b/sdm/libs/core/display_base.h
@@ -34,6 +34,7 @@
#include "hw_interface.h"
#include "comp_manager.h"
#include "color_manager.h"
+#include "hw_events_interface.h"
namespace sdm {
@@ -103,6 +104,7 @@
HWInfoInterface *hw_info_intf_ = NULL;
ColorManagerProxy *color_mgr_ = NULL; // each display object owns its ColorManagerProxy
bool partial_update_control_ = true;
+ HWEventsInterface *hw_events_intf_ = NULL;
private:
// Unused
diff --git a/sdm/libs/core/display_hdmi.cpp b/sdm/libs/core/display_hdmi.cpp
index 773016a..331ddcc 100644
--- a/sdm/libs/core/display_hdmi.cpp
+++ b/sdm/libs/core/display_hdmi.cpp
@@ -70,6 +70,7 @@
error = DisplayBase::Init();
if (error != kErrorNone) {
HWHDMI::Destroy(hw_intf_);
+ return error;
}
GetScanSupport();
@@ -85,6 +86,14 @@
(kS3dFormatTopBottom, kS3DModeTB));
s3d_format_to_mode_.insert(std::pair<LayerBufferS3DFormat, HWS3DMode>
(kS3dFormatFramePacking, kS3DModeFP));
+
+ error = HWEventsInterface::Create(INT(display_type_), this, &event_list_, &hw_events_intf_);
+ if (error != kErrorNone) {
+ DisplayBase::Deinit();
+ HWHDMI::Destroy(hw_intf_);
+ DLOGE("Failed to create hardware events interface. Error = %d", error);
+ }
+
return error;
}
@@ -355,5 +364,9 @@
}
}
+void DisplayHDMI::CECMessage(char *message) {
+ event_handler_->CECMessage(message);
+}
+
} // namespace sdm
diff --git a/sdm/libs/core/display_hdmi.h b/sdm/libs/core/display_hdmi.h
index ca33035..15a0019 100644
--- a/sdm/libs/core/display_hdmi.h
+++ b/sdm/libs/core/display_hdmi.h
@@ -25,6 +25,7 @@
#ifndef __DISPLAY_HDMI_H__
#define __DISPLAY_HDMI_H__
+#include <vector>
#include <map>
#include "display_base.h"
@@ -34,7 +35,7 @@
class HWHDMIInterface;
-class DisplayHDMI : public DisplayBase, DumpImpl {
+class DisplayHDMI : public DisplayBase, DumpImpl, HWEventHandler {
public:
DisplayHDMI(DisplayEventHandler *event_handler, HWInfoInterface *hw_info_intf,
BufferSyncHandler *buffer_sync_handler, CompManager *comp_manager,
@@ -65,6 +66,13 @@
virtual void AppendDump(char *buffer, uint32_t length);
virtual DisplayError SetCursorPosition(int x, int y);
+ // Implement the HWEventHandlers
+ virtual DisplayError VSync(int64_t timestamp) { return kErrorNone; }
+ virtual DisplayError Blank(bool blank) { return kErrorNone; }
+ virtual void IdleTimeout() { }
+ virtual void ThermalEvent(int64_t thermal_level) { }
+ virtual void CECMessage(char *message);
+
private:
virtual uint32_t GetBestConfig(HWS3DMode s3d_mode);
virtual void GetScanSupport();
@@ -73,6 +81,7 @@
Locker locker_;
HWScanSupport scan_support_;
std::map<LayerBufferS3DFormat, HWS3DMode> s3d_format_to_mode_;
+ std::vector<const char *> event_list_ = {"cec/rd_msg", "thread_exit"};
};
} // namespace sdm
diff --git a/sdm/libs/core/display_primary.cpp b/sdm/libs/core/display_primary.cpp
index e824dbe..9e12c8a 100644
--- a/sdm/libs/core/display_primary.cpp
+++ b/sdm/libs/core/display_primary.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2014 - 2015, The Linux Foundation. All rights reserved.
+* Copyright (c) 2014 - 2016, 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:
@@ -45,7 +45,7 @@
SCOPE_LOCK(locker_);
DisplayError error = HWPrimary::Create(&hw_intf_, hw_info_intf_,
- DisplayBase::buffer_sync_handler_, this);
+ DisplayBase::buffer_sync_handler_);
if (error != kErrorNone) {
return error;
@@ -67,6 +67,13 @@
}
}
+ error = HWEventsInterface::Create(INT(display_type_), this, &event_list_, &hw_events_intf_);
+ if (error != kErrorNone) {
+ DLOGE("Failed to create hardware events interface. Error = %d", error);
+ DisplayBase::Deinit();
+ HWPrimary::Destroy(hw_intf_);
+ }
+
return error;
}
diff --git a/sdm/libs/core/display_primary.h b/sdm/libs/core/display_primary.h
index b0f2934..d3a37cd 100644
--- a/sdm/libs/core/display_primary.h
+++ b/sdm/libs/core/display_primary.h
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2014 - 2015, The Linux Foundation. All rights reserved.
+* Copyright (c) 2014 - 2016, 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:
@@ -25,6 +25,8 @@
#ifndef __DISPLAY_PRIMARY_H__
#define __DISPLAY_PRIMARY_H__
+#include <vector>
+
#include "display_base.h"
#include "dump_impl.h"
@@ -68,10 +70,13 @@
virtual DisplayError Blank(bool blank);
virtual void IdleTimeout();
virtual void ThermalEvent(int64_t thermal_level);
+ virtual void CECMessage(char *message) { }
private:
Locker locker_;
uint32_t idle_timeout_ms_ = 0;
+ std::vector<const char *> event_list_ = {"vsync_event", "show_blank_event", "idle_notify",
+ "msm_fb_thermal_level", "thread_exit"};
};
} // namespace sdm
diff --git a/sdm/libs/core/fb/hw_device.cpp b/sdm/libs/core/fb/hw_device.cpp
index 694afd2..33974bf 100644
--- a/sdm/libs/core/fb/hw_device.cpp
+++ b/sdm/libs/core/fb/hw_device.cpp
@@ -58,11 +58,9 @@
buffer_sync_handler_(buffer_sync_handler), synchronous_commit_(false) {
}
-DisplayError HWDevice::Init(HWEventHandler *eventhandler) {
+DisplayError HWDevice::Init() {
char device_name[64] = {0};
- event_handler_ = eventhandler;
-
// Read the fb node index
fb_node_index_ = GetFBNodeIndex(device_type_);
if (fb_node_index_ == -1) {
diff --git a/sdm/libs/core/fb/hw_device.h b/sdm/libs/core/fb/hw_device.h
index 82a9ee6..d839c97 100644
--- a/sdm/libs/core/fb/hw_device.h
+++ b/sdm/libs/core/fb/hw_device.h
@@ -78,7 +78,7 @@
virtual DisplayError SetScaleLutConfig(HWScaleLutInfo *lut_info);
// For HWDevice derivatives
- virtual DisplayError Init(HWEventHandler *eventhandler);
+ virtual DisplayError Init();
virtual DisplayError Deinit();
enum {
@@ -88,7 +88,6 @@
static const int kMaxStringLength = 1024;
static const int kNumPhysicalDisplays = 2;
- static const int kNumDisplayEvents = 4;
void DumpLayerCommit(const mdp_layer_commit &layer_commit);
DisplayError SetFormat(const LayerBufferFormat &source, uint32_t *target);
@@ -117,8 +116,6 @@
bool EnableHotPlugDetection(int enable);
ssize_t SysFsWrite(const char* file_node, const char* value, ssize_t length);
- // Store the Device EventHandler - used for callback
- HWEventHandler *event_handler_;
HWResourceInfo hw_resource_;
HWPanelInfo hw_panel_info_;
HWInfoInterface *hw_info_intf_;
diff --git a/sdm/libs/core/fb/hw_events.cpp b/sdm/libs/core/fb/hw_events.cpp
new file mode 100755
index 0000000..5a656cc
--- /dev/null
+++ b/sdm/libs/core/fb/hw_events.cpp
@@ -0,0 +1,260 @@
+/*
+* Copyright (c) 2015 - 2016, 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.
+*/
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/resource.h>
+#include <sys/prctl.h>
+#include <utils/debug.h>
+#include <utils/sys.h>
+#include <pthread.h>
+#include <algorithm>
+#include <vector>
+#include <map>
+#include <utility>
+
+#include "hw_events.h"
+
+#define __CLASS__ "HWEvents"
+
+namespace sdm {
+
+DisplayError HWEventsInterface::Create(int fb_num, HWEventHandler *event_handler,
+ std::vector<const char *> *event_list,
+ HWEventsInterface **intf) {
+ DisplayError error = kErrorNone;
+ HWEvents *hw_events = NULL;
+
+ hw_events = new HWEvents();
+ error = hw_events->Init(fb_num, event_handler, event_list);
+ if (error != kErrorNone) {
+ delete hw_events;
+ } else {
+ *intf = hw_events;
+ }
+
+ return error;
+}
+
+DisplayError HWEventsInterface::Destroy(HWEventsInterface *intf) {
+ HWEvents *hw_events = static_cast<HWEvents *>(intf);
+
+ if (hw_events) {
+ hw_events->Deinit();
+ delete hw_events;
+ }
+
+ return kErrorNone;
+}
+
+pollfd HWEvents::InitializePollFd(HWEventData *event_data) {
+ char node_path[kMaxStringLength] = {0};
+ char data[kMaxStringLength] = {0};
+ pollfd poll_fd;
+ poll_fd.fd = -1;
+
+ if (!strncmp(event_data->event_name, "thread_exit", strlen("thread_exit"))) {
+ // Create an eventfd to be used to unblock the poll system call when
+ // a thread is exiting.
+ poll_fd.fd = Sys::eventfd_(0, 0);
+ poll_fd.events |= POLLIN;
+ exit_fd_ = poll_fd.fd;
+ } else {
+ snprintf(node_path, sizeof(node_path), "%s%d/%s", fb_path_, fb_num_, event_data->event_name);
+ poll_fd.fd = Sys::open_(node_path, O_RDONLY);
+ poll_fd.events |= POLLPRI | POLLERR;
+ }
+
+ if (poll_fd.fd < 0) {
+ DLOGW("open failed for display=%d event=%s, error=%s", fb_num_, event_data->event_name,
+ strerror(errno));
+ return poll_fd;
+ }
+
+ // Read once on all fds to clear data on all fds.
+ Sys::pread_(poll_fd.fd, data , kMaxStringLength, 0);
+
+ return poll_fd;
+}
+
+DisplayError HWEvents::SetEventParser(const char *event_name, HWEventData *event_data) {
+ DisplayError error = kErrorNone;
+
+ if (!strncmp(event_name, "vsync_event", strlen("vsync_event"))) {
+ event_data->event_parser = &HWEvents::HandleVSync;
+ } else if (!strncmp(event_name, "show_blank_event", strlen("show_blank_event"))) {
+ event_data->event_parser = &HWEvents::HandleBlank;
+ } else if (!strncmp(event_name, "idle_notify", strlen("idle_notify"))) {
+ event_data->event_parser = &HWEvents::HandleIdleTimeout;
+ } else if (!strncmp(event_name, "msm_fb_thermal_level", strlen("msm_fb_thermal_level"))) {
+ event_data->event_parser = &HWEvents::HandleThermal;
+ } else if (!strncmp(event_name, "cec/rd_msg", strlen("cec/rd_msg"))) {
+ event_data->event_parser = &HWEvents::HandleCECMessage;
+ } else if (!strncmp(event_name, "thread_exit", strlen("thread_exit"))) {
+ event_data->event_parser = &HWEvents::HandleThreadExit;
+ } else {
+ error = kErrorParameters;
+ }
+
+ return error;
+}
+
+void HWEvents::PopulateHWEventData() {
+ for (uint32_t i = 0; i < event_list_->size(); i++) {
+ const char *event_name = event_list_->at(i);
+ HWEventData event_data;
+ event_data.event_name = event_name;
+ SetEventParser(event_name, &event_data);
+ poll_fds_[i] = InitializePollFd(&event_data);
+ event_data_list_.push_back(event_data);
+ }
+}
+
+DisplayError HWEvents::Init(int fb_num, HWEventHandler *event_handler,
+ std::vector<const char *> *event_list) {
+ if (!event_handler)
+ return kErrorParameters;
+
+ event_handler_ = event_handler;
+ fb_num_ = fb_num;
+ event_list_ = event_list;
+ poll_fds_ = new pollfd[event_list_->size()];
+ event_thread_name_ += " - " + std::to_string(fb_num_);
+
+ PopulateHWEventData();
+
+ if (pthread_create(&event_thread_, NULL, &DisplayEventThread, this) < 0) {
+ DLOGE("Failed to start %s, error = %s", event_thread_name_.c_str());
+ return kErrorResources;
+ }
+
+ return kErrorNone;
+}
+
+DisplayError HWEvents::Deinit() {
+ exit_threads_ = true;
+ Sys::pthread_cancel_(event_thread_);
+
+ uint64_t exit_value = 1;
+ ssize_t write_size = Sys::write_(exit_fd_, &exit_value, sizeof(uint64_t));
+ if (write_size != sizeof(uint64_t))
+ DLOGW("Error triggering exit_fd_ (%d). write size = %d, error = %s", exit_fd_, write_size,
+ strerror(errno));
+
+ pthread_join(event_thread_, NULL);
+
+ for (uint32_t i = 0; i < event_list_->size(); i++) {
+ Sys::close_(poll_fds_[i].fd);
+ poll_fds_[i].fd = -1;
+ }
+
+ delete [] poll_fds_;
+
+ poll_fds_ = 0;
+
+ return kErrorNone;
+}
+
+void* HWEvents::DisplayEventThread(void *context) {
+ if (context) {
+ return reinterpret_cast<HWEvents *>(context)->DisplayEventHandler();
+ }
+
+ return NULL;
+}
+
+void* HWEvents::DisplayEventHandler() {
+ char data[kMaxStringLength] = {0};
+
+ prctl(PR_SET_NAME, event_thread_name_.c_str(), 0, 0, 0);
+ setpriority(PRIO_PROCESS, 0, kThreadPriorityUrgent);
+
+ while (!exit_threads_) {
+ int error = Sys::poll_(poll_fds_, UINT32(event_list_->size()), -1);
+
+ if (error <= 0) {
+ DLOGW("poll failed. error = %s", strerror(errno));
+ continue;
+ }
+
+ for (uint32_t event = 0; event < event_list_->size(); event++) {
+ pollfd &poll_fd = poll_fds_[event];
+
+ if (!strncmp(event_list_->at(event), "thread_exit", strlen("thread_exit"))) {
+ if ((poll_fd.revents & POLLIN) && (Sys::read_(poll_fd.fd, data, kMaxStringLength) > 0)) {
+ (this->*(event_data_list_[event]).event_parser)(data);
+ }
+ } else {
+ if ((poll_fd.revents & POLLPRI) &&
+ (Sys::pread_(poll_fd.fd, data, kMaxStringLength, 0) > 0)) {
+ (this->*(event_data_list_[event]).event_parser)(data);
+ }
+ }
+ }
+ }
+
+ pthread_exit(0);
+
+ return NULL;
+}
+
+void HWEvents::HandleVSync(char *data) {
+ int64_t timestamp = 0;
+ if (!strncmp(data, "VSYNC=", strlen("VSYNC="))) {
+ timestamp = strtoll(data + strlen("VSYNC="), NULL, 0);
+ }
+
+ event_handler_->VSync(timestamp);
+}
+
+void HWEvents::HandleIdleTimeout(char *data) {
+ event_handler_->IdleTimeout();
+}
+
+void HWEvents::HandleThermal(char *data) {
+ int64_t thermal_level = 0;
+ if (!strncmp(data, "thermal_level=", strlen("thermal_level="))) {
+ thermal_level = strtoll(data + strlen("thermal_level="), NULL, 0);
+ }
+
+ DLOGI("Received thermal notification with thermal level = %d", thermal_level);
+
+ event_handler_->ThermalEvent(thermal_level);
+}
+
+void HWEvents::HandleCECMessage(char *data) {
+ event_handler_->CECMessage(data);
+}
+
+} // namespace sdm
+
diff --git a/sdm/libs/core/fb/hw_events.h b/sdm/libs/core/fb/hw_events.h
new file mode 100755
index 0000000..5d7d23d
--- /dev/null
+++ b/sdm/libs/core/fb/hw_events.h
@@ -0,0 +1,82 @@
+/*
+* Copyright (c) 2015 - 2016, 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 __HW_EVENTS_H__
+#define __HW_EVENTS_H__
+
+#include <sys/poll.h>
+#include <string>
+#include <vector>
+#include <map>
+#include <utility>
+
+#include "hw_interface.h"
+#include "hw_events_interface.h"
+
+namespace sdm {
+
+class HWEvents : public HWEventsInterface {
+ public:
+ DisplayError Init(int fb_num, HWEventHandler *event_handler,
+ std::vector<const char *> *event_list);
+ DisplayError Deinit();
+
+ private:
+ static const int kMaxStringLength = 1024;
+
+ typedef void (HWEvents::*EventParser)(char *);
+
+ struct HWEventData {
+ const char* event_name = NULL;
+ EventParser event_parser = NULL;
+ };
+
+ static void* DisplayEventThread(void *context);
+ void* DisplayEventHandler();
+ void HandleVSync(char *data);
+ void HandleBlank(char *data) { }
+ void HandleIdleTimeout(char *data);
+ void HandleThermal(char *data);
+ void HandleCECMessage(char *data);
+ void HandleThreadExit(char *data) { }
+ void PopulateHWEventData();
+ DisplayError SetEventParser(const char *event_name, HWEventData *event_data);
+ pollfd InitializePollFd(HWEventData *event_data);
+
+ HWEventHandler *event_handler_ = NULL;
+ std::vector<const char *> *event_list_ = NULL;
+ std::vector<HWEventData> event_data_list_ = {};
+ pollfd *poll_fds_ = NULL;
+ pthread_t event_thread_;
+ std::string event_thread_name_ = "SDM_EventThread";
+ bool exit_threads_ = false;
+ const char* fb_path_ = "/sys/devices/virtual/graphics/fb";
+ int fb_num_ = -1;
+ int exit_fd_ = -1;
+};
+
+} // namespace sdm
+
+#endif // __HW_EVENTS_H__
+
diff --git a/sdm/libs/core/fb/hw_hdmi.cpp b/sdm/libs/core/fb/hw_hdmi.cpp
index 9f878f3..73a6a3c 100644
--- a/sdm/libs/core/fb/hw_hdmi.cpp
+++ b/sdm/libs/core/fb/hw_hdmi.cpp
@@ -84,7 +84,7 @@
HWHDMI *hw_fb_hdmi = NULL;
hw_fb_hdmi = new HWHDMI(buffer_sync_handler, hw_info_intf);
- error = hw_fb_hdmi->Init(NULL);
+ error = hw_fb_hdmi->Init();
if (error != kErrorNone) {
delete hw_fb_hdmi;
} else {
@@ -108,13 +108,13 @@
HWDevice::hw_info_intf_ = hw_info_intf;
}
-DisplayError HWHDMI::Init(HWEventHandler *eventhandler) {
+DisplayError HWHDMI::Init() {
DisplayError error = kErrorNone;
SetSourceProductInformation("vendor_name", "ro.product.manufacturer");
SetSourceProductInformation("product_description", "ro.product.name");
- error = HWDevice::Init(eventhandler);
+ error = HWDevice::Init();
if (error != kErrorNone) {
return error;
}
diff --git a/sdm/libs/core/fb/hw_hdmi.h b/sdm/libs/core/fb/hw_hdmi.h
index 09eab23..50bbbaa 100644
--- a/sdm/libs/core/fb/hw_hdmi.h
+++ b/sdm/libs/core/fb/hw_hdmi.h
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+* Copyright (c) 2015 - 2016, 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:
@@ -41,7 +41,7 @@
protected:
HWHDMI(BufferSyncHandler *buffer_sync_handler, HWInfoInterface *hw_info_intf);
- virtual DisplayError Init(HWEventHandler *eventhandler);
+ virtual DisplayError Init();
virtual DisplayError Deinit();
virtual DisplayError GetNumDisplayAttributes(uint32_t *count);
// Requirement to call this only after the first config has been explicitly set by client
diff --git a/sdm/libs/core/fb/hw_primary.cpp b/sdm/libs/core/fb/hw_primary.cpp
index 11c2f49..da88623 100644
--- a/sdm/libs/core/fb/hw_primary.cpp
+++ b/sdm/libs/core/fb/hw_primary.cpp
@@ -61,13 +61,12 @@
using std::string;
DisplayError HWPrimary::Create(HWInterface **intf, HWInfoInterface *hw_info_intf,
- BufferSyncHandler *buffer_sync_handler,
- HWEventHandler *eventhandler) {
+ BufferSyncHandler *buffer_sync_handler) {
DisplayError error = kErrorNone;
HWPrimary *hw_primary = NULL;
hw_primary = new HWPrimary(buffer_sync_handler, hw_info_intf);
- error = hw_primary->Init(eventhandler);
+ error = hw_primary->Init();
if (error != kErrorNone) {
delete hw_primary;
} else {
@@ -92,53 +91,17 @@
HWDevice::hw_info_intf_ = hw_info_intf;
}
-DisplayError HWPrimary::Init(HWEventHandler *eventhandler) {
+DisplayError HWPrimary::Init() {
DisplayError error = kErrorNone;
- char node_path[kMaxStringLength] = { 0 };
- char data[kMaxStringLength] = { 0 };
- const char *event_name[kNumDisplayEvents] = {"vsync_event", "show_blank_event", "idle_notify",
- "msm_fb_thermal_level"};
- error = HWDevice::Init(eventhandler);
+ error = HWDevice::Init();
if (error != kErrorNone) {
- goto CleanupOnError;
+ return error;
}
error = PopulateDisplayAttributes();
if (error != kErrorNone) {
- goto CleanupOnError;
- }
-
- // Open nodes for polling
- for (int event = 0; event < kNumDisplayEvents; event++) {
- poll_fds_[event].fd = -1;
- }
-
- if (!fake_vsync_) {
- for (int event = 0; event < kNumDisplayEvents; event++) {
- pollfd &poll_fd = poll_fds_[event];
-
- snprintf(node_path, sizeof(node_path), "%s%d/%s", fb_path_, fb_node_index_,
- event_name[event]);
-
- poll_fd.fd = Sys::open_(node_path, O_RDONLY);
- if (poll_fd.fd < 0) {
- DLOGE("open failed for event=%d, error=%s", event, strerror(errno));
- error = kErrorHardware;
- goto CleanupOnError;
- }
-
- // Read once on all fds to clear data on all fds.
- Sys::pread_(poll_fd.fd, data , kMaxStringLength, 0);
- poll_fd.events = POLLPRI | POLLERR;
- }
- }
-
- // Start the Event thread
- if (pthread_create(&event_thread_, NULL, &DisplayEventThread, this) < 0) {
- DLOGE("Failed to start %s, error = %s", event_thread_name_);
- error = kErrorResources;
- goto CleanupOnError;
+ return error;
}
// Disable HPD at start if HDMI is external, it will be enabled later when the display powers on
@@ -146,17 +109,6 @@
EnableHotPlugDetection(0);
InitializeConfigs();
- return kErrorNone;
-
-CleanupOnError:
- // Close all poll fds
- for (int event = 0; event < kNumDisplayEvents; event++) {
- int &fd = poll_fds_[event].fd;
- if (fd >= 0) {
- Sys::close_(fd);
- }
- }
-
return error;
}
@@ -247,17 +199,6 @@
}
DisplayError HWPrimary::Deinit() {
- exit_threads_ = true;
- Sys::pthread_cancel_(event_thread_);
- pthread_join(event_thread_, NULL);
-
- for (int event = 0; event < kNumDisplayEvents; event++) {
- int &fd = poll_fds_[event].fd;
- if (fd >= 0) {
- Sys::close_(fd);
- }
- }
-
return HWDevice::Deinit();
}
@@ -518,95 +459,6 @@
return ret;
}
-void* HWPrimary::DisplayEventThread(void *context) {
- if (context) {
- return reinterpret_cast<HWPrimary *>(context)->DisplayEventThreadHandler();
- }
-
- return NULL;
-}
-
-void* HWPrimary::DisplayEventThreadHandler() {
- char data[kMaxStringLength] = {0};
-
- prctl(PR_SET_NAME, event_thread_name_, 0, 0, 0);
- setpriority(PRIO_PROCESS, 0, kThreadPriorityUrgent);
-
- if (fake_vsync_) {
- while (!exit_threads_) {
- // Fake vsync is used only when set explicitly through a property(todo) or when
- // the vsync timestamp node cannot be opened at bootup. There is no
- // fallback to fake vsync from the true vsync loop, ever, as the
- // condition can easily escape detection.
- // Also, fake vsync is delivered only for the primary display.
- usleep(16666);
- STRUCT_VAR(timeval, time_now);
- gettimeofday(&time_now, NULL);
- int64_t ts = int64_t(time_now.tv_sec)*1000000000LL +int64_t(time_now.tv_usec)*1000LL;
-
- // Send Vsync event for primary display(0)
- event_handler_->VSync(ts);
- }
-
- pthread_exit(0);
- }
-
- typedef void (HWPrimary::*EventHandler)(char*);
- EventHandler event_handler[kNumDisplayEvents] = { &HWPrimary::HandleVSync,
- &HWPrimary::HandleBlank,
- &HWPrimary::HandleIdleTimeout,
- &HWPrimary::HandleThermal };
-
- while (!exit_threads_) {
- int error = Sys::poll_(poll_fds_, kNumDisplayEvents, -1);
- if (error <= 0) {
- DLOGW("poll failed. error = %s", strerror(errno));
- continue;
- }
-
- for (int event = 0; event < kNumDisplayEvents; event++) {
- pollfd &poll_fd = poll_fds_[event];
-
- if (poll_fd.revents & POLLPRI) {
- if (Sys::pread_(poll_fd.fd, data, kMaxStringLength, 0) > 0) {
- (this->*event_handler[event])(data);
- }
- }
- }
- }
-
- pthread_exit(0);
-
- return NULL;
-}
-
-void HWPrimary::HandleVSync(char *data) {
- int64_t timestamp = 0;
- if (!strncmp(data, "VSYNC=", strlen("VSYNC="))) {
- timestamp = strtoll(data + strlen("VSYNC="), NULL, 0);
- }
- event_handler_->VSync(timestamp);
-}
-
-void HWPrimary::HandleBlank(char *data) {
- // TODO(user): Need to send blank Event
-}
-
-void HWPrimary::HandleIdleTimeout(char *data) {
- event_handler_->IdleTimeout();
-}
-
-void HWPrimary::HandleThermal(char *data) {
- int64_t thermal_level = 0;
- if (!strncmp(data, "thermal_level=", strlen("thermal_level="))) {
- thermal_level = strtoll(data + strlen("thermal_level="), NULL, 0);
- }
-
- DLOGI("Received thermal notification with thermal level = %d", thermal_level);
-
- event_handler_->ThermalEvent(thermal_level);
-}
-
void HWPrimary::SetIdleTimeoutMs(uint32_t timeout_ms) {
char node_path[kMaxStringLength] = {0};
diff --git a/sdm/libs/core/fb/hw_primary.h b/sdm/libs/core/fb/hw_primary.h
index 986ba4b..999c41a 100644
--- a/sdm/libs/core/fb/hw_primary.h
+++ b/sdm/libs/core/fb/hw_primary.h
@@ -38,12 +38,12 @@
class HWPrimary : public HWDevice {
public:
static DisplayError Create(HWInterface **intf, HWInfoInterface *hw_info_intf,
- BufferSyncHandler *buffer_sync_handler, HWEventHandler *eventhandler);
+ BufferSyncHandler *buffer_sync_handler);
static DisplayError Destroy(HWInterface *intf);
protected:
HWPrimary(BufferSyncHandler *buffer_sync_handler, HWInfoInterface *hw_info_intf);
- virtual DisplayError Init(HWEventHandler *eventhandler);
+ virtual DisplayError Init();
virtual DisplayError Deinit();
virtual DisplayError GetNumDisplayAttributes(uint32_t *count);
virtual DisplayError GetActiveConfig(uint32_t *active_config);
@@ -73,24 +73,11 @@
kModeLPMCommand,
};
- // Event Thread to receive vsync/blank events
- static void* DisplayEventThread(void *context);
- void* DisplayEventThreadHandler();
-
- void HandleVSync(char *data);
- void HandleBlank(char *data);
- void HandleIdleTimeout(char *data);
- void HandleThermal(char *data);
DisplayError PopulateDisplayAttributes();
void InitializeConfigs();
bool IsResolutionSwitchEnabled() { return !display_configs_.empty(); }
bool GetCurrentModeFromSysfs(size_t *curr_x_pixels, size_t *curr_y_pixels);
- pollfd poll_fds_[kNumDisplayEvents];
- pthread_t event_thread_;
- const char *event_thread_name_ = "SDM_EventThread";
- bool fake_vsync_ = false;
- bool exit_threads_ = false;
HWDisplayAttributes display_attributes_;
std::vector<DisplayConfigVariableInfo> display_configs_;
std::vector<std::string> display_config_strings_;
diff --git a/sdm/libs/core/fb/hw_virtual.cpp b/sdm/libs/core/fb/hw_virtual.cpp
index 033159f..662c458 100644
--- a/sdm/libs/core/fb/hw_virtual.cpp
+++ b/sdm/libs/core/fb/hw_virtual.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+* Copyright (c) 2015 - 2016, 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
@@ -40,7 +40,7 @@
HWVirtual *hw_virtual = NULL;
hw_virtual = new HWVirtual(buffer_sync_handler, hw_info_intf);
- error = hw_virtual->Init(NULL);
+ error = hw_virtual->Init();
if (error != kErrorNone) {
delete hw_virtual;
} else {
@@ -65,8 +65,8 @@
HWDevice::hw_info_intf_ = hw_info_intf;
}
-DisplayError HWVirtual::Init(HWEventHandler *eventhandler) {
- return HWDevice::Init(eventhandler);
+DisplayError HWVirtual::Init() {
+ return HWDevice::Init();
}
DisplayError HWVirtual::Validate(HWLayers *hw_layers) {
diff --git a/sdm/libs/core/fb/hw_virtual.h b/sdm/libs/core/fb/hw_virtual.h
index 2b740d5..f587230 100644
--- a/sdm/libs/core/fb/hw_virtual.h
+++ b/sdm/libs/core/fb/hw_virtual.h
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+* Copyright (c) 2015 - 2016, 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:
@@ -37,7 +37,7 @@
protected:
HWVirtual(BufferSyncHandler *buffer_sync_handler, HWInfoInterface *hw_info_intf);
- virtual DisplayError Init(HWEventHandler *eventhandler);
+ virtual DisplayError Init();
virtual DisplayError Validate(HWLayers *hw_layers);
};
diff --git a/sdm/libs/core/hw_events_interface.h b/sdm/libs/core/hw_events_interface.h
new file mode 100644
index 0000000..a133a3a
--- /dev/null
+++ b/sdm/libs/core/hw_events_interface.h
@@ -0,0 +1,48 @@
+/*
+* Copyright (c) 2016, 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 __HW_EVENTS_INTERFACE_H__
+#define __HW_EVENTS_INTERFACE_H__
+
+#include <private/hw_info_types.h>
+#include <inttypes.h>
+#include <utility>
+#include <vector>
+
+namespace sdm {
+
+class HWEventsInterface {
+ public:
+ static DisplayError Create(int fb_num, HWEventHandler *event_handler,
+ std::vector<const char *> *event_list, HWEventsInterface **intf);
+ static DisplayError Destroy(HWEventsInterface *intf);
+
+ protected:
+ virtual ~HWEventsInterface() { }
+};
+
+} // namespace sdm
+
+#endif // __HW_EVENTS_INTERFACE_H__
+
diff --git a/sdm/libs/core/hw_interface.h b/sdm/libs/core/hw_interface.h
index 7779350..75d92b9 100644
--- a/sdm/libs/core/hw_interface.h
+++ b/sdm/libs/core/hw_interface.h
@@ -56,6 +56,8 @@
virtual DisplayError Blank(bool blank) = 0;
virtual void IdleTimeout() = 0;
virtual void ThermalEvent(int64_t thermal_level) = 0;
+ virtual void CECMessage(char *message) = 0;
+
protected:
virtual ~HWEventHandler() { }
};
diff --git a/sdm/libs/hwc/hwc_display.cpp b/sdm/libs/hwc/hwc_display.cpp
index 94b9c2e..081ad37 100644
--- a/sdm/libs/hwc/hwc_display.cpp
+++ b/sdm/libs/hwc/hwc_display.cpp
@@ -74,8 +74,9 @@
}
HWCDisplay::HWCDisplay(CoreInterface *core_intf, hwc_procs_t const **hwc_procs, DisplayType type,
- int id, bool needs_blit)
- : core_intf_(core_intf), hwc_procs_(hwc_procs), type_(type), id_(id), needs_blit_(needs_blit) {
+ int id, bool needs_blit, qService::QService *qservice)
+ : core_intf_(core_intf), hwc_procs_(hwc_procs), type_(type), id_(id), needs_blit_(needs_blit),
+ qservice_(qservice) {
}
int HWCDisplay::Init() {
@@ -305,6 +306,16 @@
return kErrorNotSupported;
}
+DisplayError HWCDisplay::CECMessage(char *message) {
+ if (qservice_) {
+ qservice_->onCECMessageReceived(message, 0);
+ } else {
+ DLOGW("Qservice instance not available.");
+ }
+
+ return kErrorNone;
+}
+
int HWCDisplay::AllocateLayerStack(hwc_display_contents_1_t *content_list) {
if (!content_list || !content_list->numHwLayers) {
DLOGW("Invalid content list");
diff --git a/sdm/libs/hwc/hwc_display.h b/sdm/libs/hwc/hwc_display.h
index a9d4242..9466633 100644
--- a/sdm/libs/hwc/hwc_display.h
+++ b/sdm/libs/hwc/hwc_display.h
@@ -28,6 +28,7 @@
#include <hardware/hwcomposer.h>
#include <core/core_interface.h>
#include <qdMetaData.h>
+#include <QService.h>
#include <private/color_params.h>
#include <map>
@@ -132,11 +133,12 @@
};
HWCDisplay(CoreInterface *core_intf, hwc_procs_t const **hwc_procs, DisplayType type, int id,
- bool needs_blit);
+ bool needs_blit, qService::QService *qservice);
// DisplayEventHandler methods
virtual DisplayError VSync(const DisplayEventVSync &vsync);
virtual DisplayError Refresh();
+ virtual DisplayError CECMessage(char *message);
virtual int AllocateLayerStack(hwc_display_contents_1_t *content_list);
virtual int PrePrepareLayerStack(hwc_display_contents_1_t *content_list);
@@ -212,6 +214,7 @@
void CommitLayerParams(hwc_layer_1_t *hwc_layer, Layer *layer);
void ResetLayerCacheStack();
BlitEngine *blit_engine_ = NULL;
+ qService::QService *qservice_ = NULL;
};
inline int HWCDisplay::Perform(uint32_t operation, ...) {
diff --git a/sdm/libs/hwc/hwc_display_external.cpp b/sdm/libs/hwc/hwc_display_external.cpp
index dbcced9..c36582f 100644
--- a/sdm/libs/hwc/hwc_display_external.cpp
+++ b/sdm/libs/hwc/hwc_display_external.cpp
@@ -40,11 +40,11 @@
int HWCDisplayExternal::Create(CoreInterface *core_intf, hwc_procs_t const **hwc_procs,
uint32_t primary_width, uint32_t primary_height,
- HWCDisplay **hwc_display) {
+ qService::QService *qservice, HWCDisplay **hwc_display) {
uint32_t external_width = 0;
uint32_t external_height = 0;
- HWCDisplay *hwc_display_external = new HWCDisplayExternal(core_intf, hwc_procs);
+ HWCDisplay *hwc_display_external = new HWCDisplayExternal(core_intf, hwc_procs, qservice);
int status = hwc_display_external->Init();
if (status) {
delete hwc_display_external;
@@ -75,8 +75,9 @@
delete hwc_display;
}
-HWCDisplayExternal::HWCDisplayExternal(CoreInterface *core_intf, hwc_procs_t const **hwc_procs)
- : HWCDisplay(core_intf, hwc_procs, kHDMI, HWC_DISPLAY_EXTERNAL, false) {
+HWCDisplayExternal::HWCDisplayExternal(CoreInterface *core_intf, hwc_procs_t const **hwc_procs,
+ qService::QService *qservice)
+ : HWCDisplay(core_intf, hwc_procs, kHDMI, HWC_DISPLAY_EXTERNAL, false, qservice) {
}
int HWCDisplayExternal::Prepare(hwc_display_contents_1_t *content_list) {
diff --git a/sdm/libs/hwc/hwc_display_external.h b/sdm/libs/hwc/hwc_display_external.h
index ba00d4d..d9f894d 100644
--- a/sdm/libs/hwc/hwc_display_external.h
+++ b/sdm/libs/hwc/hwc_display_external.h
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2014, The Linux Foundation. All rights reserved.
+* Copyright (c) 2014, 2016, 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:
@@ -32,14 +32,16 @@
class HWCDisplayExternal : public HWCDisplay {
public:
static int Create(CoreInterface *core_intf, hwc_procs_t const **hwc_procs, uint32_t primary_width,
- uint32_t primary_height, HWCDisplay **hwc_display);
+ uint32_t primary_height, qService::QService *qservice,
+ HWCDisplay **hwc_display);
static void Destroy(HWCDisplay *hwc_display);
virtual int Prepare(hwc_display_contents_1_t *content_list);
virtual int Commit(hwc_display_contents_1_t *content_list);
virtual void SetSecureDisplay(bool secure_display_active);
private:
- HWCDisplayExternal(CoreInterface *core_intf, hwc_procs_t const **hwc_procs);
+ HWCDisplayExternal(CoreInterface *core_intf, hwc_procs_t const **hwc_procs,
+ qService::QService *qservice);
void ApplyScanAdjustment(hwc_rect_t *display_frame);
static void GetDownscaleResolution(uint32_t primary_width, uint32_t primary_height,
uint32_t *virtual_width, uint32_t *virtual_height);
diff --git a/sdm/libs/hwc/hwc_display_primary.cpp b/sdm/libs/hwc/hwc_display_primary.cpp
index fae77b1..2a3270e 100644
--- a/sdm/libs/hwc/hwc_display_primary.cpp
+++ b/sdm/libs/hwc/hwc_display_primary.cpp
@@ -42,12 +42,14 @@
namespace sdm {
int HWCDisplayPrimary::Create(CoreInterface *core_intf, BufferAllocator *buffer_allocator,
- hwc_procs_t const **hwc_procs, HWCDisplay **hwc_display) {
+ hwc_procs_t const **hwc_procs, qService::QService *qservice,
+ HWCDisplay **hwc_display) {
int status = 0;
uint32_t primary_width = 0;
uint32_t primary_height = 0;
- HWCDisplay *hwc_display_primary = new HWCDisplayPrimary(core_intf, buffer_allocator, hwc_procs);
+ HWCDisplay *hwc_display_primary = new HWCDisplayPrimary(core_intf, buffer_allocator,
+ hwc_procs, qservice);
status = hwc_display_primary->Init();
if (status) {
delete hwc_display_primary;
@@ -81,9 +83,10 @@
HWCDisplayPrimary::HWCDisplayPrimary(CoreInterface *core_intf,
BufferAllocator *buffer_allocator,
- hwc_procs_t const **hwc_procs)
- : HWCDisplay(core_intf, hwc_procs, kPrimary, HWC_DISPLAY_PRIMARY, true),
- buffer_allocator_(buffer_allocator), cpu_hint_(NULL) {
+ hwc_procs_t const **hwc_procs,
+ qService::QService *qservice)
+ : HWCDisplay(core_intf, hwc_procs, kPrimary, HWC_DISPLAY_PRIMARY, true, qservice),
+ buffer_allocator_(buffer_allocator), cpu_hint_(NULL) {
}
int HWCDisplayPrimary::Init() {
diff --git a/sdm/libs/hwc/hwc_display_primary.h b/sdm/libs/hwc/hwc_display_primary.h
index fe15ba1..8c02731 100644
--- a/sdm/libs/hwc/hwc_display_primary.h
+++ b/sdm/libs/hwc/hwc_display_primary.h
@@ -41,7 +41,8 @@
};
static int Create(CoreInterface *core_intf, BufferAllocator *buffer_allocator,
- hwc_procs_t const **hwc_procs, HWCDisplay **hwc_display);
+ hwc_procs_t const **hwc_procs, qService::QService *qservice,
+ HWCDisplay **hwc_display);
static void Destroy(HWCDisplay *hwc_display);
virtual int Init();
virtual int Prepare(hwc_display_contents_1_t *content_list);
@@ -56,7 +57,7 @@
private:
HWCDisplayPrimary(CoreInterface *core_intf, BufferAllocator *buffer_allocator,
- hwc_procs_t const **hwc_procs);
+ hwc_procs_t const **hwc_procs, qService::QService *qservice);
void SetMetaDataRefreshRateFlag(bool enable);
virtual DisplayError SetDisplayMode(uint32_t mode);
void ProcessBootAnimCompleted(hwc_display_contents_1_t *content_list);
diff --git a/sdm/libs/hwc/hwc_display_virtual.cpp b/sdm/libs/hwc/hwc_display_virtual.cpp
index d4250db..5b0caab 100644
--- a/sdm/libs/hwc/hwc_display_virtual.cpp
+++ b/sdm/libs/hwc/hwc_display_virtual.cpp
@@ -96,7 +96,7 @@
}
HWCDisplayVirtual::HWCDisplayVirtual(CoreInterface *core_intf, hwc_procs_t const **hwc_procs)
- : HWCDisplay(core_intf, hwc_procs, kVirtual, HWC_DISPLAY_VIRTUAL, false),
+ : HWCDisplay(core_intf, hwc_procs, kVirtual, HWC_DISPLAY_VIRTUAL, false, NULL),
dump_output_layer_(false), output_buffer_(NULL) {
}
diff --git a/sdm/libs/hwc/hwc_session.cpp b/sdm/libs/hwc/hwc_session.cpp
index c92251b..ffd8cc1 100644
--- a/sdm/libs/hwc/hwc_session.cpp
+++ b/sdm/libs/hwc/hwc_session.cpp
@@ -116,11 +116,12 @@
// Start QService and connect to it.
qService::QService::init();
- android::sp<qService::IQService> qservice = android::interface_cast<qService::IQService>(
+ android::sp<qService::IQService> iqservice = android::interface_cast<qService::IQService>(
android::defaultServiceManager()->getService(android::String16(qservice_name)));
- if (qservice.get()) {
- qservice->connect(android::sp<qClient::IQClient>(this));
+ if (iqservice.get()) {
+ iqservice->connect(android::sp<qClient::IQClient>(this));
+ qservice_ = reinterpret_cast<qService::QService* >(iqservice.get());
} else {
DLOGE("Failed to acquire %s", qservice_name);
return -EINVAL;
@@ -146,7 +147,7 @@
}
// Create and power on primary display
- status = HWCDisplayPrimary::Create(core_intf_, buffer_allocator_, &hwc_procs_,
+ status = HWCDisplayPrimary::Create(core_intf_, buffer_allocator_, &hwc_procs_, qservice_,
&hwc_display_[HWC_DISPLAY_PRIMARY]);
if (status) {
CoreInterface::DestroyCore();
@@ -596,7 +597,7 @@
if (disp == HWC_DISPLAY_EXTERNAL) {
status = HWCDisplayExternal::Create(core_intf_, &hwc_procs_, primary_width, primary_height,
- &hwc_display_[disp]);
+ qservice_, &hwc_display_[disp]);
} else if (disp == HWC_DISPLAY_VIRTUAL) {
status = HWCDisplayVirtual::Create(core_intf_, &hwc_procs_, primary_width, primary_height,
content_list, &hwc_display_[disp]);
@@ -1359,6 +1360,8 @@
hwc_procs_->hotplug(hwc_procs_, HWC_DISPLAY_EXTERNAL, connected);
}
+ qservice_->onHdmiHotplug(INT(connected));
+
return 0;
}
diff --git a/sdm/libs/hwc/hwc_session.h b/sdm/libs/hwc/hwc_session.h
index 561de35..270751a 100644
--- a/sdm/libs/hwc/hwc_session.h
+++ b/sdm/libs/hwc/hwc_session.h
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2014 - 2015, The Linux Foundation. All rights reserved.
+* Copyright (c) 2014 - 2016, 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:
@@ -28,7 +28,6 @@
#include <hardware/hwcomposer.h>
#include <core/core_interface.h>
#include <utils/locker.h>
-#include <IQClient.h>
#include "hwc_display_primary.h"
#include "hwc_display_external.h"
@@ -140,6 +139,7 @@
bool new_bw_mode_ = false;
bool need_invalidate_ = false;
int bw_mode_release_fd_ = -1;
+ qService::QService *qservice_ = NULL;
};
} // namespace sdm