vi: check layer state before opening or closing

This commit is contained in:
Liam 2024-01-17 22:03:40 -05:00
parent ce89580749
commit e4bbb24dcf
4 changed files with 27 additions and 12 deletions

View file

@ -174,24 +174,28 @@ void Nvnflinger::CreateLayerAtId(VI::Display& display, u64 layer_id) {
display.CreateLayer(layer_id, buffer_id, nvdrv->container); display.CreateLayer(layer_id, buffer_id, nvdrv->container);
} }
void Nvnflinger::OpenLayer(u64 layer_id) { bool Nvnflinger::OpenLayer(u64 layer_id) {
const auto lock_guard = Lock(); const auto lock_guard = Lock();
for (auto& display : displays) { for (auto& display : displays) {
if (auto* layer = display.FindLayer(layer_id); layer) { if (auto* layer = display.FindLayer(layer_id); layer) {
layer->Open(); return layer->Open();
}
} }
} }
void Nvnflinger::CloseLayer(u64 layer_id) { return false;
}
bool Nvnflinger::CloseLayer(u64 layer_id) {
const auto lock_guard = Lock(); const auto lock_guard = Lock();
for (auto& display : displays) { for (auto& display : displays) {
if (auto* layer = display.FindLayer(layer_id); layer) { if (auto* layer = display.FindLayer(layer_id); layer) {
layer->Close(); return layer->Close();
} }
} }
return false;
} }
void Nvnflinger::DestroyLayer(u64 layer_id) { void Nvnflinger::DestroyLayer(u64 layer_id) {

View file

@ -74,10 +74,10 @@ public:
[[nodiscard]] std::optional<u64> CreateLayer(u64 display_id); [[nodiscard]] std::optional<u64> CreateLayer(u64 display_id);
/// Opens a layer on all displays for the given layer ID. /// Opens a layer on all displays for the given layer ID.
void OpenLayer(u64 layer_id); bool OpenLayer(u64 layer_id);
/// Closes a layer on all displays for the given layer ID. /// Closes a layer on all displays for the given layer ID.
void CloseLayer(u64 layer_id); bool CloseLayer(u64 layer_id);
/// Destroys the given layer ID. /// Destroys the given layer ID.
void DestroyLayer(u64 layer_id); void DestroyLayer(u64 layer_id);

View file

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include <utility>
#include "common/common_types.h" #include "common/common_types.h"
@ -75,12 +76,12 @@ public:
return open; return open;
} }
void Close() { bool Close() {
open = false; return std::exchange(open, false);
} }
void Open() { bool Open() {
open = true; return !std::exchange(open, true);
} }
private: private:

View file

@ -719,7 +719,12 @@ private:
return; return;
} }
nvnflinger.OpenLayer(layer_id); if (!nvnflinger.OpenLayer(layer_id)) {
LOG_WARNING(Service_VI, "Tried to open layer which was already open");
IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ResultOperationFailed);
return;
}
android::OutputParcel parcel; android::OutputParcel parcel;
parcel.WriteInterface(NativeWindow{*buffer_queue_id}); parcel.WriteInterface(NativeWindow{*buffer_queue_id});
@ -737,7 +742,12 @@ private:
LOG_DEBUG(Service_VI, "called. layer_id=0x{:016X}", layer_id); LOG_DEBUG(Service_VI, "called. layer_id=0x{:016X}", layer_id);
nvnflinger.CloseLayer(layer_id); if (!nvnflinger.CloseLayer(layer_id)) {
LOG_WARNING(Service_VI, "Tried to close layer which was not open");
IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ResultOperationFailed);
return;
}
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);