diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-10-20 15:45:10 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-10-20 15:45:10 +0000 |
| commit | f1efed83324f9f8cf0215d9d42e620390c39b22b (patch) | |
| tree | fdff8dc4e7fc8abb582633f94f1ae30f3fe4f869 /sys/dev | |
| parent | 0f7f7b15ae19b34fd1758b864669a26785561053 (diff) | |
Use rdev->audio_task for hdmi audio related hotplug events. Matches the
equivalent Linux code a bit better and was probably what jsg@ intended in
the first place.
ok jsg@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/radeon/evergreen.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/r600.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/rs600.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pci/drm/radeon/evergreen.c b/sys/dev/pci/drm/radeon/evergreen.c index 12d91ba0986..44260040dd8 100644 --- a/sys/dev/pci/drm/radeon/evergreen.c +++ b/sys/dev/pci/drm/radeon/evergreen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evergreen.c,v 1.4 2013/09/01 10:36:31 jsg Exp $ */ +/* $OpenBSD: evergreen.c,v 1.5 2013/10/20 15:45:08 kettenis Exp $ */ /* * Copyright 2010 Advanced Micro Devices, Inc. * @@ -3382,7 +3382,7 @@ restart_ih: workq_queue_task(NULL, &rdev->hotplug_task, 0, radeon_hotplug_work_func, rdev, NULL); if (queue_hdmi) - workq_queue_task(NULL, &rdev->hotplug_task, 0, + workq_queue_task(NULL, &rdev->audio_task, 0, r600_audio_update_hdmi, rdev, NULL); rdev->ih.rptr = rptr; WREG32(IH_RB_RPTR, rdev->ih.rptr); diff --git a/sys/dev/pci/drm/radeon/r600.c b/sys/dev/pci/drm/radeon/r600.c index d1cad0fdfc3..d36fe51099f 100644 --- a/sys/dev/pci/drm/radeon/r600.c +++ b/sys/dev/pci/drm/radeon/r600.c @@ -1,4 +1,4 @@ -/* $OpenBSD: r600.c,v 1.3 2013/08/26 05:15:21 jsg Exp $ */ +/* $OpenBSD: r600.c,v 1.4 2013/10/20 15:45:08 kettenis Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -4044,7 +4044,7 @@ restart_ih: workq_queue_task(NULL, &rdev->hotplug_task, 0, radeon_hotplug_work_func, rdev, NULL); if (queue_hdmi) - workq_queue_task(NULL, &rdev->hotplug_task, 0, + workq_queue_task(NULL, &rdev->audio_task, 0, r600_audio_update_hdmi, rdev, NULL); rdev->ih.rptr = rptr; WREG32(IH_RB_RPTR, rdev->ih.rptr); diff --git a/sys/dev/pci/drm/radeon/rs600.c b/sys/dev/pci/drm/radeon/rs600.c index 07a5e5f2d01..6b75d7bf1a5 100644 --- a/sys/dev/pci/drm/radeon/rs600.c +++ b/sys/dev/pci/drm/radeon/rs600.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rs600.c,v 1.1 2013/08/12 04:11:53 jsg Exp $ */ +/* $OpenBSD: rs600.c,v 1.2 2013/10/20 15:45:09 kettenis Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -758,7 +758,7 @@ int rs600_irq_process(struct radeon_device *rdev) workq_queue_task(NULL, &rdev->hotplug_task, 0, radeon_hotplug_work_func, rdev, NULL); if (queue_hdmi) - workq_queue_task(NULL, &rdev->hotplug_task, 0, + workq_queue_task(NULL, &rdev->audio_task, 0, r600_audio_update_hdmi, rdev, NULL); if (rdev->msi_enabled) { switch (rdev->family) { |