Merge "Allow first power mode as off state" into tm-qpr-dev (59e3eb4a) · Commits · e / os / android_frameworks_native

services/surfaceflinger/DisplayDevice.cpp

+7 −5

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ DisplayDevice::DisplayDevice(DisplayDeviceCreationArgs& args)

		mCompositionDisplay->getRenderSurface()->initialize();

		setPowerMode(args.initialPowerMode);
		if (args.initialPowerMode.has_value()) setPowerMode(args.initialPowerMode.value());

		// initialize the display orientation transform.
		setProjection(ui::ROTATION_0, Rect::INVALID_RECT, Rect::INVALID_RECT);
		@@ -183,19 +183,21 @@ void DisplayDevice::setPowerMode(hal::PowerMode mode) {
		}

		mPowerMode = mode;
		getCompositionDisplay()->setCompositionEnabled(mPowerMode != hal::PowerMode::OFF);

		getCompositionDisplay()->setCompositionEnabled(mPowerMode.has_value() &&
		*mPowerMode != hal::PowerMode::OFF);
		}

		void DisplayDevice::enableLayerCaching(bool enable) {
		getCompositionDisplay()->setLayerCachingEnabled(enable);
		}

		hal::PowerMode DisplayDevice::getPowerMode() const {
		std::optional<hal::PowerMode> DisplayDevice::getPowerMode() const {
		return mPowerMode;
		}

		bool DisplayDevice::isPoweredOn() const {
		return mPowerMode != hal::PowerMode::OFF;
		return mPowerMode && *mPowerMode != hal::PowerMode::OFF;
		}

		void DisplayDevice::setActiveMode(DisplayModeId id) {
		@@ -384,7 +386,7 @@ void DisplayDevice::dump(std::string& result) const {
		}

		result += "\n powerMode="s;
		result += to_string(mPowerMode);
		result += mPowerMode.has_value() ? to_string(mPowerMode.value()) : "OFF(reset)";
		result += '\n';

		if (mRefreshRateConfigs) {

services/surfaceflinger/DisplayDevice.h

+4 −5

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ public:
		/* ------------------------------------------------------------------------
		* Display power mode management.
		*/
		hardware::graphics::composer::hal::PowerMode getPowerMode() const;
		std::optional<hardware::graphics::composer::hal::PowerMode> getPowerMode() const;
		void setPowerMode(hardware::graphics::composer::hal::PowerMode mode);
		bool isPoweredOn() const;

		@@ -281,8 +281,8 @@ private:

		static ui::Transform::RotationFlags sPrimaryDisplayRotationFlags;

		hardware::graphics::composer::hal::PowerMode mPowerMode =
		hardware::graphics::composer::hal::PowerMode::OFF;
		// allow initial power mode as null.
		std::optional<hardware::graphics::composer::hal::PowerMode> mPowerMode;
		DisplayModePtr mActiveMode;
		std::optional<float> mStagedBrightness = std::nullopt;
		float mBrightness = -1.f;
		@@ -366,8 +366,7 @@ struct DisplayDeviceCreationArgs {
		HdrCapabilities hdrCapabilities;
		int32_t supportedPerFrameMetadata{0};
		std::unordered_map<ui::ColorMode, std::vector<ui::RenderIntent>> hwcColorModes;
		hardware::graphics::composer::hal::PowerMode initialPowerMode{
		hardware::graphics::composer::hal::PowerMode::ON};
		std::optional<hardware::graphics::composer::hal::PowerMode> initialPowerMode;
		bool isPrimary{false};
		DisplayModes supportedModes;
		DisplayModeId activeModeId;

services/surfaceflinger/SurfaceFlinger.cpp

+7 −6

Original line number	Diff line number	Diff line
		@@ -2889,7 +2889,8 @@ sp<DisplayDevice> SurfaceFlinger::setupNewDisplayDeviceInternal(
		ALOGV("Display Orientation: %s", toCString(creationArgs.physicalOrientation));

		// virtual displays are always considered enabled
		creationArgs.initialPowerMode = state.isVirtual() ? hal::PowerMode::ON : hal::PowerMode::OFF;
		creationArgs.initialPowerMode =
		state.isVirtual() ? std::make_optional(hal::PowerMode::ON) : std::nullopt;

		sp<DisplayDevice> display = getFactory().createDisplayDevice(creationArgs);

		@@ -4870,8 +4871,8 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, hal:
		const auto displayId = display->getPhysicalId();
		ALOGD("Setting power mode %d on display %s", mode, to_string(displayId).c_str());

		const hal::PowerMode currentMode = display->getPowerMode();
		if (mode == currentMode) {
		std::optional<hal::PowerMode> currentMode = display->getPowerMode();
		if (currentMode.has_value() && mode == *currentMode) {
		return;
		}

		@@ -4887,7 +4888,7 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, hal:
		mInterceptor->savePowerModeUpdate(display->getSequenceId(), static_cast<int32_t>(mode));
		}
		const auto refreshRate = display->refreshRateConfigs().getActiveMode()->getFps();
		if (currentMode == hal::PowerMode::OFF) {
		if (*currentMode == hal::PowerMode::OFF) {
		// Turn on the display
		if (display->isInternal() && (!activeDisplay \|\| !activeDisplay->isPoweredOn())) {
		onActiveDisplayChangedLocked(display);
		@@ -4918,7 +4919,7 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, hal:
		if (SurfaceFlinger::setSchedAttr(false) != NO_ERROR) {
		ALOGW("Couldn't set uclamp.min on display off: %s\n", strerror(errno));
		}
		if (isDisplayActiveLocked(display) && currentMode != hal::PowerMode::DOZE_SUSPEND) {
		if (isDisplayActiveLocked(display) && *currentMode != hal::PowerMode::DOZE_SUSPEND) {
		mScheduler->disableHardwareVsync(true);
		mScheduler->onScreenReleased(mAppConnectionHandle);
		}
		@@ -4932,7 +4933,7 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, hal:
		} else if (mode == hal::PowerMode::DOZE \|\| mode == hal::PowerMode::ON) {
		// Update display while dozing
		getHwComposer().setPowerMode(displayId, mode);
		if (isDisplayActiveLocked(display) && currentMode == hal::PowerMode::DOZE_SUSPEND) {
		if (isDisplayActiveLocked(display) && *currentMode == hal::PowerMode::DOZE_SUSPEND) {
		mScheduler->onScreenAcquired(mAppConnectionHandle);
		mScheduler->resyncToHardwareVsync(true, refreshRate);
		}

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -745,6 +745,7 @@ public:
		mHwcDisplayId(hwcDisplayId) {
		mCreationArgs.connectionType = connectionType;
		mCreationArgs.isPrimary = isPrimary;
		mCreationArgs.initialPowerMode = hal::PowerMode::ON;
		}

		sp<IBinder> token() const { return mDisplayToken; }