[src/trunk]: src/sys/dev/pci support DDC2, so far only for WSDISPLAYIO_GET_EDID

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

details:   https://anonhg.NetBSD.org/src/rev/f7388ab8655f
branches:  trunk
changeset: 771530:f7388ab8655f
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Nov 24 05:51:17 2011 +0000

description:
support DDC2, so far only for WSDISPLAYIO_GET_EDID

diffstat:

 sys/dev/pci/pm2fb.c |  166 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 164 insertions(+), 2 deletions(-)

diffs (219 lines):

diff -r ef10a40fdbea -r f7388ab8655f sys/dev/pci/pm2fb.c
--- a/sys/dev/pci/pm2fb.c       Thu Nov 24 04:17:46 2011 +0000
+++ b/sys/dev/pci/pm2fb.c       Thu Nov 24 05:51:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pm2fb.c,v 1.7 2011/01/22 15:14:28 cegger Exp $ */
+/*     $NetBSD: pm2fb.c,v 1.8 2011/11/24 05:51:17 macallan Exp $       */
 
 /*
  * Copyright (c) 2009 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.7 2011/01/22 15:14:28 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.8 2011/11/24 05:51:17 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -57,6 +57,17 @@
 #include <dev/pci/wsdisplay_pci.h>
 
 #include <dev/i2c/i2cvar.h>
+#include <dev/i2c/i2c_bitbang.h>
+#include <dev/i2c/ddcvar.h>
+#include <dev/videomode/videomode.h>
+#include <dev/videomode/edidvar.h>
+#include <dev/videomode/edidreg.h>
+
+#ifdef PM2FB_DEBUG
+#define DPRINTF aprint_error
+#else
+#define DPRINTF while (0) printf
+#endif
 
 struct pm2fb_softc {
        device_t sc_dev;
@@ -84,6 +95,9 @@
        u_char sc_cmap_blue[256];
        /* engine stuff */
        uint32_t sc_pprod;
+       /* i2c stuff */
+       struct i2c_controller sc_i2c;
+       uint8_t sc_edid_data[128];
 };
 
 static int     pm2fb_match(device_t, cfdata_t, void *);
@@ -130,6 +144,34 @@
        NULL    /* scroll */
 };
 
+/* I2C glue */
+static int pm2fb_i2c_acquire_bus(void *, int);
+static void pm2fb_i2c_release_bus(void *, int);
+static int pm2fb_i2c_send_start(void *, int);
+static int pm2fb_i2c_send_stop(void *, int);
+static int pm2fb_i2c_initiate_xfer(void *, i2c_addr_t, int);
+static int pm2fb_i2c_read_byte(void *, uint8_t *, int);
+static int pm2fb_i2c_write_byte(void *, uint8_t, int);
+
+/* I2C bitbang glue */
+static void pm2fb_i2cbb_set_bits(void *, uint32_t);
+static void pm2fb_i2cbb_set_dir(void *, uint32_t);
+static uint32_t pm2fb_i2cbb_read(void *);
+
+static void pm2_setup_i2c(struct pm2fb_softc *);
+
+static const struct i2c_bitbang_ops pm2fb_i2cbb_ops = {
+       pm2fb_i2cbb_set_bits,
+       pm2fb_i2cbb_set_dir,
+       pm2fb_i2cbb_read,
+       {
+               PM2_DD_SDA_IN,
+               PM2_DD_SCL_IN,
+               0,
+               0
+       }
+};
+
 static inline void
 pm2fb_wait(struct pm2fb_softc *sc, int slots)
 {
@@ -248,6 +290,8 @@
        sc->sc_mode = WSDISPLAYIO_MODE_EMUL;
        sc->sc_locked = 0;
 
+       pm2_setup_i2c(sc);
+
        vcons_init(&sc->vd, sc, &sc->sc_defaultscreen_descr,
            &pm2fb_accessops);
        sc->vd.init_screen = pm2fb_init_screen;
@@ -356,6 +400,13 @@
                }
                }
                return 0;
+       case WSDISPLAYIO_GET_EDID: {
+               struct wsdisplayio_edid_info *d = data;
+               d->data_size = 128;
+               if (d->buffer_size < 128)
+                       return EAGAIN;
+               return copyout(sc->sc_edid_data, d->edid_data, 128);
+       }
        }
        return EPASSTHROUGH;
 }
