Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:46:03 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: files.drmkms
src/sys/external/bsd/drm2/include/drm: drm_writeback.h
Added Files:
src/sys/external/bsd/drm2/drm: drm_writeback.c
Log Message:
drm_writeback stubs
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/drm/drm_writeback.c
cvs rdiff -u -r1.59 -r1.60 src/sys/external/bsd/drm2/drm/files.drmkms
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/include/drm/drm_writeback.h
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/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.59 src/sys/external/bsd/drm2/drm/files.drmkms:1.60
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.59 Sun Dec 19 10:45:33 2021
+++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 10:46:02 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.59 2021/12/19 10:45:33 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.60 2021/12/19 10:46:02 riastradh Exp $
version 20180827
@@ -154,4 +154,4 @@ file external/bsd/drm2/dist/drm/drm_trac
file external/bsd/drm2/dist/drm/drm_vblank.c drmkms
file external/bsd/drm2/drm/drm_vm.c drmkms
file external/bsd/drm2/drm/drm_vma_manager.c drmkms
-#file external/bsd/drm2/dist/drm/drm_writeback.c drmkms
+file external/bsd/drm2/drm/drm_writeback.c drmkms
Index: src/sys/external/bsd/drm2/include/drm/drm_writeback.h
diff -u src/sys/external/bsd/drm2/include/drm/drm_writeback.h:1.5 src/sys/external/bsd/drm2/include/drm/drm_writeback.h:1.6
--- src/sys/external/bsd/drm2/include/drm/drm_writeback.h:1.5 Sun Dec 19 01:58:47 2021
+++ src/sys/external/bsd/drm2/include/drm/drm_writeback.h Sun Dec 19 10:46:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_writeback.h,v 1.5 2021/12/19 01:58:47 riastradh Exp $ */
+/* $NetBSD: drm_writeback.h,v 1.6 2021/12/19 10:46:03 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,11 +32,18 @@
#ifndef _DRM_DRM_WRITEBACK_H_
#define _DRM_DRM_WRITEBACK_H_
+#include <drm/drm_connector.h>
+
struct dma_fence;
struct drm_connector;
+struct drm_connector_state;
struct drm_framebuffer;
struct drm_writeback_connector;
+struct drm_writeback_connector {
+ struct drm_connector base;
+};
+
struct drm_writeback_job {
struct drm_framebuffer *fb;
struct dma_fence *out_fence;
@@ -46,29 +53,9 @@ struct drm_writeback_connector *
drm_connector_to_writeback(struct drm_connector *);
struct dma_fence *
drm_writeback_get_out_fence(struct drm_writeback_connector *);
-
-static inline void
-drm_writeback_cleanup_job(struct drm_writeback_job *job)
-{
-
- panic("TODO");
-}
-
-static inline int
-drm_writeback_prepare_job(struct drm_writeback_job *job)
-{
-
- panic("TODO");
- return 0;
-}
-
-static inline int
-drm_writeback_set_fb(struct drm_connector_state *conn_state,
- struct drm_framebuffer *fb)
-{
-
- panic("TODO");
- return 0;
-}
+int drm_writeback_prepare_job(struct drm_writeback_job *);
+void drm_writeback_cleanup_job(struct drm_writeback_job *);
+int drm_writeback_set_fb(struct drm_connector_state *,
+ struct drm_framebuffer *);
#endif /* _DRM_DRM_WRITEBACK_H_ */
Added files:
Index: src/sys/external/bsd/drm2/drm/drm_writeback.c
diff -u /dev/null src/sys/external/bsd/drm2/drm/drm_writeback.c:1.1
--- /dev/null Sun Dec 19 10:46:03 2021
+++ src/sys/external/bsd/drm2/drm/drm_writeback.c Sun Dec 19 10:46:02 2021
@@ -0,0 +1,67 @@
+/* $NetBSD: drm_writeback.c,v 1.1 2021/12/19 10:46:02 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2020 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: drm_writeback.c,v 1.1 2021/12/19 10:46:02 riastradh Exp $");
+
+#include <drm/drm_writeback.h>
+
+struct drm_writeback_connector *
+drm_connector_to_writeback(struct drm_connector *connector)
+{
+
+ return container_of(connector, struct drm_writeback_connector, base);
+}
+
+struct dma_fence *
+drm_writeback_get_out_fence(struct drm_writeback_connector *wbconn)
+{
+ panic("writeback connectors not implemented");
+ return NULL;
+}
+
+int
+drm_writeback_prepare_job(struct drm_writeback_job *wbj)
+{
+ panic("writeback connectors not implemented");
+ return -ENXIO;
+}
+
+void
+drm_writeback_cleanup_job(struct drm_writeback_job *job)
+{
+ panic("writeback connectors not implemented");
+}
+
+int
+drm_writeback_set_fb(struct drm_connector_state *state,
+ struct drm_framebuffer *fb)
+{
+ panic("writeback connectors not implemented");
+ return -ENXIO;
+}
