diff options
| author | Visa Hankala <visa@cvs.openbsd.org> | 2023-02-10 14:34:18 +0000 |
|---|---|---|
| committer | Visa Hankala <visa@cvs.openbsd.org> | 2023-02-10 14:34:18 +0000 |
| commit | 04d3413ff78e66f127de3749e6564ba940ff320e (patch) | |
| tree | 8d0adc2e66658136bd528d87b27b8bce64fce574 /sys/dev/pci/drm | |
| parent | 36d295960f2bd4394d4ae7685b11fcb6cdf82d9f (diff) | |
Adjust knote(9) API
Make knote(9) lock the knote list internally, and add knote_locked(9)
for the typical situation where the list is already locked.
Remove the KNOTE(9) macro to simplify the API.
Manual page OK jmc@
OK mpi@ mvs@
Diffstat (limited to 'sys/dev/pci/drm')
| -rw-r--r-- | sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c | 2 | ||||
| -rw-r--r-- | sys/dev/pci/drm/drm_connector.c | 2 | ||||
| -rw-r--r-- | sys/dev/pci/drm/drm_linux.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/drm/drm_mode_object.c | 2 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_driver.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c index b024bf7d12b..b3c1f4a0a82 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c @@ -3324,7 +3324,7 @@ amdgpu_wsioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p) case WSDISPLAYIO_PARAM_BRIGHTNESS: bd->props.brightness = dp->curval; backlight_update_status(bd); - KNOTE(&adev->ddev.note, NOTE_CHANGE); + knote_locked(&adev->ddev.note, NOTE_CHANGE); return 0; } break; diff --git a/sys/dev/pci/drm/drm_connector.c b/sys/dev/pci/drm/drm_connector.c index 7b75d6ab23b..6489e8c2900 100644 --- a/sys/dev/pci/drm/drm_connector.c +++ b/sys/dev/pci/drm/drm_connector.c @@ -2590,7 +2590,7 @@ int drm_connector_set_obj_prop(struct drm_mode_object *obj, } else if (property == connector->backlight_property) { connector->backlight_device->props.brightness = value; backlight_schedule_update_status(connector->backlight_device); - KNOTE(&connector->dev->note, NOTE_CHANGE); + knote_locked(&connector->dev->note, NOTE_CHANGE); ret = 0; #endif } else if (connector->funcs->set_property) diff --git a/sys/dev/pci/drm/drm_linux.c b/sys/dev/pci/drm/drm_linux.c index d9b716bb485..a5c6aff98f5 100644 --- a/sys/dev/pci/drm/drm_linux.c +++ b/sys/dev/pci/drm/drm_linux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: drm_linux.c,v 1.95 2023/01/01 01:34:34 jsg Exp $ */ +/* $OpenBSD: drm_linux.c,v 1.96 2023/02/10 14:34:16 visa Exp $ */ /* * Copyright (c) 2013 Jonathan Gray <jsg@openbsd.org> * Copyright (c) 2015, 2016 Mark Kettenis <kettenis@openbsd.org> @@ -1541,13 +1541,13 @@ backlight_disable(struct backlight_device *bd) void drm_sysfs_hotplug_event(struct drm_device *dev) { - KNOTE(&dev->note, NOTE_CHANGE); + knote_locked(&dev->note, NOTE_CHANGE); } void drm_sysfs_connector_hotplug_event(struct drm_connector *connector) { - KNOTE(&connector->dev->note, NOTE_CHANGE); + knote_locked(&connector->dev->note, NOTE_CHANGE); } void diff --git a/sys/dev/pci/drm/drm_mode_object.c b/sys/dev/pci/drm/drm_mode_object.c index 6033255a906..8f4dbec4c56 100644 --- a/sys/dev/pci/drm/drm_mode_object.c +++ b/sys/dev/pci/drm/drm_mode_object.c @@ -561,7 +561,7 @@ retry: struct drm_connector *connector = obj_to_connector(obj); connector->backlight_device->props.brightness = prop_value; backlight_schedule_update_status(connector->backlight_device); - KNOTE(&connector->dev->note, NOTE_CHANGE); + knote_locked(&connector->dev->note, NOTE_CHANGE); ret = 0; #endif } else { diff --git a/sys/dev/pci/drm/i915/i915_driver.c b/sys/dev/pci/drm/i915/i915_driver.c index 0b387e2a41c..05d373cc8a8 100644 --- a/sys/dev/pci/drm/i915/i915_driver.c +++ b/sys/dev/pci/drm/i915/i915_driver.c @@ -2251,7 +2251,7 @@ inteldrm_wsioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p) case WSDISPLAYIO_PARAM_BRIGHTNESS: bd->props.brightness = dp->curval; backlight_update_status(bd); - KNOTE(&dev_priv->drm.note, NOTE_CHANGE); + knote_locked(&dev_priv->drm.note, NOTE_CHANGE); return 0; } break; |