uterm: drm: activate context before swapping

[platform/upstream/kmscon.git] / src / uterm_drm_shared.c

diff --git a/src/uterm_drm_shared.c b/src/uterm_drm_shared.c
index 75830f3..ec486ab 100644 (file)
--- a/src/uterm_drm_shared.c
+++ b/src/uterm_drm_shared.c
@@ -645,7 +645,7 @@ err_unref:
 }
 
 int uterm_drm_video_hotplug(struct uterm_video *video,
-                           bool read_dpms)
+                           bool read_dpms, bool modeset)
 {
        struct uterm_drm_video *vdrm = video->data;
        drmModeRes *res;
@@ -658,6 +658,8 @@ int uterm_drm_video_hotplug(struct uterm_video *video,
        if (!video_is_awake(video) || !video_need_hotplug(video))
                return 0;
 
+       log_debug("testing DRM hotplug status");
+
        res = drmModeGetResources(vdrm->fd);
        if (!res) {
                log_err("cannot retrieve drm resources");
@@ -687,15 +689,24 @@ int uterm_drm_video_hotplug(struct uterm_video *video,
                                continue;
 
                        disp->flags |= DISPLAY_AVAILABLE;
-                       if (!read_dpms || !display_is_online(disp))
+                       if (!display_is_online(disp))
                                break;
 
-                       dpms = uterm_drm_get_dpms(vdrm->fd, conn);
-                       if (dpms != disp->dpms) {
-                               log_debug("DPMS state for display %p changed",
-                                         disp);
-                               uterm_drm_display_set_dpms(disp, disp->dpms);
+                       if (read_dpms) {
+                               dpms = uterm_drm_get_dpms(vdrm->fd, conn);
+                               if (dpms != disp->dpms) {
+                                       log_debug("DPMS state for display %p changed",
+                                                 disp);
+                                       uterm_drm_display_set_dpms(disp, disp->dpms);
+                               }
+                       }
+
+                       if (modeset) {
+                               log_debug("re-activate display %p", disp);
+                               uterm_display_use(disp, NULL);
+                               uterm_display_swap(disp, true);
                        }
+
                        break;
                }
 
@@ -728,8 +739,8 @@ int uterm_drm_video_wake_up(struct uterm_video *video)
                return -EACCES;
        }
 
-       video->flags |= VIDEO_AWAKE;
-       ret = uterm_drm_video_hotplug(video, true);
+       video->flags |= VIDEO_AWAKE | VIDEO_HOTPLUG;
+       ret = uterm_drm_video_hotplug(video, true, true);
        if (ret) {
                drmDropMaster(vdrm->fd);
                return ret;
@@ -750,7 +761,7 @@ void uterm_drm_video_sleep(struct uterm_video *video)
 int uterm_drm_video_poll(struct uterm_video *video)
 {
        video->flags |= VIDEO_HOTPLUG;
-       return uterm_drm_video_hotplug(video, false);
+       return uterm_drm_video_hotplug(video, false, false);
 }
 
 /* Waits for events on DRM fd for \mtimeout milliseconds and returns 0 if the