diff options
| author | riastradh <riastradh@NetBSD.org> | 2021-12-20 00:27:53 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2021-12-20 00:27:53 +0000 |
| commit | e80b244b12f80c3a5d172ebfb4e28db07aa5d76a (patch) | |
| tree | 1c51d391cc7d86fe501be662000bda8ec587530e /sys/external | |
| parent | ae1c2923ed68cc353ecee9ac6a797d07f71b4753 (diff) | |
drm: Simplify use of drm API for display on/off logic in drmfb.
Diffstat (limited to 'sys/external')
| -rw-r--r-- | sys/external/bsd/drm2/drm/drmfb.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/sys/external/bsd/drm2/drm/drmfb.c b/sys/external/bsd/drm2/drm/drmfb.c index 3d52653d200..31301bfe2c2 100644 --- a/sys/external/bsd/drm2/drm/drmfb.c +++ b/sys/external/bsd/drm2/drm/drmfb.c @@ -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, unsigned long cmd, void *data, int flag, 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, unsigned long cmd, void *data, int flag, 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; } |
