CVS commit: src/sys/external/bsd/drm2/drm

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Mon Dec 20 00:27:53 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/drm: drmfb.c

Log Message:
drm: Simplify use of drm API for display on/off logic in drmfb.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/drm/drmfb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/external/bsd/drm2/drm/drmfb.c
diff -u src/sys/external/bsd/drm2/drm/drmfb.c:1.10 src/sys/external/bsd/drm2/drm/drmfb.c:1.11
--- src/sys/external/bsd/drm2/drm/drmfb.c:1.10	Sun Dec 19 10:32:59 2021
+++ src/sys/external/bsd/drm2/drm/drmfb.c	Mon Dec 20 00:27:53 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: drmfb.c,v 1.10 2021/12/19 10:32:59 riastradh Exp $	*/
+/*	$NetBSD: drmfb.c,v 1.11 2021/12/20 00:27:53 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.10 2021/12/19 10:32:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.11 2021/12/20 00:27:53 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "vga.h"
@@ -196,8 +196,6 @@ drmfb_genfb_ioctl(void *v, void *vs, uns
 	struct genfb_softc *const genfb = v;
 	struct drmfb_softc *const sc = container_of(genfb, struct drmfb_softc,
 	    sc_genfb);
-	struct drm_connector_list_iter conn_iter;
-	struct drm_connector *connector;
 	int error;
 
 	if (sc->sc_da.da_params->dp_ioctl) {
@@ -227,17 +225,10 @@ drmfb_genfb_ioctl(void *v, void *vs, uns
 		const int on = *(const int *)data;
 		const int dpms_mode = on? DRM_MODE_DPMS_ON : DRM_MODE_DPMS_OFF;
 		struct drm_fb_helper *const fb_helper = sc->sc_da.da_fb_helper;
-		struct drm_device *const dev = fb_helper->dev;
 
-		drm_modeset_lock_all(dev);
-		drm_connector_list_iter_begin(fb_helper->dev, &conn_iter);
-		drm_client_for_each_connector_iter(connector, &conn_iter) {
-			(*connector->funcs->dpms)(connector, dpms_mode);
-			drm_object_property_set_value(&connector->base,
-			    dev->mode_config.dpms_property, dpms_mode);
-		}
-		drm_connector_list_iter_end(&conn_iter);
-		drm_modeset_unlock_all(dev);
+		mutex_lock(&fb_helper->lock);
+		drm_client_modeset_dpms(&fb_helper->client, dpms_mode);
+		mutex_unlock(&fb_helper->lock);
 
 		return 0;
 	}