Module Name: src
Committed By: macallan
Date: Wed Oct 9 17:18:23 UTC 2013
Modified Files:
src/sys/dev/pci: gffb.c machfb.c pm2fb.c r128fb.c radeonfb.c voodoofb.c
Log Message:
support WSDISPLAYIO_GET_FBINFO
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/gffb.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/pci/machfb.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/pm2fb.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/r128fb.c
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pci/radeonfb.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/pci/voodoofb.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/dev/pci/gffb.c
diff -u src/sys/dev/pci/gffb.c:1.4 src/sys/dev/pci/gffb.c:1.5
--- src/sys/dev/pci/gffb.c:1.4 Wed Oct 9 12:03:29 2013
+++ src/sys/dev/pci/gffb.c Wed Oct 9 17:18:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: gffb.c,v 1.4 2013/10/09 12:03:29 macallan Exp $ */
+/* $NetBSD: gffb.c,v 1.5 2013/10/09 17:18:23 macallan Exp $ */
/*
* Copyright (c) 2007, 2012 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gffb.c,v 1.4 2013/10/09 12:03:29 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gffb.c,v 1.5 2013/10/09 17:18:23 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -434,6 +434,11 @@ gffb_ioctl(void *v, void *vs, u_long cmd
struct wsdisplayio_edid_info *d = data;
return wsdisplayio_get_edid(sc->sc_dev, d);
}
+
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = data;
+ return wsdisplayio_get_fbinfo(&ms->scr_ri, fbi);
+ }
}
return EPASSTHROUGH;
}
Index: src/sys/dev/pci/machfb.c
diff -u src/sys/dev/pci/machfb.c:1.88 src/sys/dev/pci/machfb.c:1.89
--- src/sys/dev/pci/machfb.c:1.88 Tue Jul 30 19:21:50 2013
+++ src/sys/dev/pci/machfb.c Wed Oct 9 17:18:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.88 2013/07/30 19:21:50 macallan Exp $ */
+/* $NetBSD: machfb.c,v 1.89 2013/10/09 17:18:23 macallan Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0,
- "$NetBSD: machfb.c,v 1.88 2013/07/30 19:21:50 macallan Exp $");
+ "$NetBSD: machfb.c,v 1.89 2013/10/09 17:18:23 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1913,6 +1913,11 @@ mach64_ioctl(void *v, void *vs, u_long c
struct wsdisplayio_edid_info *d = data;
return wsdisplayio_get_edid(sc->sc_dev, d);
}
+
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = data;
+ return wsdisplayio_get_fbinfo(&ms->scr_ri, fbi);
+ }
}
return EPASSTHROUGH;
}
Index: src/sys/dev/pci/pm2fb.c
diff -u src/sys/dev/pci/pm2fb.c:1.24 src/sys/dev/pci/pm2fb.c:1.25
--- src/sys/dev/pci/pm2fb.c:1.24 Sun Sep 15 09:34:07 2013
+++ src/sys/dev/pci/pm2fb.c Wed Oct 9 17:18:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pm2fb.c,v 1.24 2013/09/15 09:34:07 martin Exp $ */
+/* $NetBSD: pm2fb.c,v 1.25 2013/10/09 17:18:23 macallan Exp $ */
/*
* Copyright (c) 2009, 2012 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.24 2013/09/15 09:34:07 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.25 2013/10/09 17:18:23 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -526,6 +526,11 @@ pm2fb_ioctl(void *v, void *vs, u_long cm
return EAGAIN;
return copyout(sc->sc_edid_data, d->edid_data, 128);
}
+
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = data;
+ return wsdisplayio_get_fbinfo(&ms->scr_ri, fbi);
+ }
}
return EPASSTHROUGH;
}
Index: src/sys/dev/pci/r128fb.c
diff -u src/sys/dev/pci/r128fb.c:1.37 src/sys/dev/pci/r128fb.c:1.38
--- src/sys/dev/pci/r128fb.c:1.37 Tue Jul 30 19:21:50 2013
+++ src/sys/dev/pci/r128fb.c Wed Oct 9 17:18:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: r128fb.c,v 1.37 2013/07/30 19:21:50 macallan Exp $ */
+/* $NetBSD: r128fb.c,v 1.38 2013/10/09 17:18:23 macallan Exp $ */
/*
* Copyright (c) 2007, 2012 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.37 2013/07/30 19:21:50 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.38 2013/10/09 17:18:23 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -453,10 +453,16 @@ r128fb_ioctl(void *v, void *vs, u_long c
return 0;
}
return EPASSTHROUGH;
+
case WSDISPLAYIO_GET_EDID: {
struct wsdisplayio_edid_info *d = data;
return wsdisplayio_get_edid(sc->sc_dev, d);
}
+
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = data;
+ return wsdisplayio_get_fbinfo(&ms->scr_ri, fbi);
+ }
}
return EPASSTHROUGH;
}
Index: src/sys/dev/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.78 src/sys/dev/pci/radeonfb.c:1.79
--- src/sys/dev/pci/radeonfb.c:1.78 Sun Sep 15 09:37:14 2013
+++ src/sys/dev/pci/radeonfb.c Wed Oct 9 17:18:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.78 2013/09/15 09:37:14 martin Exp $ */
+/* $NetBSD: radeonfb.c,v 1.79 2013/10/09 17:18:23 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.78 2013/09/15 09:37:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.79 2013/10/09 17:18:23 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1062,8 +1062,10 @@ radeonfb_ioctl(void *v, void *vs,
struct radeonfb_display *dp;
struct radeonfb_softc *sc;
struct wsdisplay_param *param;
+ struct vcons_screen *ms;
vd = (struct vcons_data *)v;
+ ms = vd->active;
dp = (struct radeonfb_display *)vd->cookie;
sc = dp->rd_softc;
@@ -1207,6 +1209,11 @@ radeonfb_ioctl(void *v, void *vs,
return wsdisplayio_get_edid(sc->sc_dev, ei);
}
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = d;
+ return wsdisplayio_get_fbinfo(&ms->scr_ri, fbi);
+ }
+
default:
return EPASSTHROUGH;
}
Index: src/sys/dev/pci/voodoofb.c
diff -u src/sys/dev/pci/voodoofb.c:1.45 src/sys/dev/pci/voodoofb.c:1.46
--- src/sys/dev/pci/voodoofb.c:1.45 Tue Jul 30 19:21:50 2013
+++ src/sys/dev/pci/voodoofb.c Wed Oct 9 17:18:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: voodoofb.c,v 1.45 2013/07/30 19:21:50 macallan Exp $ */
+/* $NetBSD: voodoofb.c,v 1.46 2013/10/09 17:18:23 macallan Exp $ */
/*
* Copyright (c) 2005, 2006, 2012 Michael Lorenz
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.45 2013/07/30 19:21:50 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.46 2013/10/09 17:18:23 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1196,6 +1196,12 @@ voodoofb_ioctl(void *v, void *vs, u_long
}
}
return 0;
+ /* XXX WSDISPLAYIO_GET_EDID */
+
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = data;
+ return wsdisplayio_get_fbinfo(&ms->scr_ri, fbi);
+ }
}
return EPASSTHROUGH;
}
