[src/trunk]: src/sys/dev/pci support WSDISPLAYIO_GET_EDID

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b7a3059c3572
branches:  trunk
changeset: 766635:b7a3059c3572
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Jun 29 03:14:36 2011 +0000

description:
support WSDISPLAYIO_GET_EDID

diffstat:

 sys/dev/pci/machfb.c |  13 ++++++-------
 sys/dev/pci/r128fb.c |  16 ++++++++++++----
 2 files changed, 18 insertions(+), 11 deletions(-)

diffs (99 lines):

diff -r 2d8294f88589 -r b7a3059c3572 sys/dev/pci/machfb.c
--- a/sys/dev/pci/machfb.c      Wed Jun 29 03:11:59 2011 +0000
+++ b/sys/dev/pci/machfb.c      Wed Jun 29 03:14:36 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machfb.c,v 1.67 2011/06/01 05:06:17 macallan Exp $     */
+/*     $NetBSD: machfb.c,v 1.68 2011/06/29 03:15:18 macallan Exp $     */
 
 /*
  * Copyright (c) 2002 Bang Jun-Young
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, 
-       "$NetBSD: machfb.c,v 1.67 2011/06/01 05:06:17 macallan Exp $");
+       "$NetBSD: machfb.c,v 1.68 2011/06/29 03:15:18 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1771,7 +1771,10 @@
                }
                }
                return 0;
-               
+       case WSDISPLAYIO_GET_EDID: {
+               struct wsdisplayio_edid_info *d = data;
+               return wsdisplayio_get_edid(sc->sc_dev, d);
+       }
        }
        return EPASSTHROUGH;
 }
@@ -2057,10 +2060,6 @@
                    sc->sc_pcitag, data);
 
        default:
-#ifdef MACHFB_DEBUG
-               log(LOG_NOTICE, "machfb_fbioctl(0x%lx) (%s[%d])\n", cmd,
-                   p->p_comm, p->p_pid);
-#endif
                return ENOTTY;
        }
 #ifdef MACHFB_DEBUG
diff -r 2d8294f88589 -r b7a3059c3572 sys/dev/pci/r128fb.c
--- a/sys/dev/pci/r128fb.c      Wed Jun 29 03:11:59 2011 +0000
+++ b/sys/dev/pci/r128fb.c      Wed Jun 29 03:14:36 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: r128fb.c,v 1.21 2011/02/15 04:06:43 macallan Exp $     */
+/*     $NetBSD: r128fb.c,v 1.22 2011/06/29 03:14:36 macallan Exp $     */
 
 /*
  * Copyright (c) 2007 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.21 2011/02/15 04:06:43 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.22 2011/06/29 03:14:36 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -59,6 +59,7 @@
 #include <dev/i2c/i2cvar.h>
 
 #include "opt_r128fb.h"
+#include "opt_vcons.h"
 
 #ifdef R128FB_DEBUG
 #define DPRINTF printf
@@ -201,8 +202,8 @@
        prop_dictionary_t       dict;
        unsigned long           defattr;
        bool                    is_console;
-       int i, j;
-       uint32_t reg, flags;
+       int                     i, j;
+       uint32_t                reg, flags;
 
        sc->sc_pc = pa->pa_pc;
        sc->sc_pcitag = pa->pa_tag;
@@ -425,6 +426,10 @@
                        return 0;
                }
                return EPASSTHROUGH;
+       case WSDISPLAYIO_GET_EDID: {
+               struct wsdisplayio_edid_info *d = data;
+               return wsdisplayio_get_edid(sc->sc_dev, d);
+       }
        }
        return EPASSTHROUGH;
 }
@@ -502,6 +507,9 @@
 
        rasops_init(ri, sc->sc_height / 8, sc->sc_width / 8);
        ri->ri_caps = WSSCREEN_WSCOLORS;
+#ifdef VCONS_DRAW_INTR
+       scr->scr_flags |= VCONS_DONT_READ;
+#endif
 
        rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,
                    sc->sc_width / ri->ri_font->fontwidth);