fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-06 07:58:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend-drm: assert that there's a valid output state before repaint

Browse source 
Follow-up of "compositor: let backends handle output->disable_planes".
Now we always call assign_planes() before a repaint, so we must have
a valid output state when we enter assign_planes().

Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
This commit is contained in:
Leandro Ribeiro 2025-07-28 12:11:23 -03:00 • committed by Marius Vlad
parent 439aea0188
commit b717030a10
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libweston/backend-drm/drm-virtual.c
View file

@ -38,6 +38,7 @@
#include "drm-internal.h"
#include "pixel-formats.h"
#include "renderer-gl/gl-renderer.h"
#include "shared/weston-assert.h"
#define POISON_PTR ((void *)8)
@ -205,6 +206,7 @@ static int
drm_virtual_output_repaint(struct weston_output *output_base)
{
struct drm_output_state *state = NULL;
struct weston_compositor *compositor = output_base->compositor;
struct drm_output *output = to_drm_output(output_base);
struct drm_plane *scanout_plane = output->scanout_plane;
struct drm_plane_state *scanout_state;
@ -227,14 +229,10 @@ drm_virtual_output_repaint(struct weston_output *output_base)
assert(!output->state_last);
/* If planes have been disabled in the core, we might not have
* hit assign_planes at all, so might not have valid output state
* here. */
/* assign_planes() is always called before a repaint, so we must have a
* valid output state here. */
state = drm_pending_state_get_output(pending_state, output);
if (!state)
state = drm_output_state_duplicate(output->state_cur,
pending_state,
DRM_OUTPUT_STATE_CLEAR_PLANES);
weston_assert_ptr_not_null(compositor, state);
drm_output_render(state);
scanout_state = drm_output_state_get_plane(state, scanout_plane);

13
libweston/backend-drm/drm.c
View file

@ -803,6 +803,7 @@ drm_output_prepare_repaint(struct weston_output *output_base)
static int
drm_output_repaint(struct weston_output *output_base)
{
struct weston_compositor *compositor = output_base->compositor;
struct drm_output *output = to_drm_output(output_base);
struct drm_output_state *state = NULL;
struct drm_plane_state *scanout_state;
@ -822,16 +823,10 @@ drm_output_repaint(struct weston_output *output_base)
assert(!output->state_last);
/* If planes have been disabled in the core, we might not have
* hit assign_planes at all, so might not have valid output state
* here. */
/* assign_planes() is always called before a repaint, so we must have a
* valid output state here. */
state = drm_pending_state_get_output(pending_state, output);
if (!state) {
state = drm_output_state_duplicate(output->state_cur,
pending_state,
DRM_OUTPUT_STATE_CLEAR_PLANES);
state->dpms = WESTON_DPMS_ON;
}
weston_assert_ptr_not_null(compositor, state);
cursor_state = drm_output_state_get_existing_plane(state,
output->cursor_plane);