Skip to content

Revert "Sync graphics mixin update" #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
SaliniVenate wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Revert "Sync graphics mixin update" #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion daemon/Android.mk
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ LOCAL_SHARED_LIBRARIES := \
liblog \
libcrypto \
libdrm \
libssl
libssl \
libhwcservice

LOCAL_STATIC_LIBRARIES := \
libhdcpcommon \
Expand Down
2 changes: 0 additions & 2 deletions daemon/portmanager.cpp
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1436,7 +1436,6 @@ int32_t PortManagerHWComposer::SetPortProperty(

android::ProcessState::initWithDriver(BINDER_IPC);

#ifdef USES_IA_HWCOMPOSER
// Connect to HWC service
HWCSHANDLE hwcs = HwcService_Connect();
if (nullptr == hwcs)
Expand Down Expand Up @@ -1483,7 +1482,6 @@ int32_t PortManagerHWComposer::SetPortProperty(
}

HwcService_Disconnect(hwcs);
#endif

if (SUCCESS != ret)
{
Expand Down
7 changes: 0 additions & 7 deletions daemon/portmanager.h
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,11 @@
#include "port.h"

#ifdef ANDROID

#ifdef USES_IA_HWCOMPOSER
#include <hwcserviceapi.h>
#endif

#include <log/log.h>
#include <binder/IServiceManager.h>
#include <binder/ProcessState.h>

#ifdef USES_IA_HWCOMPOSER
#include <iservice.h>
#endif

#define BINDER_IPC "/dev/vndbinder"
#endif
Expand Down
17 changes: 1 addition & 16 deletions daemon/portmanager_android.cpp
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,11 @@
#include "portmanager.h"
#include "portmanager_android.h"

#ifdef USES_IA_HWCOMPOSER
#include <hwcserviceapi.h>
#endif

#include <log/log.h>
#include <binder/IServiceManager.h>
#include <binder/ProcessState.h>

#ifdef USES_IA_HWCOMPOSER
#include <iservice.h>
#endif

#include "xf86drm.h"
#include "xf86drmMode.h"
Expand Down Expand Up @@ -128,7 +122,6 @@ int32_t setPortProperty_hwcservice(int32_t m_DrmFd,

android::ProcessState::initWithDriver("/dev/vndbinder");

#ifdef USES_IA_HWCOMPOSER
// Connect to HWC service
HWCSHANDLE hwcs = HwcService_Connect();
if (hwcs == NULL) {
Expand All @@ -145,15 +138,12 @@ int32_t setPortProperty_hwcservice(int32_t m_DrmFd,
hwcs,
drmId);
}
#endif

//Enable CP and SendSRM
if (numRetry > 1)
{
for (uint32_t i = 0; i < numRetry; ++i)
{

#ifdef USES_IA_HWCOMPOSER
if(propId == drmObject->GetPropertyId(CONTENT_PROTECTION))
{
HDCP_ASSERTMESSAGE("Attempting HDCP Enable");
Expand All @@ -176,7 +166,6 @@ int32_t setPortProperty_hwcservice(int32_t m_DrmFd,
hwcs = NULL;
ret = EINVAL;
}
#endif
if(SUCCESS == ret)
{
// Invalid the cpValue/cpType
Expand Down Expand Up @@ -206,17 +195,13 @@ int32_t setPortProperty_hwcservice(int32_t m_DrmFd,

if (SUCCESS != ret)
{
#ifdef USES_IA_HWCOMPOSER
HwcService_Disconnect(hwcs);
#endif
HDCP_ASSERTMESSAGE("Failed to Enable HDCP");
HDCP_ASSERTMESSAGE("Failed to Enable HDCP");
HDCP_FUNCTION_EXIT(EBUSY);
return EBUSY;
}

#ifdef USES_IA_HWCOMPOSER
HwcService_Disconnect(hwcs);
#endif
HDCP_FUNCTION_EXIT(SUCCESS);
return SUCCESS;
} //setPortProperty_hwcservice