@@ -840,3 +891,114 @@
        }
 }
 
+static void
+pm2_setup_i2c(struct pm2fb_softc *sc)
+{
+#ifdef PM2FB_DEBUG
+       struct edid_info ei;
+#endif
+       int i;
+
+       /* Fill in the i2c tag */
+       sc->sc_i2c.ic_cookie = sc;
+       sc->sc_i2c.ic_acquire_bus = pm2fb_i2c_acquire_bus;
+       sc->sc_i2c.ic_release_bus = pm2fb_i2c_release_bus;
+       sc->sc_i2c.ic_send_start = pm2fb_i2c_send_start;
+       sc->sc_i2c.ic_send_stop = pm2fb_i2c_send_stop;
+       sc->sc_i2c.ic_initiate_xfer = pm2fb_i2c_initiate_xfer;
+       sc->sc_i2c.ic_read_byte = pm2fb_i2c_read_byte;
+       sc->sc_i2c.ic_write_byte = pm2fb_i2c_write_byte;
+       sc->sc_i2c.ic_exec = NULL;
+
+       DPRINTF("data: %08x\n", bus_space_read_4(sc->sc_memt, sc->sc_regh,
+               PM2_DISPLAY_DATA));
+
+       /* make sure we're in i2c mode */
+       bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_DISPLAY_DATA, 0);
+
+       /* zero out the EDID buffer */
+       memset(sc->sc_edid_data, 0, 128);
+
+       /* Some monitors don't respond first time */
+       i = 0;
+       while (sc->sc_edid_data[1] == 0 && i++ < 3)
+               ddc_read_edid(&sc->sc_i2c, sc->sc_edid_data, 128);
+#ifdef PM2FB_DEBUG
+       if (edid_parse(&edid_data[0], &ei) != -1) {
+               edid_print(&ei);
+       }
+#endif
+}
+
+/* I2C bitbanging */
+static void pm2fb_i2cbb_set_bits(void *cookie, uint32_t bits)
+{
+       struct pm2fb_softc *sc = cookie;
+       uint32_t out;
+
+       out = bits << 2;        /* bitmasks match the IN bits */
+
+       bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_DISPLAY_DATA, out);
+}
+
+static void pm2fb_i2cbb_set_dir(void *cookie, uint32_t dir)
+{
+       /* Nothing to do */
+}
+
+static uint32_t pm2fb_i2cbb_read(void *cookie)
+{
+       struct pm2fb_softc *sc = cookie;
+       uint32_t bits;
+
+       bits = bus_space_read_4(sc->sc_memt, sc->sc_regh, PM2_DISPLAY_DATA);
+
+       return bits;
+}
+
+/* higher level I2C stuff */
+static int
+pm2fb_i2c_acquire_bus(void *cookie, int flags)
+{
+       /* private bus */
+       return (0);
+}
+
+static void
+pm2fb_i2c_release_bus(void *cookie, int flags)
+{
+       /* private bus */
+}
+
+static int
+pm2fb_i2c_send_start(void *cookie, int flags)
+{
+       return (i2c_bitbang_send_start(cookie, flags, &pm2fb_i2cbb_ops));
+}
+
+static int
+pm2fb_i2c_send_stop(void *cookie, int flags)
+{
+
+       return (i2c_bitbang_send_stop(cookie, flags, &pm2fb_i2cbb_ops));
+}
+
+static int
+pm2fb_i2c_initiate_xfer(void *cookie, i2c_addr_t addr, int flags)
+{
+
+       return (i2c_bitbang_initiate_xfer(cookie, addr, flags, 
+           &pm2fb_i2cbb_ops));
+}
+
+static int
+pm2fb_i2c_read_byte(void *cookie, uint8_t *valp, int flags)
+{
+       return (i2c_bitbang_read_byte(cookie, valp, flags, &pm2fb_i2cbb_ops));
+}
+
+static int
+pm2fb_i2c_write_byte(void *cookie, uint8_t val, int flags)
+{
+       return (i2c_bitbang_write_byte(cookie, val, flags, &pm2fb_i2cbb_ops));
+}