commit ebf560e96f878d0d52f58b558fac955db7f9bee3
author Linux Build Service Account <lnxbuild@localhost> Wed Jun 13 03:48:19 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jun 13 03:48:19 2018 -0700
tree a69dbcc7eb02cac11e796fdc864155088018c9fa
parent c0dc9a3928609602240502b404b6b4c48ce5e1cd
parent 3dd47c91b62ce89c6fa12079168a41144f4aa8a6

Merge "sdm: pass panel name to dpps interface" into display.lnx.5.0

sdm/include/core/dpps_interface.h

diff --git a/sdm/include/core/dpps_interface.h b/sdm/include/core/dpps_interface.h
index 47b3e2b..b70da6a 100644
--- a/sdm/include/core/dpps_interface.h
+++ b/sdm/include/core/dpps_interface.h
@@ -31,6 +31,7 @@
 #define __DPPS_INTERFACE_H__
 
 #include <core/sdm_types.h>
+#include <string>
 
 namespace sdm {
 
@@ -52,7 +53,7 @@
 
 class DppsInterface {
  public:
-  virtual int Init(DppsPropIntf* intf) = 0;
+  virtual int Init(DppsPropIntf* intf, const std::string &panel_name) = 0;
   virtual int Deinit() = 0;
 
  protected:
@@ -61,8 +62,9 @@
 
 class DppsDummyImpl : public DppsInterface {
  public:
-  int Init(DppsPropIntf* intf) {
+  int Init(DppsPropIntf* intf, const std::string &panel_name) {
     (void)intf;
+    (void)panel_name;
     return 0;
   }
   int Deinit() {

sdm/libs/core/display_primary.cpp

diff --git a/sdm/libs/core/display_primary.cpp b/sdm/libs/core/display_primary.cpp
index 8282147..f7da4de 100644
--- a/sdm/libs/core/display_primary.cpp
+++ b/sdm/libs/core/display_primary.cpp
@@ -29,6 +29,7 @@
 #include <algorithm>
 #include <functional>
 #include <vector>
+#include <string>
 
 #include "display_primary.h"
 #include "hw_interface.h"
@@ -173,7 +174,7 @@
     ControlPartialUpdate(true /* enable */, &pending);
   }
 
-  dpps_info_.Init(this);
+  dpps_info_.Init(this, hw_panel_info_.panel_name);
 
   return error;
 }
@@ -478,7 +479,7 @@
   return error;
 }
 
-void DppsInfo::Init(DppsPropIntf* intf) {
+void DppsInfo::Init(DppsPropIntf* intf, const std::string &panel_name) {
   int error = 0;
 
   if (dpps_initialized_) {
@@ -502,7 +503,7 @@
     goto exit;
   }
 
-  error = dpps_intf->Init(intf);
+  error = dpps_intf->Init(intf, panel_name);
   if (!error) {
     DLOGI("DPPS Interface init successfully");
     dpps_initialized_ = true;

sdm/libs/core/display_primary.h

diff --git a/sdm/libs/core/display_primary.h b/sdm/libs/core/display_primary.h
index 541504b..2da6712 100644
--- a/sdm/libs/core/display_primary.h
+++ b/sdm/libs/core/display_primary.h
@@ -27,6 +27,7 @@
 
 #include <core/dpps_interface.h>
 #include <vector>
+#include <string>
 
 #include "display_base.h"
 #include "hw_events_interface.h"
@@ -37,7 +38,7 @@
 
 class DppsInfo {
  public:
-  void Init(DppsPropIntf* intf);
+  void Init(DppsPropIntf* intf, const std::string &panel_name);
   void Deinit();
 
  private: