Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm2/dist/drm/radeon Ifdef out radeon prime.
details: https://anonhg.NetBSD.org/src/rev/8c1119dec567
branches: trunk
changeset: 992792:8c1119dec567
user: riastradh <riastradh%NetBSD.org@localhost>
date: Mon Aug 27 07:48:51 2018 +0000
description:
Ifdef out radeon prime.
diffstat:
sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diffs (32 lines):
diff -r 02f13a2f4326 -r 8c1119dec567 sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c Mon Aug 27 07:48:40 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c Mon Aug 27 07:48:51 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_display.c,v 1.6 2018/08/27 04:58:36 riastradh Exp $ */
+/* $NetBSD: radeon_display.c,v 1.7 2018/08/27 07:48:51 riastradh Exp $ */
/*
* Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
* Alex Deucher
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_display.c,v 1.6 2018/08/27 04:58:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_display.c,v 1.7 2018/08/27 07:48:51 riastradh Exp $");
#include <drm/drmP.h>
#include <drm/radeon_drm.h>
@@ -1404,11 +1404,13 @@
return ERR_PTR(-ENOENT);
}
+#ifndef __NetBSD__ /* XXX radeon prime */
/* Handle is imported dma-buf, so cannot be migrated to VRAM for scanout */
if (obj->import_attach) {
DRM_DEBUG_KMS("Cannot create framebuffer from imported dma_buf\n");
return ERR_PTR(-EINVAL);
}
+#endif
radeon_fb = kzalloc(sizeof(*radeon_fb), GFP_KERNEL);
if (radeon_fb == NULL) {
Home |
Main Index |
Thread Index |
Old Index