Module Name: src
Committed By: riastradh
Date: Mon Jul 18 23:34:03 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/amdgpu: amdgpu_pci.c amdgpu_task.h amdgpufb.c
src/sys/external/bsd/drm2/i915drm: i915_pci.h i915_pci_autoconf.c
intelfb.c
src/sys/external/bsd/drm2/nouveau: nouveau_pci.c nouveau_pci.h
nouveaufb.c
src/sys/external/bsd/drm2/radeon: radeon_pci.c radeon_task.h
radeondrmkmsfb.c
src/sys/external/bsd/drm2/vmwgfx: vmwgfx_pci.c vmwgfx_task.h vmwgfxfb.c
Log Message:
drm: Simplify async framebuffer child task attachment logic.
No need for scheduling the task to fail. Nix needless error
branches.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/amdgpu/amdgpu_task.h
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/amdgpu/amdgpufb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/i915_pci.h
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/drm2/i915drm/intelfb.c
cvs rdiff -u -r1.35 -r1.36 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/nouveau/nouveau_pci.h
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/nouveau/nouveaufb.c
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/drm2/radeon/radeon_pci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/radeon/radeon_task.h
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/vmwgfx/vmwgfx_pci.c \
src/sys/external/bsd/drm2/vmwgfx/vmwgfx_task.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/vmwgfx/vmwgfxfb.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/amdgpu/amdgpu_pci.c
diff -u src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.10 src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.11
--- src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.10 Sun Dec 19 12:28:12 2021
+++ src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c Mon Jul 18 23:34:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_pci.c,v 1.10 2021/12/19 12:28:12 riastradh Exp $ */
+/* $NetBSD: amdgpu_pci.c,v 1.11 2022/07/18 23:34:02 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_pci.c,v 1.10 2021/12/19 12:28:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_pci.c,v 1.11 2022/07/18 23:34:02 riastradh Exp $");
#include <sys/types.h>
#include <sys/atomic.h>
@@ -290,7 +290,7 @@ amdgpu_task_work(struct work *work, void
(*task->rt_fn)(task);
}
-int
+void
amdgpu_task_schedule(device_t self, struct amdgpu_task *task)
{
struct amdgpu_softc *const sc = device_private(self);
@@ -299,6 +299,4 @@ amdgpu_task_schedule(device_t self, stru
SIMPLEQ_INSERT_TAIL(&sc->sc_tasks, task, rt_u.queue);
else
workqueue_enqueue(sc->sc_task_wq, &task->rt_u.work, NULL);
-
- return 0;
}
Index: src/sys/external/bsd/drm2/amdgpu/amdgpu_task.h
diff -u src/sys/external/bsd/drm2/amdgpu/amdgpu_task.h:1.1 src/sys/external/bsd/drm2/amdgpu/amdgpu_task.h:1.2
--- src/sys/external/bsd/drm2/amdgpu/amdgpu_task.h:1.1 Mon Aug 27 14:02:32 2018
+++ src/sys/external/bsd/drm2/amdgpu/amdgpu_task.h Mon Jul 18 23:34:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_task.h,v 1.1 2018/08/27 14:02:32 riastradh Exp $ */
+/* $NetBSD: amdgpu_task.h,v 1.2 2022/07/18 23:34:02 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -50,6 +50,6 @@ amdgpu_task_init(struct amdgpu_task *tas
task->rt_fn = fn;
}
-int amdgpu_task_schedule(device_t, struct amdgpu_task *);
+void amdgpu_task_schedule(device_t, struct amdgpu_task *);
#endif /* _AMDGPU_AMDGPU_TASK_H_ */
Index: src/sys/external/bsd/drm2/amdgpu/amdgpufb.c
diff -u src/sys/external/bsd/drm2/amdgpu/amdgpufb.c:1.4 src/sys/external/bsd/drm2/amdgpu/amdgpufb.c:1.5
--- src/sys/external/bsd/drm2/amdgpu/amdgpufb.c:1.4 Mon Jul 18 23:33:53 2022
+++ src/sys/external/bsd/drm2/amdgpu/amdgpufb.c Mon Jul 18 23:34:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpufb.c,v 1.4 2022/07/18 23:33:53 riastradh Exp $ */
+/* $NetBSD: amdgpufb.c,v 1.5 2022/07/18 23:34:02 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpufb.c,v 1.4 2022/07/18 23:33:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpufb.c,v 1.5 2022/07/18 23:34:02 riastradh Exp $");
#include <sys/types.h>
#include <sys/bus.h>
@@ -83,7 +83,6 @@ amdgpufb_attach(device_t parent, device_
{
struct amdgpufb_softc *const sc = device_private(self);
const struct amdgpufb_attach_args *const afa = aux;
- int error;
sc->sc_dev = self;
sc->sc_afa = *afa;
@@ -93,12 +92,7 @@ amdgpufb_attach(device_t parent, device_
aprint_normal("\n");
amdgpu_task_init(&sc->sc_attach_task, &amdgpufb_attach_task);
- error = amdgpu_task_schedule(parent, &sc->sc_attach_task);
- if (error) {
- aprint_error_dev(self, "failed to schedule mode set: %d\n",
- error);
- return;
- }
+ amdgpu_task_schedule(parent, &sc->sc_attach_task);
config_pending_incr(self);
}
Index: src/sys/external/bsd/drm2/i915drm/i915_pci.h
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.h:1.1 src/sys/external/bsd/drm2/i915drm/i915_pci.h:1.2
--- src/sys/external/bsd/drm2/i915drm/i915_pci.h:1.1 Thu Jul 24 21:18:40 2014
+++ src/sys/external/bsd/drm2/i915drm/i915_pci.h Mon Jul 18 23:34:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci.h,v 1.1 2014/07/24 21:18:40 riastradh Exp $ */
+/* $NetBSD: i915_pci.h,v 1.2 2022/07/18 23:34:02 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -51,6 +51,6 @@ i915drmkms_task_init(struct i915drmkms_t
task->ift_fn = fn;
}
-int i915drmkms_task_schedule(device_t, struct i915drmkms_task *);
+void i915drmkms_task_schedule(device_t, struct i915drmkms_task *);
#endif /* _I915DRM_I915_PCI_H_ */
Index: src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.11 src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.12
--- src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.11 Mon Dec 20 14:52:25 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Mon Jul 18 23:34:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci_autoconf.c,v 1.11 2021/12/20 14:52:25 riastradh Exp $ */
+/* $NetBSD: i915_pci_autoconf.c,v 1.12 2022/07/18 23:34:02 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.11 2021/12/20 14:52:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.12 2022/07/18 23:34:02 riastradh Exp $");
#include <sys/types.h>
#include <sys/atomic.h>
@@ -291,7 +291,7 @@ i915drmkms_task_work(struct work *work,
(*task->ift_fn)(task);
}
-int
+void
i915drmkms_task_schedule(device_t self, struct i915drmkms_task *task)
{
struct i915drmkms_softc *const sc = device_private(self);
@@ -300,6 +300,4 @@ i915drmkms_task_schedule(device_t self,
SIMPLEQ_INSERT_TAIL(&sc->sc_tasks, task, ift_u.queue);
else
workqueue_enqueue(sc->sc_task_wq, &task->ift_u.work, NULL);
-
- return 0;
}
Index: src/sys/external/bsd/drm2/i915drm/intelfb.c
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.23 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.24
--- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.23 Mon Jul 18 23:33:53 2022
+++ src/sys/external/bsd/drm2/i915drm/intelfb.c Mon Jul 18 23:34:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: intelfb.c,v 1.23 2022/07/18 23:33:53 riastradh Exp $ */
+/* $NetBSD: intelfb.c,v 1.24 2022/07/18 23:34:02 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.23 2022/07/18 23:33:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.24 2022/07/18 23:34:02 riastradh Exp $");
#include <sys/types.h>
#include <sys/bus.h>
@@ -90,7 +90,6 @@ intelfb_attach(device_t parent, device_t
{
struct intelfb_softc *const sc = device_private(self);
const struct intelfb_attach_args *const ifa = aux;
- int error;
sc->sc_dev = self;
sc->sc_ifa = *ifa;
@@ -100,12 +99,7 @@ intelfb_attach(device_t parent, device_t
aprint_normal("\n");
i915drmkms_task_init(&sc->sc_attach_task, &intelfb_attach_task);
- error = i915drmkms_task_schedule(parent, &sc->sc_attach_task);
- if (error) {
- aprint_error_dev(self, "failed to schedule mode set: %d\n",
- error);
- return;
- }
+ i915drmkms_task_schedule(parent, &sc->sc_attach_task);
config_pending_incr(self);
}
Index: src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.35 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.36
--- src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.35 Sun Dec 19 12:45:35 2021
+++ src/sys/external/bsd/drm2/nouveau/nouveau_pci.c Mon Jul 18 23:34:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_pci.c,v 1.35 2021/12/19 12:45:35 riastradh Exp $ */
+/* $NetBSD: nouveau_pci.c,v 1.36 2022/07/18 23:34:02 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.35 2021/12/19 12:45:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.36 2022/07/18 23:34:02 riastradh Exp $");
#ifdef _KERNEL_OPT
#if defined(__arm__) || defined(__aarch64__)
@@ -313,7 +313,7 @@ nouveau_pci_task_work(struct work *work,
(*task->nt_fn)(task);
}
-int
+void
nouveau_pci_task_schedule(device_t self, struct nouveau_pci_task *task)
{
struct nouveau_pci_softc *const sc = device_private(self);
@@ -322,8 +322,6 @@ nouveau_pci_task_schedule(device_t self,
SIMPLEQ_INSERT_TAIL(&sc->sc_tasks, task, nt_u.queue);
else
workqueue_enqueue(sc->sc_task_wq, &task->nt_u.work, NULL);
-
- return 0;
}
extern struct drm_driver *const nouveau_drm_driver_stub; /* XXX */
Index: src/sys/external/bsd/drm2/nouveau/nouveau_pci.h
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_pci.h:1.2 src/sys/external/bsd/drm2/nouveau/nouveau_pci.h:1.3
--- src/sys/external/bsd/drm2/nouveau/nouveau_pci.h:1.2 Sat Oct 17 12:02:44 2015
+++ src/sys/external/bsd/drm2/nouveau/nouveau_pci.h Mon Jul 18 23:34:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_pci.h,v 1.2 2015/10/17 12:02:44 jmcneill Exp $ */
+/* $NetBSD: nouveau_pci.h,v 1.3 2022/07/18 23:34:02 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -44,12 +44,13 @@ struct nouveau_pci_task {
};
static inline void
-nouveau_pci_task_init(struct nouveau_pci_task *task, void (*fn)(struct nouveau_pci_task *))
+nouveau_pci_task_init(struct nouveau_pci_task *task,
+ void (*fn)(struct nouveau_pci_task *))
{
task->nt_fn = fn;
}
-int nouveau_pci_task_schedule(device_t, struct nouveau_pci_task *);
+void nouveau_pci_task_schedule(device_t, struct nouveau_pci_task *);
#endif /* _NOUVEAU_NOUVEAU_PCI_H_ */
Index: src/sys/external/bsd/drm2/nouveau/nouveaufb.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveaufb.c:1.8 src/sys/external/bsd/drm2/nouveau/nouveaufb.c:1.9
--- src/sys/external/bsd/drm2/nouveau/nouveaufb.c:1.8 Mon Jul 18 23:33:53 2022
+++ src/sys/external/bsd/drm2/nouveau/nouveaufb.c Mon Jul 18 23:34:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveaufb.c,v 1.8 2022/07/18 23:33:53 riastradh Exp $ */
+/* $NetBSD: nouveaufb.c,v 1.9 2022/07/18 23:34:02 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveaufb.c,v 1.8 2022/07/18 23:33:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveaufb.c,v 1.9 2022/07/18 23:34:02 riastradh Exp $");
#include <sys/types.h>
#include <sys/bus.h>
@@ -88,7 +88,6 @@ nouveaufb_attach(device_t parent, device
{
struct nouveaufb_softc *const sc = device_private(self);
const struct nouveaufb_attach_args *const nfa = aux;
- int error;
sc->sc_dev = self;
sc->sc_nfa = *nfa;
@@ -98,12 +97,7 @@ nouveaufb_attach(device_t parent, device
aprint_normal("\n");
nouveau_pci_task_init(&sc->sc_attach_task, &nouveaufb_attach_task);
- error = nouveau_pci_task_schedule(parent, &sc->sc_attach_task);
- if (error) {
- aprint_error_dev(self, "failed to schedule mode set: %d\n",
- error);
- return;
- }
+ nouveau_pci_task_schedule(parent, &sc->sc_attach_task);
config_pending_incr(self);
}
Index: src/sys/external/bsd/drm2/radeon/radeon_pci.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.20 src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.21
--- src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.20 Sun Dec 19 12:28:12 2021
+++ src/sys/external/bsd/drm2/radeon/radeon_pci.c Mon Jul 18 23:34:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_pci.c,v 1.20 2021/12/19 12:28:12 riastradh Exp $ */
+/* $NetBSD: radeon_pci.c,v 1.21 2022/07/18 23:34:03 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.20 2021/12/19 12:28:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.21 2022/07/18 23:34:03 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -373,7 +373,7 @@ radeon_task_work(struct work *work, void
(*task->rt_fn)(task);
}
-int
+void
radeon_task_schedule(device_t self, struct radeon_task *task)
{
struct radeon_softc *const sc = device_private(self);
@@ -382,6 +382,4 @@ radeon_task_schedule(device_t self, stru
SIMPLEQ_INSERT_TAIL(&sc->sc_tasks, task, rt_u.queue);
else
workqueue_enqueue(sc->sc_task_wq, &task->rt_u.work, NULL);
-
- return 0;
}
Index: src/sys/external/bsd/drm2/radeon/radeon_task.h
diff -u src/sys/external/bsd/drm2/radeon/radeon_task.h:1.1 src/sys/external/bsd/drm2/radeon/radeon_task.h:1.2
--- src/sys/external/bsd/drm2/radeon/radeon_task.h:1.1 Fri Jul 25 12:35:03 2014
+++ src/sys/external/bsd/drm2/radeon/radeon_task.h Mon Jul 18 23:34:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_task.h,v 1.1 2014/07/25 12:35:03 riastradh Exp $ */
+/* $NetBSD: radeon_task.h,v 1.2 2022/07/18 23:34:03 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -50,6 +50,6 @@ radeon_task_init(struct radeon_task *tas
task->rt_fn = fn;
}
-int radeon_task_schedule(device_t, struct radeon_task *);
+void radeon_task_schedule(device_t, struct radeon_task *);
#endif /* _RADEON_RADEON_TASK_H_ */
Index: src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c
diff -u src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.16 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.17
--- src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.16 Mon Jul 18 23:33:53 2022
+++ src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Mon Jul 18 23:34:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: radeondrmkmsfb.c,v 1.16 2022/07/18 23:33:53 riastradh Exp $ */
+/* $NetBSD: radeondrmkmsfb.c,v 1.17 2022/07/18 23:34:03 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.16 2022/07/18 23:33:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.17 2022/07/18 23:34:03 riastradh Exp $");
#include <sys/types.h>
#include <sys/device.h>
@@ -84,7 +84,6 @@ radeonfb_attach(device_t parent, device_
{
struct radeonfb_softc *const sc = device_private(self);
const struct radeonfb_attach_args *const rfa = aux;
- int error;
sc->sc_dev = self;
sc->sc_rfa = *rfa;
@@ -94,12 +93,7 @@ radeonfb_attach(device_t parent, device_
aprint_normal("\n");
radeon_task_init(&sc->sc_attach_task, &radeonfb_attach_task);
- error = radeon_task_schedule(parent, &sc->sc_attach_task);
- if (error) {
- aprint_error_dev(self, "failed to schedule mode set: %d\n",
- error);
- return;
- }
+ radeon_task_schedule(parent, &sc->sc_attach_task);
config_pending_incr(self);
}
Index: src/sys/external/bsd/drm2/vmwgfx/vmwgfx_pci.c
diff -u src/sys/external/bsd/drm2/vmwgfx/vmwgfx_pci.c:1.1 src/sys/external/bsd/drm2/vmwgfx/vmwgfx_pci.c:1.2
--- src/sys/external/bsd/drm2/vmwgfx/vmwgfx_pci.c:1.1 Thu Feb 17 01:21:03 2022
+++ src/sys/external/bsd/drm2/vmwgfx/vmwgfx_pci.c Mon Jul 18 23:34:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vmwgfx_pci.c,v 1.1 2022/02/17 01:21:03 riastradh Exp $ */
+/* $NetBSD: vmwgfx_pci.c,v 1.2 2022/07/18 23:34:03 riastradh Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vmwgfx_pci.c,v 1.1 2022/02/17 01:21:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vmwgfx_pci.c,v 1.2 2022/07/18 23:34:03 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -322,7 +322,7 @@ vmwgfx_task_work(struct work *work, void
(*task->vt_fn)(task);
}
-int
+void
vmwgfx_task_schedule(device_t self, struct vmwgfx_task *task)
{
struct vmwgfx_softc *const sc = device_private(self);
@@ -331,6 +331,4 @@ vmwgfx_task_schedule(device_t self, stru
SIMPLEQ_INSERT_TAIL(&sc->sc_tasks, task, vt_u.queue);
else
workqueue_enqueue(sc->sc_task_wq, &task->vt_u.work, NULL);
-
- return 0;
}
Index: src/sys/external/bsd/drm2/vmwgfx/vmwgfx_task.h
diff -u src/sys/external/bsd/drm2/vmwgfx/vmwgfx_task.h:1.1 src/sys/external/bsd/drm2/vmwgfx/vmwgfx_task.h:1.2
--- src/sys/external/bsd/drm2/vmwgfx/vmwgfx_task.h:1.1 Thu Feb 17 01:21:03 2022
+++ src/sys/external/bsd/drm2/vmwgfx/vmwgfx_task.h Mon Jul 18 23:34:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vmwgfx_task.h,v 1.1 2022/02/17 01:21:03 riastradh Exp $ */
+/* $NetBSD: vmwgfx_task.h,v 1.2 2022/07/18 23:34:03 riastradh Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -47,6 +47,6 @@ vmwgfx_task_init(struct vmwgfx_task *tas
task->vt_fn = fn;
}
-int vmwgfx_task_schedule(device_t, struct vmwgfx_task *);
+void vmwgfx_task_schedule(device_t, struct vmwgfx_task *);
#endif /* _VMWGFX_VMWGFX_TASK_H_ */
Index: src/sys/external/bsd/drm2/vmwgfx/vmwgfxfb.c
diff -u src/sys/external/bsd/drm2/vmwgfx/vmwgfxfb.c:1.2 src/sys/external/bsd/drm2/vmwgfx/vmwgfxfb.c:1.3
--- src/sys/external/bsd/drm2/vmwgfx/vmwgfxfb.c:1.2 Mon Jul 18 23:33:53 2022
+++ src/sys/external/bsd/drm2/vmwgfx/vmwgfxfb.c Mon Jul 18 23:34:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vmwgfxfb.c,v 1.2 2022/07/18 23:33:53 riastradh Exp $ */
+/* $NetBSD: vmwgfxfb.c,v 1.3 2022/07/18 23:34:03 riastradh Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vmwgfxfb.c,v 1.2 2022/07/18 23:33:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vmwgfxfb.c,v 1.3 2022/07/18 23:34:03 riastradh Exp $");
#include <sys/types.h>
#include <sys/device.h>
@@ -80,7 +80,6 @@ vmwgfxfb_attach(device_t parent, device_
{
struct vmwgfxfb_softc *const sc = device_private(self);
const struct vmwgfxfb_attach_args *const vfa = aux;
- int error;
sc->sc_dev = self;
sc->sc_vfa = *vfa;
@@ -90,12 +89,7 @@ vmwgfxfb_attach(device_t parent, device_
aprint_normal("\n");
vmwgfx_task_init(&sc->sc_attach_task, &vmwgfxfb_attach_task);
- error = vmwgfx_task_schedule(parent, &sc->sc_attach_task);
- if (error) {
- aprint_error_dev(self, "failed to schedule mode set: %d\n",
- error);
- return;
- }
+ vmwgfx_task_schedule(parent, &sc->sc_attach_task);
config_pending_incr(self);
}
