LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "h/q/d: Add binder-api support to change refresh-rate."

Browse Source
This commit is contained in:
Linux Build Service Account
2014-12-04 11:22:27 -08:00
committed by Gerrit - the friendly Code Review server
parent 796ee84a3e 0d53fc6d29
commit 182a6a96b0
7 changed files with 98 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libhwcomposer/hwc_mdpcomp.cpp
View File

@@ -1975,7 +1975,8 @@ int MDPComp::prepare(hwc_context_t *ctx, hwc_display_contents_1_t* list) {
#ifdef DYNAMIC_FPS
//For primary display, set the dynamic refreshrate
if(!mDpy && qdutils::MDPVersion::getInstance().isDynFpsSupported()) {
if(!mDpy && qdutils::MDPVersion::getInstance().isDynFpsSupported() &&
ctx->mUseMetaDataRefreshRate) {
FrameInfo frame;
frame.reset(mCurrentFrame.layerCount);
memset(&frame.drop, 0, sizeof(frame.drop));

52
libhwcomposer/hwc_qclient.cpp
View File

@@ -34,6 +34,7 @@
#include <hwc_mdpcomp.h>
#include <hwc_virtual.h>
#include <overlay.h>
#include <display_config.h>
#define QCLIENT_DEBUG 0
@@ -175,13 +176,13 @@ static void setSecondaryDisplayStatus(hwc_context_t *ctx,
dpy, getExternalDisplayState(status));
if(dpy > HWC_DISPLAY_PRIMARY && dpy <= HWC_DISPLAY_VIRTUAL) {
if(dpy == HWC_DISPLAY_VIRTUAL && status == EXTERNAL_OFFLINE) {
if(dpy == HWC_DISPLAY_VIRTUAL && status == qdutils::EXTERNAL_OFFLINE) {
ctx->mWfdSyncLock.lock();
ctx->mWfdSyncLock.signal();
ctx->mWfdSyncLock.unlock();
} else if(status == EXTERNAL_PAUSE) {
} else if(status == qdutils::EXTERNAL_PAUSE) {
handle_pause(ctx, dpy);
} else if(status == EXTERNAL_RESUME) {
} else if(status == qdutils::EXTERNAL_RESUME) {
handle_resume(ctx, dpy);
}
} else {
@@ -263,6 +264,48 @@ static void toggleBWC(hwc_context_t* ctx, const Parcel* inParcel) {
}
}
static void configureDynRefreshRate(hwc_context_t* ctx,
const Parcel* inParcel) {
uint32_t op = (uint32_t)inParcel->readInt32();
uint32_t refresh_rate = (uint32_t)inParcel->readInt32();
MDPVersion& mdpHw = MDPVersion::getInstance();
uint32_t dpy = HWC_DISPLAY_PRIMARY;
if(mdpHw.isDynFpsSupported()) {
Locker::Autolock _sl(ctx->mDrawLock);
switch (op) {
case DISABLE_METADATA_DYN_REFRESH_RATE:
ctx->mUseMetaDataRefreshRate = false;
setRefreshRate(ctx, dpy, ctx->dpyAttr[dpy].refreshRate);
break;
case ENABLE_METADATA_DYN_REFRESH_RATE:
ctx->mUseMetaDataRefreshRate = true;
setRefreshRate(ctx, dpy, ctx->dpyAttr[dpy].refreshRate);
break;
case SET_BINDER_DYN_REFRESH_RATE:
if(ctx->mUseMetaDataRefreshRate)
ALOGW("%s: Ignoring binder request to change refresh-rate",
__FUNCTION__);
else {
uint32_t rate = roundOff(refresh_rate);
if((rate >= mdpHw.getMinFpsSupported() &&
rate <= mdpHw.getMaxFpsSupported())) {
setRefreshRate(ctx, dpy, rate);
} else {
ALOGE("%s: Requested refresh-rate should be between \
(%d) and (%d). Given (%d)", __FUNCTION__,
mdpHw.getMinFpsSupported(),
mdpHw.getMaxFpsSupported(), rate);
}
}
break;
default:
ALOGE("%s: Invalid op %d",__FUNCTION__,op);
}
}
}
status_t QClient::notifyCallback(uint32_t command, const Parcel* inParcel,
Parcel* outParcel) {
status_t ret = NO_ERROR;
@@ -314,6 +357,9 @@ status_t QClient::notifyCallback(uint32_t command, const Parcel* inParcel,
case IQService::TOGGLE_BWC:
toggleBWC(mHwcContext, inParcel);
break;
case IQService::CONFIGURE_DYN_REFRESH_RATE:
configureDynRefreshRate(mHwcContext, inParcel);
break;
default:
ret = NO_ERROR;
}

10
libhwcomposer/hwc_utils.cpp
View File

@@ -406,6 +406,12 @@ void initContext(hwc_context_t *ctx)
ctx->mWindowboxFeature = true;
}
ctx->mUseMetaDataRefreshRate = true;
if(property_get("persist.metadata_dynfps.disable", value, "false")
&& !strcmp(value, "true")) {
ctx->mUseMetaDataRefreshRate = false;
}
memset(&(ctx->mPtorInfo), 0, sizeof(ctx->mPtorInfo));
ALOGI("Initializing Qualcomm Hardware Composer");
ALOGI("MDP version: %d", ctx->mMDP.version);
@@ -465,7 +471,7 @@ void closeContext(hwc_context_t *ctx)
}
//Helper to roundoff the refreshrates
static uint32_t roundOff(uint32_t refreshRate) {
uint32_t roundOff(uint32_t refreshRate) {
int count = (int) (sizeof(stdRefreshRates)/sizeof(stdRefreshRates[0]));
uint32_t rate = refreshRate;
for(int i=0; i< count; i++) {
@@ -1057,7 +1063,7 @@ void setListStats(hwc_context_t *ctx,
ctx->listStats[dpy].preMultipliedAlpha = true;
#ifdef DYNAMIC_FPS
if (dpy == HWC_DISPLAY_PRIMARY && mdpHw.isDynFpsSupported()) {
if (!dpy && mdpHw.isDynFpsSupported() && ctx->mUseMetaDataRefreshRate){
//dyn fps: get refreshrate from metadata
//Support multiple refresh rates if they are same
//else set to default

4
libhwcomposer/hwc_utils.h
View File

@@ -326,6 +326,8 @@ void getActionSafePosition(hwc_context_t *ctx, int dpy, hwc_rect_t& dst);
void getAspectRatioPosition(hwc_context_t* ctx, int dpy, int extOrientation,
hwc_rect_t& inRect, hwc_rect_t& outRect);
uint32_t roundOff(uint32_t refreshRate);
void setRefreshRate(hwc_context_t *ctx, int dpy, uint32_t refreshRate);
bool isPrimaryPortrait(hwc_context_t *ctx);
@@ -640,6 +642,8 @@ struct hwc_context_t {
float mAspectRatioToleranceLevel;
// Runtime switch for BWC for targets that support it
bool mBWCEnabled;
// Provides a way for OEM's to disable setting dynfps via metadata.
bool mUseMetaDataRefreshRate;
};
namespace qhwc {

18
libqdutils/display_config.cpp
View File

@@ -152,6 +152,24 @@ int setSecondaryDisplayStatus(int dpy, uint32_t status) {
return err;
}
int configureDynRefreshRate(uint32_t op, uint32_t refreshRate) {
status_t err = (status_t) FAILED_TRANSACTION;
sp<IQService> binder = getBinder();
Parcel inParcel, outParcel;
inParcel.writeInt32(op);
inParcel.writeInt32(refreshRate);
if(binder != NULL) {
err = binder->dispatch(IQService::CONFIGURE_DYN_REFRESH_RATE,
&inParcel, &outParcel);
}
if(err)
ALOGE("%s: Failed setting op %d err=%d", __FUNCTION__, op, err);
return err;
}
}; //namespace
// ----------------------------------------------------------------------------

15
libqdutils/display_config.h
View File

@@ -39,6 +39,12 @@
namespace qdutils {
/* TODO: Have all the common enums that need be exposed to clients and which
* are also needed in hwc defined here. Remove such definitions we have in
* hwc_utils.h
*/
// Use this enum to specify the dpy parameters where needed
enum {
DISPLAY_PRIMARY = 0,
@@ -55,6 +61,12 @@ enum {
EXTERNAL_RESUME,
};
enum {
DISABLE_METADATA_DYN_REFRESH_RATE = 0,
ENABLE_METADATA_DYN_REFRESH_RATE,
SET_BINDER_DYN_REFRESH_RATE,
};
// Display Attributes that are available to clients of this library
// Not to be confused with a similar struct in hwc_utils (in the hwc namespace)
struct DisplayAttributes_t {
@@ -89,4 +101,7 @@ int setViewFrame(int dpy, int l, int t, int r, int b);
// Set the secondary display status(pause/resume/offline etc.,)
int setSecondaryDisplayStatus(int dpy, uint32_t status);
// Enable/Disable/Set refresh rate dynamically
int configureDynRefreshRate(uint32_t op, uint32_t refreshRate);
}; //namespace

2
libqservice/IQService.h
View File

@@ -55,6 +55,8 @@ public:
DYNAMIC_DEBUG = 15, // Enable more logging on the fly
SET_IDLE_TIMEOUT = 16, // Set idle timeout for GPU fallback
TOGGLE_BWC = 17, // Toggle BWC On/Off on targets that support
/* Enable/Disable/Set refresh rate dynamically */
CONFIGURE_DYN_REFRESH_RATE = 18,
COMMAND_LIST_END = 400,
};