Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:55:48 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fb.c
Log Message:
sort out no fb_info diffs
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.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_fb.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.12 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.12 Sun Dec 19 01:50:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c Sun Dec 19 09:55:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_fb.c,v 1.12 2021/12/19 01:50:00 riastradh Exp $ */
+/* $NetBSD: radeon_fb.c,v 1.13 2021/12/19 09:55:48 riastradh Exp $ */
/*
* Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_fb.c,v 1.12 2021/12/19 01:50:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_fb.c,v 1.13 2021/12/19 09:55:48 riastradh Exp $");
#include <linux/module.h>
#include <linux/pci.h>
@@ -59,6 +59,7 @@ struct radeon_fbdev {
struct radeon_device *rdev;
};
+#ifndef __NetBSD__
static int
radeonfb_open(struct fb_info *info, int user)
{
@@ -84,7 +85,6 @@ radeonfb_release(struct fb_info *info, i
return 0;
}
-#ifndef __NetBSD__
static const struct fb_ops radeonfb_ops = {
.owner = THIS_MODULE,
DRM_FB_HELPER_DEFAULT_OPS,
@@ -356,8 +356,9 @@ static int radeon_fbdev_destroy(struct d
{
#ifdef __NetBSD__
int ret;
-#endif
+#else
struct drm_framebuffer *fb = &rfbdev->fb;
+#endif
#ifdef __NetBSD__
/* XXX errno NetBSD->Linux */
