This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch devs/devilhorns/apos
in repository efl.
View the commit online.
commit e0aa272c8394903f45755048472e5ba84c303618
Author: Christopher Michael <devilho...@comcast.net>
AuthorDate: Sat Sep 6 08:23:49 2025 -0500
ecore_drm2: Fixup ecore_drm2_display_mode_set to not take x/y values
---
src/lib/ecore_drm2/Ecore_Drm2.h | 2 +-
src/lib/ecore_drm2/ecore_drm2_displays.c | 38 ++++++++++++++++----------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/lib/ecore_drm2/Ecore_Drm2.h b/src/lib/ecore_drm2/Ecore_Drm2.h
index 47c2187681..de3228ad78 100644
--- a/src/lib/ecore_drm2/Ecore_Drm2.h
+++ b/src/lib/ecore_drm2/Ecore_Drm2.h
@@ -157,7 +157,7 @@ EAPI const Eina_List *ecore_drm2_displays_get(Ecore_Drm2_Device *dev);
EAPI void ecore_drm2_display_info_get(Ecore_Drm2_Display *disp, int *x, int *y, int *w, int *h, unsigned int *refresh);
EAPI int ecore_drm2_display_rotation_get(Ecore_Drm2_Display *disp);
EAPI void ecore_drm2_display_rotation_set(Ecore_Drm2_Display *disp, uint64_t rotation);
-EAPI void ecore_drm2_display_mode_set(Ecore_Drm2_Display *disp, Ecore_Drm2_Display_Mode *mode, int x, int y);
+EAPI void ecore_drm2_display_mode_set(Ecore_Drm2_Display *disp, Ecore_Drm2_Display_Mode *mode);
EAPI Ecore_Drm2_Crtc *ecore_drm2_display_crtc_get(Ecore_Drm2_Display *disp);
EAPI Eina_Bool ecore_drm2_display_possible_crtc_get(Ecore_Drm2_Display *disp, Ecore_Drm2_Crtc *crtc);
EAPI int ecore_drm2_display_supported_rotations_get(Ecore_Drm2_Display *disp);
diff --git a/src/lib/ecore_drm2/ecore_drm2_displays.c b/src/lib/ecore_drm2/ecore_drm2_displays.c
index 36bd278404..b978ec9762 100644
--- a/src/lib/ecore_drm2/ecore_drm2_displays.c
+++ b/src/lib/ecore_drm2/ecore_drm2_displays.c
@@ -961,26 +961,14 @@ ecore_drm2_display_model_get(Ecore_Drm2_Display *disp)
}
EAPI void
-ecore_drm2_display_mode_set(Ecore_Drm2_Display *disp, Ecore_Drm2_Display_Mode *mode, int x, int y)
+ecore_drm2_display_mode_set(Ecore_Drm2_Display *disp, Ecore_Drm2_Display_Mode *mode)
{
- Ecore_Drm2_Display_State *cstate, *pstate;
Ecore_Drm2_Crtc_State *crtc_cstate, *crtc_pstate;
Ecore_Drm2_Connector_State *conn_cstate, *conn_pstate;
EINA_SAFETY_ON_NULL_RETURN(disp);
- EINA_SAFETY_ON_NULL_RETURN(mode);
EINA_SAFETY_ON_NULL_RETURN(disp->crtc);
- cstate = disp->state.current;
- pstate = disp->state.pending;
-
- if ((cstate->x != x) || (cstate->y != y))
- {
- pstate->x = x;
- pstate->y = y;
- pstate->changes |= ECORE_DRM2_DISPLAY_STATE_POSITION;
- }
-
crtc_cstate = disp->crtc->state.current;
crtc_pstate = disp->crtc->state.pending;
@@ -1001,13 +989,25 @@ ecore_drm2_display_mode_set(Ecore_Drm2_Display *disp, Ecore_Drm2_Display_Mode *m
}
}
- if (crtc_cstate->mode.value != mode->id)
+ if (mode)
{
- if (mode)
- crtc_pstate->active.value = 1;
- else
- crtc_pstate->active.value = 0;
+ if (crtc_cstate->active.value != 1)
+ {
+ crtc_pstate->active.value = 1;
+ crtc_pstate->changes |= ECORE_DRM2_CRTC_STATE_ACTIVE;
+ }
+ }
+ else
+ {
+ if (crtc_cstate->active.value != 0)
+ {
+ crtc_pstate->active.value = 0;
+ crtc_pstate->changes |= ECORE_DRM2_CRTC_STATE_ACTIVE;
+ }
+ }
+ if ((mode) && (crtc_cstate->mode.value != mode->id))
+ {
crtc_pstate->mode.value = mode->id;
crtc_pstate->changes |= ECORE_DRM2_CRTC_STATE_MODE;
}
@@ -1015,7 +1015,7 @@ ecore_drm2_display_mode_set(Ecore_Drm2_Display *disp, Ecore_Drm2_Display_Mode *m
conn_cstate = disp->conn->state.current;
conn_pstate = disp->conn->state.pending;
- if (conn_cstate->aspect.value != mode->aspect_ratio)
+ if ((mode) && (conn_cstate->aspect.value != mode->aspect_ratio))
{
conn_pstate->aspect.value = mode->aspect_ratio;
conn_pstate->changes |= ECORE_DRM2_CONNECTOR_STATE_ASPECT;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
