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

Merge "sdm: Merge release fence after set power mode"

Browse Source
This commit is contained in:
Linux Build Service Account
2018-03-14 19:56:08 -07:00
committed by Gerrit - the friendly Code Review server
parent a448113e2e f6ba3065c2
commit 11142edc2d
20 changed files with 118 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sdm/include/core/display_interface.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014 - 2017, The Linux Foundation. All rights reserved. * Copyright (c) 2014 - 2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted * Redistribution and use in source and binary forms, with or without modification, are permitted
* provided that the following conditions are met: * provided that the following conditions are met:
@@ -388,12 +388,13 @@ class DisplayInterface {
/*! @brief Method to set current state of the display device. /*! @brief Method to set current state of the display device.
@param[in] state \link DisplayState \endlink @param[in] state \link DisplayState \endlink
@param[in] pointer to release fence
@return \link DisplayError \endlink @return \link DisplayError \endlink
@sa SetDisplayState @sa SetDisplayState
*/ */
virtual DisplayError SetDisplayState(DisplayState state) = 0; virtual DisplayError SetDisplayState(DisplayState state, int *release_fence) = 0;
/*! @brief Method to set active configuration for variable properties of the display device. /*! @brief Method to set active configuration for variable properties of the display device.

10
sdm/libs/core/display_base.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014 - 2017, The Linux Foundation. All rights reserved. * Copyright (c) 2014 - 2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted * Redistribution and use in source and binary forms, with or without modification, are permitted
* provided that the following conditions are met: * provided that the following conditions are met:
@@ -433,7 +433,7 @@ DisplayState DisplayBase::GetLastPowerMode() {
return last_power_mode_; return last_power_mode_;
} }
DisplayError DisplayBase::SetDisplayState(DisplayState state) { DisplayError DisplayBase::SetDisplayState(DisplayState state, int *release_fence) {
lock_guard<recursive_mutex> obj(recursive_mutex_); lock_guard<recursive_mutex> obj(recursive_mutex_);
DisplayError error = kErrorNone; DisplayError error = kErrorNone;
bool active = false; bool active = false;
@@ -455,7 +455,7 @@ DisplayError DisplayBase::SetDisplayState(DisplayState state) {
break; break;
case kStateOn: case kStateOn:
error = hw_intf_->PowerOn(); error = hw_intf_->PowerOn(release_fence);
if (error != kErrorNone) { if (error != kErrorNone) {
return error; return error;
} }
@@ -471,13 +471,13 @@ DisplayError DisplayBase::SetDisplayState(DisplayState state) {
break; break;
case kStateDoze: case kStateDoze:
error = hw_intf_->Doze(); error = hw_intf_->Doze(release_fence);
active = true; active = true;
last_power_mode_ = kStateDoze; last_power_mode_ = kStateDoze;
break; break;
case kStateDozeSuspend: case kStateDozeSuspend:
error = hw_intf_->DozeSuspend(); error = hw_intf_->DozeSuspend(release_fence);
if (display_type_ != kPrimary) { if (display_type_ != kPrimary) {
active = true; active = true;
} }

4
sdm/libs/core/display_base.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved. * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted * Redistribution and use in source and binary forms, with or without modification, are permitted
* provided that the following conditions are met: * provided that the following conditions are met:
@@ -62,7 +62,7 @@ class DisplayBase : public DisplayInterface {
virtual DisplayError GetConfig(DisplayConfigFixedInfo *variable_info); virtual DisplayError GetConfig(DisplayConfigFixedInfo *variable_info);
virtual DisplayError GetActiveConfig(uint32_t *index); virtual DisplayError GetActiveConfig(uint32_t *index);
virtual DisplayError GetVSyncState(bool *enabled); virtual DisplayError GetVSyncState(bool *enabled);
virtual DisplayError SetDisplayState(DisplayState state); virtual DisplayError SetDisplayState(DisplayState state, int *release_fence);
virtual DisplayError SetActiveConfig(uint32_t index); virtual DisplayError SetActiveConfig(uint32_t index);
virtual DisplayError SetActiveConfig(DisplayConfigVariableInfo *variable_info) { virtual DisplayError SetActiveConfig(DisplayConfigVariableInfo *variable_info) {
return kErrorNotSupported; return kErrorNotSupported;

17
sdm/libs/core/display_primary.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014 - 2017, The Linux Foundation. All rights reserved. * Copyright (c) 2014 - 2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted * Redistribution and use in source and binary forms, with or without modification, are permitted
* provided that the following conditions are met: * provided that the following conditions are met:
@@ -166,10 +166,10 @@ DisplayError DisplayPrimary::Commit(LayerStack *layer_stack) {
return error; return error;
} }
DisplayError DisplayPrimary::SetDisplayState(DisplayState state) { DisplayError DisplayPrimary::SetDisplayState(DisplayState state, int *release_fence) {
lock_guard<recursive_mutex> obj(recursive_mutex_); lock_guard<recursive_mutex> obj(recursive_mutex_);
DisplayError error = kErrorNone; DisplayError error = kErrorNone;
error = DisplayBase::SetDisplayState(state); error = DisplayBase::SetDisplayState(state, release_fence);
if (error != kErrorNone) { if (error != kErrorNone) {
return error; return error;
} }
@@ -393,19 +393,26 @@ bool DisplayPrimary::NeedsAVREnable() {
void DisplayPrimary::ResetPanel() { void DisplayPrimary::ResetPanel() {
DisplayError status = kErrorNone; DisplayError status = kErrorNone;
int release_fence = -1;
DLOGI("Powering off primary"); DLOGI("Powering off primary");
status = SetDisplayState(kStateOff); status = SetDisplayState(kStateOff, &release_fence);
if (status != kErrorNone) { if (status != kErrorNone) {
DLOGE("power-off on primary failed with error = %d", status); DLOGE("power-off on primary failed with error = %d", status);
} }
if (release_fence >= 0) {
::close(release_fence);
}
DLOGI("Restoring power mode on primary"); DLOGI("Restoring power mode on primary");
DisplayState mode = GetLastPowerMode(); DisplayState mode = GetLastPowerMode();
status = SetDisplayState(mode); status = SetDisplayState(mode, &release_fence);
if (status != kErrorNone) { if (status != kErrorNone) {
DLOGE("Setting power mode = %d on primary failed with error = %d", mode, status); DLOGE("Setting power mode = %d on primary failed with error = %d", mode, status);
} }
if (release_fence >= 0) {
::close(release_fence);
}
DLOGI("Enabling HWVsync"); DLOGI("Enabling HWVsync");
status = SetVSyncState(true); status = SetVSyncState(true);

4
sdm/libs/core/display_primary.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014 - 2017, The Linux Foundation. All rights reserved. * Copyright (c) 2014 - 2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted * Redistribution and use in source and binary forms, with or without modification, are permitted
* provided that the following conditions are met: * provided that the following conditions are met:
@@ -44,7 +44,7 @@ class DisplayPrimary : public DisplayBase, HWEventHandler {
virtual DisplayError Commit(LayerStack *layer_stack); virtual DisplayError Commit(LayerStack *layer_stack);
virtual DisplayError ControlPartialUpdate(bool enable, uint32_t *pending); virtual DisplayError ControlPartialUpdate(bool enable, uint32_t *pending);
virtual DisplayError DisablePartialUpdateOneFrame(); virtual DisplayError DisablePartialUpdateOneFrame();
virtual DisplayError SetDisplayState(DisplayState state); virtual DisplayError SetDisplayState(DisplayState state, int *release_fence);
virtual void SetIdleTimeoutMs(uint32_t active_ms); virtual void SetIdleTimeoutMs(uint32_t active_ms);
virtual DisplayError SetDisplayMode(uint32_t mode); virtual DisplayError SetDisplayMode(uint32_t mode);
virtual DisplayError GetRefreshRateRange(uint32_t *min_refresh_rate, uint32_t *max_refresh_rate); virtual DisplayError GetRefreshRateRange(uint32_t *min_refresh_rate, uint32_t *max_refresh_rate);

11
sdm/libs/core/drm/hw_device_drm.cpp
View File

@@ -709,7 +709,7 @@ DisplayError HWDeviceDRM::GetConfigIndex(char *mode, uint32_t *index) {
return kErrorNone; return kErrorNone;
} }
DisplayError HWDeviceDRM::PowerOn() { DisplayError HWDeviceDRM::PowerOn(int *release_fence) {
DTRACE_SCOPED(); DTRACE_SCOPED();
if (!drm_atomic_intf_) { if (!drm_atomic_intf_) {
DLOGE("DRM Atomic Interface is null!"); DLOGE("DRM Atomic Interface is null!");
@@ -727,6 +727,7 @@ DisplayError HWDeviceDRM::PowerOn() {
DLOGE("Failed with error: %d", ret); DLOGE("Failed with error: %d", ret);
return kErrorHardware; return kErrorHardware;
} }
drm_atomic_intf_->Perform(DRMOps::CRTC_GET_RELEASE_FENCE, token_.crtc_id, release_fence);
return kErrorNone; return kErrorNone;
} }
@@ -750,7 +751,7 @@ DisplayError HWDeviceDRM::PowerOff() {
return kErrorNone; return kErrorNone;
} }
DisplayError HWDeviceDRM::Doze() { DisplayError HWDeviceDRM::Doze(int *release_fence) {
DTRACE_SCOPED(); DTRACE_SCOPED();
drm_atomic_intf_->Perform(DRMOps::CRTC_SET_ACTIVE, token_.crtc_id, 1); drm_atomic_intf_->Perform(DRMOps::CRTC_SET_ACTIVE, token_.crtc_id, 1);
drm_atomic_intf_->Perform(DRMOps::CONNECTOR_SET_POWER_MODE, token_.conn_id, DRMPowerMode::DOZE); drm_atomic_intf_->Perform(DRMOps::CONNECTOR_SET_POWER_MODE, token_.conn_id, DRMPowerMode::DOZE);
@@ -760,10 +761,12 @@ DisplayError HWDeviceDRM::Doze() {
return kErrorHardware; return kErrorHardware;
} }
drm_atomic_intf_->Perform(DRMOps::CRTC_GET_RELEASE_FENCE, token_.crtc_id, release_fence);
return kErrorNone; return kErrorNone;
} }
DisplayError HWDeviceDRM::DozeSuspend() { DisplayError HWDeviceDRM::DozeSuspend(int *release_fence) {
DTRACE_SCOPED(); DTRACE_SCOPED();
drm_atomic_intf_->Perform(DRMOps::CRTC_SET_ACTIVE, token_.crtc_id, 1); drm_atomic_intf_->Perform(DRMOps::CRTC_SET_ACTIVE, token_.crtc_id, 1);
drm_atomic_intf_->Perform(DRMOps::CONNECTOR_SET_POWER_MODE, token_.conn_id, drm_atomic_intf_->Perform(DRMOps::CONNECTOR_SET_POWER_MODE, token_.conn_id,
@@ -774,6 +777,8 @@ DisplayError HWDeviceDRM::DozeSuspend() {
return kErrorHardware; return kErrorHardware;
} }
drm_atomic_intf_->Perform(DRMOps::CRTC_GET_RELEASE_FENCE, token_.crtc_id, release_fence);
return kErrorNone; return kErrorNone;
} }

8
sdm/libs/core/drm/hw_device_drm.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, The Linux Foundation. All rights reserved. * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@@ -67,10 +67,10 @@ class HWDeviceDRM : public HWInterface {
virtual DisplayError SetDisplayAttributes(uint32_t index); virtual DisplayError SetDisplayAttributes(uint32_t index);
virtual DisplayError SetDisplayAttributes(const HWDisplayAttributes &display_attributes); virtual DisplayError SetDisplayAttributes(const HWDisplayAttributes &display_attributes);
virtual DisplayError GetConfigIndex(char *mode, uint32_t *index); virtual DisplayError GetConfigIndex(char *mode, uint32_t *index);
virtual DisplayError PowerOn(); virtual DisplayError PowerOn(int *release_fence);
virtual DisplayError PowerOff(); virtual DisplayError PowerOff();
virtual DisplayError Doze(); virtual DisplayError Doze(int *release_fence);
virtual DisplayError DozeSuspend(); virtual DisplayError DozeSuspend(int *release_fence);
virtual DisplayError Standby(); virtual DisplayError Standby();
virtual DisplayError Validate(HWLayers *hw_layers); virtual DisplayError Validate(HWLayers *hw_layers);
virtual DisplayError Commit(HWLayers *hw_layers); virtual DisplayError Commit(HWLayers *hw_layers);

4
sdm/libs/core/drm/hw_tv_drm.cpp
View File

@@ -165,11 +165,11 @@ DisplayError HWTVDRM::PowerOff() {
return kErrorNone; return kErrorNone;
} }
DisplayError HWTVDRM::Doze() { DisplayError HWTVDRM::Doze(int *release_fence) {
return kErrorNone; return kErrorNone;
} }
DisplayError HWTVDRM::DozeSuspend() { DisplayError HWTVDRM::DozeSuspend(int *release_fence) {
return kErrorNone; return kErrorNone;
} }

4
sdm/libs/core/drm/hw_tv_drm.h
View File

@@ -43,8 +43,8 @@ class HWTVDRM : public HWDeviceDRM {
virtual DisplayError SetDisplayAttributes(uint32_t index); virtual DisplayError SetDisplayAttributes(uint32_t index);
virtual DisplayError GetConfigIndex(char *mode, uint32_t *index); virtual DisplayError GetConfigIndex(char *mode, uint32_t *index);
virtual DisplayError PowerOff(); virtual DisplayError PowerOff();
virtual DisplayError Doze(); virtual DisplayError Doze(int *release_fence);
virtual DisplayError DozeSuspend(); virtual DisplayError DozeSuspend(int *release_fence);
virtual DisplayError Standby(); virtual DisplayError Standby();
virtual DisplayError Commit(HWLayers *hw_layers); virtual DisplayError Commit(HWLayers *hw_layers);
virtual void PopulateHWPanelInfo(); virtual void PopulateHWPanelInfo();

8
sdm/libs/core/fb/hw_device.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014 - 2017, The Linux Foundation. All rights reserved. * Copyright (c) 2014 - 2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@@ -155,7 +155,7 @@ DisplayError HWDevice::GetConfigIndex(char *mode, uint32_t *index) {
return kErrorNone; return kErrorNone;
} }
DisplayError HWDevice::PowerOn() { DisplayError HWDevice::PowerOn(int *release_fence) {
DTRACE_SCOPED(); DTRACE_SCOPED();
if (Sys::ioctl_(device_fd_, FBIOBLANK, FB_BLANK_UNBLANK) < 0) { if (Sys::ioctl_(device_fd_, FBIOBLANK, FB_BLANK_UNBLANK) < 0) {
@@ -174,11 +174,11 @@ DisplayError HWDevice::PowerOff() {
return kErrorNone; return kErrorNone;
} }
DisplayError HWDevice::Doze() { DisplayError HWDevice::Doze(int *release_fence) {
return kErrorNone; return kErrorNone;
} }
DisplayError HWDevice::DozeSuspend() { DisplayError HWDevice::DozeSuspend(int *release_fence) {
return kErrorNone; return kErrorNone;
} }

8
sdm/libs/core/fb/hw_device.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014 - 2017, The Linux Foundation. All rights reserved. * Copyright (c) 2014 - 2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted * Redistribution and use in source and binary forms, with or without modification, are permitted
* provided that the following conditions are met: * provided that the following conditions are met:
@@ -70,10 +70,10 @@ class HWDevice : public HWInterface {
virtual DisplayError SetDisplayAttributes(uint32_t index); virtual DisplayError SetDisplayAttributes(uint32_t index);
virtual DisplayError SetDisplayAttributes(const HWDisplayAttributes &display_attributes); virtual DisplayError SetDisplayAttributes(const HWDisplayAttributes &display_attributes);
virtual DisplayError GetConfigIndex(char *mode, uint32_t *index); virtual DisplayError GetConfigIndex(char *mode, uint32_t *index);
virtual DisplayError PowerOn(); virtual DisplayError PowerOn(int *release_fence);
virtual DisplayError PowerOff(); virtual DisplayError PowerOff();
virtual DisplayError Doze(); virtual DisplayError Doze(int *release_fence);
virtual DisplayError DozeSuspend(); virtual DisplayError DozeSuspend(int *release_fence);
virtual DisplayError Standby(); virtual DisplayError Standby();
virtual DisplayError Validate(HWLayers *hw_layers); virtual DisplayError Validate(HWLayers *hw_layers);
virtual DisplayError Commit(HWLayers *hw_layers); virtual DisplayError Commit(HWLayers *hw_layers);

6
sdm/libs/core/fb/hw_primary.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015 - 2017, The Linux Foundation. All rights reserved. * Copyright (c) 2015 - 2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@@ -344,7 +344,7 @@ DisplayError HWPrimary::PowerOff() {
return kErrorNone; return kErrorNone;
} }
DisplayError HWPrimary::Doze() { DisplayError HWPrimary::Doze(int *release_fence) {
if (Sys::ioctl_(device_fd_, FBIOBLANK, FB_BLANK_NORMAL) < 0) { if (Sys::ioctl_(device_fd_, FBIOBLANK, FB_BLANK_NORMAL) < 0) {
IOCTL_LOGE(FB_BLANK_NORMAL, device_type_); IOCTL_LOGE(FB_BLANK_NORMAL, device_type_);
return kErrorHardware; return kErrorHardware;
@@ -353,7 +353,7 @@ DisplayError HWPrimary::Doze() {
return kErrorNone; return kErrorNone;
} }
DisplayError HWPrimary::DozeSuspend() { DisplayError HWPrimary::DozeSuspend(int *release_fence) {
if (Sys::ioctl_(device_fd_, FBIOBLANK, FB_BLANK_VSYNC_SUSPEND) < 0) { if (Sys::ioctl_(device_fd_, FBIOBLANK, FB_BLANK_VSYNC_SUSPEND) < 0) {
IOCTL_LOGE(FB_BLANK_VSYNC_SUSPEND, device_type_); IOCTL_LOGE(FB_BLANK_VSYNC_SUSPEND, device_type_);
return kErrorHardware; return kErrorHardware;

6
sdm/libs/core/fb/hw_primary.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2015-2016, 2018 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted * Redistribution and use in source and binary forms, with or without modification, are permitted
* provided that the following conditions are met: * provided that the following conditions are met:
@@ -46,8 +46,8 @@ class HWPrimary : public HWDevice {
virtual DisplayError SetDisplayAttributes(uint32_t index); virtual DisplayError SetDisplayAttributes(uint32_t index);
virtual DisplayError GetConfigIndex(char *mode, uint32_t *index); virtual DisplayError GetConfigIndex(char *mode, uint32_t *index);
virtual DisplayError PowerOff(); virtual DisplayError PowerOff();
virtual DisplayError Doze(); virtual DisplayError Doze(int *release_fence);
virtual DisplayError DozeSuspend(); virtual DisplayError DozeSuspend(int *release_fence);
virtual DisplayError Validate(HWLayers *hw_layers); virtual DisplayError Validate(HWLayers *hw_layers);
virtual DisplayError Commit(HWLayers *hw_layers); virtual DisplayError Commit(HWLayers *hw_layers);
virtual void SetIdleTimeoutMs(uint32_t timeout_ms); virtual void SetIdleTimeoutMs(uint32_t timeout_ms);

8
sdm/libs/core/hw_interface.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014 - 2017, The Linux Foundation. All rights reserved. * Copyright (c) 2014 - 2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted * Redistribution and use in source and binary forms, with or without modification, are permitted
* provided that the following conditions are met: * provided that the following conditions are met:
@@ -85,10 +85,10 @@ class HWInterface {
virtual DisplayError SetDisplayAttributes(uint32_t index) = 0; virtual DisplayError SetDisplayAttributes(uint32_t index) = 0;
virtual DisplayError SetDisplayAttributes(const HWDisplayAttributes &display_attributes) = 0; virtual DisplayError SetDisplayAttributes(const HWDisplayAttributes &display_attributes) = 0;
virtual DisplayError GetConfigIndex(char *mode, uint32_t *index) = 0; virtual DisplayError GetConfigIndex(char *mode, uint32_t *index) = 0;
virtual DisplayError PowerOn() = 0; virtual DisplayError PowerOn(int *release_fence) = 0;
virtual DisplayError PowerOff() = 0; virtual DisplayError PowerOff() = 0;
virtual DisplayError Doze() = 0; virtual DisplayError Doze(int *release_fence) = 0;
virtual DisplayError DozeSuspend() = 0; virtual DisplayError DozeSuspend(int *release_fence) = 0;
virtual DisplayError Standby() = 0; virtual DisplayError Standby() = 0;
virtual DisplayError Validate(HWLayers *hw_layers) = 0; virtual DisplayError Validate(HWLayers *hw_layers) = 0;
virtual DisplayError Commit(HWLayers *hw_layers) = 0; virtual DisplayError Commit(HWLayers *hw_layers) = 0;

4
sdm/libs/hwc2/display_null.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, The Linux Foundation. All rights reserved. * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@@ -50,7 +50,7 @@ DisplayError DisplayNull::GetDisplayState(DisplayState *state) {
return kErrorNone; return kErrorNone;
} }
DisplayError DisplayNull::SetDisplayState(DisplayState state) { DisplayError DisplayNull::SetDisplayState(DisplayState state, int *release_fence) {
state_ = state; state_ = state;
return kErrorNone; return kErrorNone;
} }

4
sdm/libs/hwc2/display_null.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, The Linux Foundation. All rights reserved. * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@@ -44,7 +44,7 @@ class DisplayNull : public DisplayInterface {
virtual ~DisplayNull() { } virtual ~DisplayNull() { }
virtual DisplayError Commit(LayerStack *layer_stack); virtual DisplayError Commit(LayerStack *layer_stack);
virtual DisplayError GetDisplayState(DisplayState *state); virtual DisplayError GetDisplayState(DisplayState *state);
virtual DisplayError SetDisplayState(DisplayState state); virtual DisplayError SetDisplayState(DisplayState state, int *release_fence);
virtual DisplayError SetFrameBufferConfig(const DisplayConfigVariableInfo &variable_info); virtual DisplayError SetFrameBufferConfig(const DisplayConfigVariableInfo &variable_info);
virtual DisplayError GetFrameBufferConfig(DisplayConfigVariableInfo *variable_info); virtual DisplayError GetFrameBufferConfig(DisplayConfigVariableInfo *variable_info);
virtual bool IsUnderscanSupported() { return true; } virtual bool IsUnderscanSupported() { return true; }

25
sdm/libs/hwc2/hwc_display.cpp
View File

@@ -743,9 +743,10 @@ HWC2::Error HWCDisplay::SetPowerMode(HWC2::PowerMode mode) {
default: default:
return HWC2::Error::BadParameter; return HWC2::Error::BadParameter;
} }
int release_fence = -1;
ATRACE_INT("SetPowerMode ", state); ATRACE_INT("SetPowerMode ", state);
DisplayError error = display_intf_->SetDisplayState(state); DisplayError error = display_intf_->SetDisplayState(state, &release_fence);
validated_ = false; validated_ = false;
if (error == kErrorNone) { if (error == kErrorNone) {
@@ -759,6 +760,20 @@ HWC2::Error HWCDisplay::SetPowerMode(HWC2::PowerMode mode) {
return HWC2::Error::BadParameter; return HWC2::Error::BadParameter;
} }
if (release_fence >= 0) {
for (auto hwc_layer : layer_set_) {
auto fence = hwc_layer->PopBackReleaseFence();
auto merged_fence = -1;
if (fence >= 0) {
merged_fence = sync_merge("sync_merge", release_fence, fence);
::close(fence);
} else {
merged_fence = ::dup(release_fence);
}
hwc_layer->PushBackReleaseFence(merged_fence);
}
::close(release_fence);
}
return HWC2::Error::None; return HWC2::Error::None;
} }
@@ -1142,7 +1157,7 @@ HWC2::Error HWCDisplay::GetReleaseFences(uint32_t *out_num_elements, hwc2_layer_
for (uint32_t i = 0; i < *out_num_elements; i++, it++) { for (uint32_t i = 0; i < *out_num_elements; i++, it++) {
auto hwc_layer = *it; auto hwc_layer = *it;
out_layers[i] = hwc_layer->GetId(); out_layers[i] = hwc_layer->GetId();
out_fences[i] = hwc_layer->PopReleaseFence(); out_fences[i] = hwc_layer->PopFrontReleaseFence();
} }
} else { } else {
*out_num_elements = UINT32(layer_set_.size()); *out_num_elements = UINT32(layer_set_.size());
@@ -1313,15 +1328,15 @@ HWC2::Error HWCDisplay::PostCommitLayerStack(int32_t *out_retire_fence) {
if (swap_interval_zero_ || layer->flags.single_buffer) { if (swap_interval_zero_ || layer->flags.single_buffer) {
close(layer_buffer->release_fence_fd); close(layer_buffer->release_fence_fd);
} else if (layer->composition != kCompositionGPU) { } else if (layer->composition != kCompositionGPU) {
hwc_layer->PushReleaseFence(layer_buffer->release_fence_fd); hwc_layer->PushBackReleaseFence(layer_buffer->release_fence_fd);
} else { } else {
hwc_layer->PushReleaseFence(-1); hwc_layer->PushBackReleaseFence(-1);
} }
} else { } else {
// In case of flush, we don't return an error to f/w, so it will get a release fence out of // In case of flush, we don't return an error to f/w, so it will get a release fence out of
// the hwc_layer's release fence queue. We should push a -1 to preserve release fence // the hwc_layer's release fence queue. We should push a -1 to preserve release fence
// circulation semantics. // circulation semantics.
hwc_layer->PushReleaseFence(-1); hwc_layer->PushBackReleaseFence(-1);
} }
layer_buffer->release_fence_fd = -1; layer_buffer->release_fence_fd = -1;

15
sdm/libs/hwc2/hwc_display_external.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved. * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@@ -239,9 +239,12 @@ int HWCDisplayExternal::SetState(bool connected) {
DLOGW("Set frame buffer config failed. Error = %d", error); DLOGW("Set frame buffer config failed. Error = %d", error);
return -1; return -1;
} }
int release_fence = -1;
display_null_.GetDisplayState(&state); display_null_.GetDisplayState(&state);
display_intf_->SetDisplayState(state); display_intf_->SetDisplayState(state, &release_fence);
if (release_fence >= 0) {
::close(release_fence);
}
validated_ = false; validated_ = false;
SetVsyncEnabled(HWC2::Vsync::Enable); SetVsyncEnabled(HWC2::Vsync::Enable);
@@ -253,10 +256,14 @@ int HWCDisplayExternal::SetState(bool connected) {
} }
} else { } else {
if (!display_null_.IsActive()) { if (!display_null_.IsActive()) {
int release_fence = -1;
// Preserve required attributes of HDMI display that surfaceflinger sees. // Preserve required attributes of HDMI display that surfaceflinger sees.
// Restore HDMI attributes when display is reconnected. // Restore HDMI attributes when display is reconnected.
display_intf_->GetDisplayState(&state); display_intf_->GetDisplayState(&state);
display_null_.SetDisplayState(state); display_null_.SetDisplayState(state, &release_fence);
if (release_fence >= 0) {
::close(release_fence);
}
error = display_intf_->GetFrameBufferConfig(&fb_config); error = display_intf_->GetFrameBufferConfig(&fb_config);
if (error != kErrorNone) { if (error != kErrorNone) {

26
sdm/libs/hwc2/hwc_layers.cpp
View File

@@ -170,14 +170,14 @@ HWCLayer::HWCLayer(hwc2_display_t display_id, HWCBufferAllocator *buf_allocator)
layer_ = new Layer(); layer_ = new Layer();
// Fences are deferred, so the first time this layer is presented, return -1 // Fences are deferred, so the first time this layer is presented, return -1
// TODO(user): Verify that fences are properly obtained on suspend/resume // TODO(user): Verify that fences are properly obtained on suspend/resume
release_fences_.push(-1); release_fences_.push_back(-1);
} }
HWCLayer::~HWCLayer() { HWCLayer::~HWCLayer() {
// Close any fences left for this layer // Close any fences left for this layer
while (!release_fences_.empty()) { while (!release_fences_.empty()) {
::close(release_fences_.front()); ::close(release_fences_.front());
release_fences_.pop(); release_fences_.pop_front();
} }
if (layer_) { if (layer_) {
if (layer_->input_buffer.acquire_fence_fd >= 0) { if (layer_->input_buffer.acquire_fence_fd >= 0) {
@@ -887,14 +887,28 @@ void HWCLayer::SetComposition(const LayerComposition &sdm_composition) {
return; return;
} }
void HWCLayer::PushReleaseFence(int32_t fence) {
release_fences_.push(fence); void HWCLayer::PushBackReleaseFence(int32_t fence) {
release_fences_.push_back(fence);
} }
int32_t HWCLayer::PopReleaseFence(void) {
int32_t HWCLayer::PopBackReleaseFence() {
if (release_fences_.empty()) if (release_fences_.empty())
return -1; return -1;
auto fence = release_fences_.back();
release_fences_.pop_back();
return fence;
}
int32_t HWCLayer::PopFrontReleaseFence() {
if (release_fences_.empty())
return -1;
auto fence = release_fences_.front(); auto fence = release_fences_.front();
release_fences_.pop(); release_fences_.pop_front();
return fence; return fence;
} }

9
sdm/libs/hwc2/hwc_layers.h
View File

@@ -32,7 +32,7 @@
#undef HWC2_INCLUDE_STRINGIFICATION #undef HWC2_INCLUDE_STRINGIFICATION
#undef HWC2_USE_CPP11 #undef HWC2_USE_CPP11
#include <map> #include <map>
#include <queue> #include <deque>
#include <set> #include <set>
#include "core/buffer_allocator.h" #include "core/buffer_allocator.h"
#include "hwc_buffer_allocator.h" #include "hwc_buffer_allocator.h"
@@ -88,8 +88,9 @@ class HWCLayer {
int32_t GetLayerDataspace() { return dataspace_; } int32_t GetLayerDataspace() { return dataspace_; }
uint32_t GetGeometryChanges() { return geometry_changes_; } uint32_t GetGeometryChanges() { return geometry_changes_; }
void ResetGeometryChanges() { geometry_changes_ = GeometryChanges::kNone; } void ResetGeometryChanges() { geometry_changes_ = GeometryChanges::kNone; }
void PushReleaseFence(int32_t fence); void PushBackReleaseFence(int32_t fence);
int32_t PopReleaseFence(void); int32_t PopBackReleaseFence(void);
int32_t PopFrontReleaseFence(void);
bool ValidateAndSetCSC(); bool ValidateAndSetCSC();
bool SupportLocalConversion(ColorPrimaries working_primaries); bool SupportLocalConversion(ColorPrimaries working_primaries);
void ResetValidation() { needs_validate_ = false; } void ResetValidation() { needs_validate_ = false; }
@@ -105,7 +106,7 @@ class HWCLayer {
const hwc2_layer_t id_; const hwc2_layer_t id_;
const hwc2_display_t display_id_; const hwc2_display_t display_id_;
static std::atomic<hwc2_layer_t> next_id_; static std::atomic<hwc2_layer_t> next_id_;
std::queue<int32_t> release_fences_; std::deque<int32_t> release_fences_;
HWCBufferAllocator *buffer_allocator_ = NULL; HWCBufferAllocator *buffer_allocator_ = NULL;
int32_t dataspace_ = HAL_DATASPACE_UNKNOWN; int32_t dataspace_ = HAL_DATASPACE_UNKNOWN;
LayerTransform layer_transform_ = {}; LayerTransform layer_transform_ = {};