Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:48:51 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_display.c
Log Message:
Ifdef out radeon prime.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.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/radeon/radeon_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c:1.6 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c:1.6 Mon Aug 27 04:58:36 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c Mon Aug 27 07:48:51 2018
@@ -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 @@ radeon_user_framebuffer_create(struct dr
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) {
