sdm: Handle InverseMount adjustments in SDM.
Map all dirty rects w.r.t panel orientation.
Crop source rects considering ROI & panel orientation.
CRs-Fixed: 2048467
Change-Id: I3634037ce898179e9b7587117a46cb2cc87bd144
diff --git a/sdm/include/private/resource_interface.h b/sdm/include/private/resource_interface.h
index e140c33..f57d760 100644
--- a/sdm/include/private/resource_interface.h
+++ b/sdm/include/private/resource_interface.h
@@ -58,8 +58,9 @@
virtual DisplayError ValidateScaling(const LayerRect &crop, const LayerRect &dst,
bool rotate90, BufferLayout layout,
bool use_rotator_downscale) = 0;
- virtual DisplayError ValidateCursorPosition(Handle display_ctx, HWLayers *hw_layers,
- int x, int y) = 0;
+ virtual DisplayError ValidateAndSetCursorPosition(Handle display_ctx, HWLayers *hw_layers,
+ int x, int y,
+ DisplayConfigVariableInfo *fb_config) = 0;
virtual DisplayError SetMaxBandwidthMode(HWBwModes mode) = 0;
virtual DisplayError GetScaleLutConfig(HWScaleLutInfo *lut_info) = 0;
virtual DisplayError SetDetailEnhancerData(Handle display_ctx,
diff --git a/sdm/libs/core/comp_manager.cpp b/sdm/libs/core/comp_manager.cpp
index d18b5b8..f35c1c6 100644
--- a/sdm/libs/core/comp_manager.cpp
+++ b/sdm/libs/core/comp_manager.cpp
@@ -121,6 +121,7 @@
registered_displays_[type] = 1;
display_comp_ctx->is_primary_panel = hw_panel_info.is_primary_panel;
display_comp_ctx->display_type = type;
+ display_comp_ctx->fb_config = fb_config;
*display_ctx = display_comp_ctx;
// New non-primary display device has been added, so move the composition mode to safe mode until
// resources for the added display is configured properly.
@@ -207,6 +208,8 @@
}
}
+ // Update new resolution.
+ display_comp_ctx->fb_config = fb_config;
return error;
}
@@ -459,13 +462,13 @@
return resource_intf_->ValidateScaling(crop, dst, rotate90, layout, true);
}
-DisplayError CompManager::ValidateCursorPosition(Handle display_ctx, HWLayers *hw_layers,
+DisplayError CompManager::ValidateAndSetCursorPosition(Handle display_ctx, HWLayers *hw_layers,
int x, int y) {
DisplayCompositionContext *display_comp_ctx =
reinterpret_cast<DisplayCompositionContext *>(display_ctx);
Handle &display_resource_ctx = display_comp_ctx->display_resource_ctx;
-
- return resource_intf_->ValidateCursorPosition(display_resource_ctx, hw_layers, x, y);
+ return resource_intf_->ValidateAndSetCursorPosition(display_resource_ctx, hw_layers, x, y,
+ &display_comp_ctx->fb_config);
}
DisplayError CompManager::SetMaxBandwidthMode(HWBwModes mode) {
diff --git a/sdm/libs/core/comp_manager.h b/sdm/libs/core/comp_manager.h
index c6b8972..6cc33cf 100644
--- a/sdm/libs/core/comp_manager.h
+++ b/sdm/libs/core/comp_manager.h
@@ -66,7 +66,7 @@
DisplayError SetMaxMixerStages(Handle display_ctx, uint32_t max_mixer_stages);
void ControlPartialUpdate(Handle display_ctx, bool enable);
DisplayError ValidateScaling(const LayerRect &crop, const LayerRect &dst, bool rotate90);
- DisplayError ValidateCursorPosition(Handle display_ctx, HWLayers *hw_layers, int x, int y);
+ DisplayError ValidateAndSetCursorPosition(Handle display_ctx, HWLayers *hw_layers, int x, int y);
bool SetDisplayState(Handle display_ctx, DisplayState state, DisplayType display_type);
DisplayError SetMaxBandwidthMode(HWBwModes mode);
DisplayError GetScaleLutConfig(HWScaleLutInfo *lut_info);
@@ -97,6 +97,7 @@
// panel parameters for now.
bool is_primary_panel = false;
PUConstraints pu_constraints = {};
+ DisplayConfigVariableInfo fb_config = {};
};
Locker locker_;
diff --git a/sdm/libs/core/display_base.cpp b/sdm/libs/core/display_base.cpp
index f6540cd..d59272a 100644
--- a/sdm/libs/core/display_base.cpp
+++ b/sdm/libs/core/display_base.cpp
@@ -960,7 +960,8 @@
return kErrorNotSupported;
}
- DisplayError error = comp_manager_->ValidateCursorPosition(display_comp_ctx_, &hw_layers_, x, y);
+ DisplayError error = comp_manager_->ValidateAndSetCursorPosition(display_comp_ctx_, &hw_layers_,
+ x, y);
if (error == kErrorNone) {
return hw_intf_->SetCursorPosition(&hw_layers_, x, y);
}
diff --git a/sdm/libs/core/display_primary.cpp b/sdm/libs/core/display_primary.cpp
index bb467fa..d33c0be 100644
--- a/sdm/libs/core/display_primary.cpp
+++ b/sdm/libs/core/display_primary.cpp
@@ -90,32 +90,6 @@
uint32_t new_mixer_height = 0;
uint32_t display_width = display_attributes_.x_pixels;
uint32_t display_height = display_attributes_.y_pixels;
- bool needs_hv_flip = hw_panel_info_.panel_orientation.flip_horizontal &&
- hw_panel_info_.panel_orientation.flip_vertical;
- LayerRect src_domain = {};
- LayerTransform panel_transform = {};
- DisplayConfigVariableInfo variable_info = {};
-
- if (needs_hv_flip) {
- DisplayBase::GetFrameBufferConfig(&variable_info);
- src_domain.right = variable_info.x_pixels;
- src_domain.bottom = variable_info.y_pixels;
- panel_transform.flip_horizontal = hw_panel_info_.panel_orientation.flip_horizontal;
- panel_transform.flip_vertical = hw_panel_info_.panel_orientation.flip_vertical;
-
- for (Layer *layer : layer_stack->layers) {
- // Modify destination based on panel flip
- TransformHV(src_domain, layer->dst_rect, panel_transform, &layer->dst_rect);
-
- if (layer->flags.solid_fill) {
- continue;
- }
-
- layer->transform.flip_horizontal ^= (hw_panel_info_.panel_orientation.flip_horizontal);
- layer->transform.flip_vertical ^= (hw_panel_info_.panel_orientation.flip_vertical);
- // TODO(user): Check how to handle rotation, if panel has rotation.
- }
- }
if (NeedsMixerReconfiguration(layer_stack, &new_mixer_width, &new_mixer_height)) {
error = ReconfigureMixer(new_mixer_width, new_mixer_height);
diff --git a/sdm/libs/core/fb/hw_device.cpp b/sdm/libs/core/fb/hw_device.cpp
index 773845b..e5689ae 100644
--- a/sdm/libs/core/fb/hw_device.cpp
+++ b/sdm/libs/core/fb/hw_device.cpp
@@ -1141,8 +1141,8 @@
async_layer.pipe_ndx = left_pipe->pipe_id;
async_layer.src.x = UINT32(left_pipe->src_roi.left);
async_layer.src.y = UINT32(left_pipe->src_roi.top);
- async_layer.dst.x = UINT32(x);
- async_layer.dst.y = UINT32(y);
+ async_layer.dst.x = UINT32(left_pipe->dst_roi.left);
+ async_layer.dst.y = UINT32(left_pipe->dst_roi.top);
mdp_position_update pos_update = {};
pos_update.input_layer_cnt = 1;
diff --git a/sdm/libs/core/resource_default.cpp b/sdm/libs/core/resource_default.cpp
index 2d74941..8e89784 100644
--- a/sdm/libs/core/resource_default.cpp
+++ b/sdm/libs/core/resource_default.cpp
@@ -923,8 +923,9 @@
return kErrorNone;
}
-DisplayError ResourceDefault::ValidateCursorPosition(Handle display_ctx, HWLayers *hw_layers,
- int x, int y) {
+DisplayError ResourceDefault::ValidateAndSetCursorPosition(Handle display_ctx, HWLayers *hw_layers,
+ int x, int y,
+ DisplayConfigVariableInfo *fb_config) {
return kErrorNotSupported;
}
diff --git a/sdm/libs/core/resource_default.h b/sdm/libs/core/resource_default.h
index f835410..76d19f3 100644
--- a/sdm/libs/core/resource_default.h
+++ b/sdm/libs/core/resource_default.h
@@ -60,7 +60,8 @@
virtual DisplayError ValidateScaling(const LayerRect &crop, const LayerRect &dst, bool rotate90,
BufferLayout layout, bool use_rotator_downscale);
DisplayError ValidateCursorConfig(Handle display_ctx, const Layer *layer, bool is_top);
- DisplayError ValidateCursorPosition(Handle display_ctx, HWLayers *hw_layers, int x, int y);
+ DisplayError ValidateAndSetCursorPosition(Handle display_ctx, HWLayers *hw_layers, int x, int y,
+ DisplayConfigVariableInfo *fb_config);
DisplayError SetMaxBandwidthMode(HWBwModes mode);
virtual DisplayError SetDetailEnhancerData(Handle display_ctx,
const DisplayDetailEnhancerData &de_data);
diff --git a/sdm/libs/hwc2/hwc_layers.cpp b/sdm/libs/hwc2/hwc_layers.cpp
index 7fcd56b..cd7a428 100644
--- a/sdm/libs/hwc2/hwc_layers.cpp
+++ b/sdm/libs/hwc2/hwc_layers.cpp
@@ -273,6 +273,17 @@
layer_->transform = layer_transform_;
}
+HWC2::Error HWCLayer::SetCursorPosition(int32_t x, int32_t y) {
+ hwc_rect_t frame = {};
+ frame.left = x;
+ frame.top = y;
+ frame.right = x + INT(layer_->dst_rect.right - layer_->dst_rect.left);
+ frame.bottom = y + INT(layer_->dst_rect.bottom - layer_->dst_rect.top);
+ SetLayerDisplayFrame(frame);
+
+ return HWC2::Error::None;
+}
+
HWC2::Error HWCLayer::SetLayerPlaneAlpha(float alpha) {
// Conversion of float alpha in range 0.0 to 1.0 similar to the HWC Adapter
uint8_t plane_alpha = static_cast<uint8_t>(std::round(255.0f * alpha));
diff --git a/sdm/libs/hwc2/hwc_layers.h b/sdm/libs/hwc2/hwc_layers.h
index 82bf466..b42699d 100644
--- a/sdm/libs/hwc2/hwc_layers.h
+++ b/sdm/libs/hwc2/hwc_layers.h
@@ -69,6 +69,7 @@
HWC2::Error SetLayerCompositionType(HWC2::Composition type);
HWC2::Error SetLayerDataspace(int32_t dataspace);
HWC2::Error SetLayerDisplayFrame(hwc_rect_t frame);
+ HWC2::Error SetCursorPosition(int32_t x, int32_t y);
HWC2::Error SetLayerPlaneAlpha(float alpha);
HWC2::Error SetLayerSourceCrop(hwc_frect_t crop);
HWC2::Error SetLayerSurfaceDamage(hwc_region_t damage);
diff --git a/sdm/libs/hwc2/hwc_session.cpp b/sdm/libs/hwc2/hwc_session.cpp
index 7b68eb8..2f0ad5f 100644
--- a/sdm/libs/hwc2/hwc_session.cpp
+++ b/sdm/libs/hwc2/hwc_session.cpp
@@ -469,8 +469,14 @@
static int32_t SetCursorPosition(hwc2_device_t *device, hwc2_display_t display, hwc2_layer_t layer,
int32_t x, int32_t y) {
- return HWCSession::CallDisplayFunction(device, display, &HWCDisplay::SetCursorPosition, layer, x,
- y);
+ auto status = INT32(HWC2::Error::None);
+ status = HWCSession::CallDisplayFunction(device, display, &HWCDisplay::SetCursorPosition,
+ layer, x, y);
+ if (status == INT32(HWC2::Error::None)) {
+ // Update cursor position
+ HWCSession::CallLayerFunction(device, display, layer, &HWCLayer::SetCursorPosition, x, y);
+ }
+ return status;
}
static int32_t SetLayerBlendMode(hwc2_device_t *device, hwc2_display_t display, hwc2_layer_t layer,