]> www.infradead.org Git - users/hch/misc.git/commitdiff
drm/bochs: Fix DPMS regression
authorTakashi Iwai <tiwai@suse.de>
Tue, 4 Mar 2025 13:41:57 +0000 (14:41 +0100)
committerThomas Zimmermann <tzimmermann@suse.de>
Thu, 6 Mar 2025 07:54:42 +0000 (08:54 +0100)
The recent rewrite with the use of regular atomic helpers broke the
DPMS unblanking on X11.  Fix it by moving the call of
bochs_hw_blank(false) from CRTC mode_set_nofb() to atomic_enable().

Fixes: 2037174993c8 ("drm/bochs: Use regular atomic helpers")
Link: https://bugzilla.suse.com/show_bug.cgi?id=1238209
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20250304134203.20534-1-tiwai@suse.de
drivers/gpu/drm/tiny/bochs.c

index c67e1f90678591d8dd947e8c8a4524337c6b46fe..8706763af8fba5fd681e0668101a42b2a4ec88b5 100644 (file)
@@ -335,8 +335,6 @@ static void bochs_hw_setmode(struct bochs_device *bochs, struct drm_display_mode
                         bochs->xres, bochs->yres, bochs->bpp,
                         bochs->yres_virtual);
 
-       bochs_hw_blank(bochs, false);
-
        bochs_dispi_write(bochs, VBE_DISPI_INDEX_ENABLE,      0);
        bochs_dispi_write(bochs, VBE_DISPI_INDEX_BPP,         bochs->bpp);
        bochs_dispi_write(bochs, VBE_DISPI_INDEX_XRES,        bochs->xres);
@@ -506,6 +504,9 @@ static int bochs_crtc_helper_atomic_check(struct drm_crtc *crtc,
 static void bochs_crtc_helper_atomic_enable(struct drm_crtc *crtc,
                                            struct drm_atomic_state *state)
 {
+       struct bochs_device *bochs = to_bochs_device(crtc->dev);
+
+       bochs_hw_blank(bochs, false);
 }
 
 static void bochs_crtc_helper_atomic_disable(struct drm_crtc *crtc,