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 sort out no fb_info diffs



details:   https://anonhg.NetBSD.org/src/rev/ce08cb0f8552
branches:  trunk
changeset: 1028246:ce08cb0f8552
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 09:55:48 2021 +0000

description:
sort out no fb_info diffs


Author: Maya Rashish <maya%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r cb4b2a174ae7 -r ce08cb0f8552 sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c Sun Dec 19 09:55:40 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c Sun Dec 19 09:55:48 2021 +0000
@@ -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_device *rdev;
 };
 
+#ifndef __NetBSD__
 static int
 radeonfb_open(struct fb_info *info, int user)
 {
@@ -84,7 +85,6 @@
        return 0;
 }
 
-#ifndef __NetBSD__
 static const struct fb_ops radeonfb_ops = {
        .owner = THIS_MODULE,
        DRM_FB_HELPER_DEFAULT_OPS,
@@ -356,8 +356,9 @@
 {
 #ifdef __NetBSD__
        int ret;
+#else
+       struct drm_framebuffer *fb = &rfbdev->fb;
 #endif
-       struct drm_framebuffer *fb = &rfbdev->fb;
 
 #ifdef __NetBSD__
        /* XXX errno NetBSD->Linux */



Home | Main Index | Thread Index | Old Index