Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:37:23 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_prime.c
Log Message:
drm: Fix type confusion in drm_prime_lookup_buf_by_handle.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/dist/drm/drm_prime.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/dist/drm/drm_prime.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_prime.c:1.18 src/sys/external/bsd/drm2/dist/drm/drm_prime.c:1.19
--- src/sys/external/bsd/drm2/dist/drm/drm_prime.c:1.18 Sun Dec 19 11:36:25 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_prime.c Sun Dec 19 11:37:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_prime.c,v 1.18 2021/12/19 11:36:25 riastradh Exp $ */
+/* $NetBSD: drm_prime.c,v 1.19 2021/12/19 11:37:23 riastradh Exp $ */
/*
* Copyright © 2012 Red Hat
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_prime.c,v 1.18 2021/12/19 11:36:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_prime.c,v 1.19 2021/12/19 11:37:23 riastradh Exp $");
#include <linux/export.h>
#include <linux/dma-buf.h>
@@ -243,7 +243,12 @@ static struct dma_buf *drm_prime_lookup_
uint32_t handle)
{
#ifdef __NetBSD__
- return rb_tree_find_node(&prime_fpriv->handles.rbr_tree, &handle);
+ struct drm_prime_member *member;
+
+ member = rb_tree_find_node(&prime_fpriv->handles.rbr_tree, &handle);
+ if (member == NULL)
+ return NULL;
+ return member->dma_buf;
#else
struct rb_node *rb;
