Merge \"HWC2: Fix virtual displays\" into nyc-mr1-dev (8abbfbcd) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/DisplayHardware/HWC2.cpp

+16 −2

Original line number	Diff line number	Diff line
		@@ -149,7 +149,12 @@ Device::~Device()
		}

		for (auto element : mDisplays) {
		auto display = element.second;
		auto display = element.second.lock();
		if (!display) {
		ALOGE("~Device: Found a display (%" PRId64 " that has already been"
		" destroyed", element.first);
		continue;
		}

		DisplayType displayType = HWC2::DisplayType::Invalid;
		auto error = display->getType(&displayType);
		@@ -208,6 +213,10 @@ Error Device::createVirtualDisplay(uint32_t width, uint32_t height,
		ALOGI("Created virtual display");
		*format = static_cast<android_pixel_format_t>(intFormat);
		*outDisplay = getDisplayById(displayId);
		if (!*outDisplay) {
		ALOGE("Failed to get display by id");
		return Error::BadDisplay;
		}
		(*outDisplay)->setVirtual();
		return Error::None;
		}
		@@ -289,7 +298,10 @@ void Device::callVsync(std::shared_ptr<Display> display, nsecs_t timestamp)

		std::shared_ptr<Display> Device::getDisplayById(hwc2_display_t id) {
		if (mDisplays.count(id) != 0) {
		return mDisplays.at(id);
		auto strongDisplay = mDisplays[id].lock();
		ALOGE_IF(!strongDisplay, "Display %" PRId64 " is in mDisplays but is no"
		" longer alive", id);
		return strongDisplay;
		}

		auto display = std::make_shared<Display>(*this, id);
		@@ -430,6 +442,7 @@ void Device::destroyVirtualDisplay(hwc2_display_t display)
		auto error = static_cast<Error>(intError);
		ALOGE_IF(error != Error::None, "destroyVirtualDisplay(%" PRIu64 ") failed:"
		" %s (%d)", display, to_string(error).c_str(), intError);
		mDisplays.erase(display);
		}

		// Display methods
		@@ -810,6 +823,7 @@ Error Display::setOutputBuffer(const sp<GraphicBuffer>& buffer,
		auto handle = buffer->getNativeBuffer()->handle;
		int32_t intError = mDevice.mSetOutputBuffer(mDevice.mHwcDevice, mId, handle,
		fenceFd);
		close(fenceFd);
		return static_cast<Error>(intError);
		}

services/surfaceflinger/DisplayHardware/HWC2.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -88,7 +88,8 @@ public:
		// Other Device methods

		// This will create a Display if one is not found, but it will not be marked
		// as connected
		// as connected. This Display may be null if the display has been torn down
		// but has not been removed from the map yet.
		std::shared_ptr<Display> getDisplayById(hwc2_display_t id);

		bool hasCapability(HWC2::Capability capability) const;
		@@ -181,7 +182,7 @@ private:
		HWC2_PFN_SET_LAYER_Z_ORDER mSetLayerZOrder;

		std::vector<Capability> mCapabilities;
		std::unordered_map<hwc2_display_t, std::shared_ptr<Display>> mDisplays;
		std::unordered_map<hwc2_display_t, std::weak_ptr<Display>> mDisplays;

		HotplugCallback mHotplug;
		std::vector<std::pair<std::shared_ptr<Display>, Connection>>