drivers/gpu/drm/openchrome/Makefile | 1 drivers/gpu/drm/openchrome/openchrome_display.h | 4 drivers/gpu/drm/openchrome/openchrome_drv.h | 4 drivers/gpu/drm/openchrome/openchrome_sii164.c | 554 ++++++++++++++++++++++++ drivers/gpu/drm/openchrome/openchrome_tmds.c | 13 5 files changed, 573 insertions(+), 3 deletions(-)
New commits: commit ecf91e241138369fc8c7d942e7fdd5f37474b6b3 Author: Kevin Brace <kevinbr...@gmx.com> Date: Sat May 26 22:24:57 2018 -0700 drm/openchrome: Version bumped to 3.0.84 Added support for Silicon Image SiI 164 DVI transmitter. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h index 54ccbee335dc..a40f7e375188 100644 --- a/drivers/gpu/drm/openchrome/openchrome_drv.h +++ b/drivers/gpu/drm/openchrome/openchrome_drv.h @@ -31,11 +31,11 @@ #define DRIVER_AUTHOR "OpenChrome Project" #define DRIVER_NAME "openchrome" #define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP" -#define DRIVER_DATE "20180525" +#define DRIVER_DATE "20180526" #define DRIVER_MAJOR 3 #define DRIVER_MINOR 0 -#define DRIVER_PATCHLEVEL 83 +#define DRIVER_PATCHLEVEL 84 #include <linux/module.h> #include "ttm/ttm_bo_api.h" commit 4678ae6d8af160f474d7e99a13db60574a477fe7 Author: Kevin Brace <kevinbr...@gmx.com> Date: Sat May 26 22:21:29 2018 -0700 drm/openchrome: Add Silicon Image SiI 164 DVI transmitter support Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/openchrome_display.h b/drivers/gpu/drm/openchrome/openchrome_display.h index 14fc4e7317f3..1240bef2f779 100644 --- a/drivers/gpu/drm/openchrome/openchrome_display.h +++ b/drivers/gpu/drm/openchrome/openchrome_display.h @@ -78,6 +78,8 @@ /* External TMDS (DVI) Transmitter Type */ #define VIA_TMDS_NONE 0x0 #define VIA_TMDS_VT1632 BIT(0) +#define VIA_TMDS_SII164 BIT(1) + typedef struct _via_fp_info { u32 x; diff --git a/drivers/gpu/drm/openchrome/openchrome_tmds.c b/drivers/gpu/drm/openchrome/openchrome_tmds.c index 2b9589bc2879..044b6a719e79 100644 --- a/drivers/gpu/drm/openchrome/openchrome_tmds.c +++ b/drivers/gpu/drm/openchrome/openchrome_tmds.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2017 Kevin Brace + * Copyright (C) 2016-2018 Kevin Brace. All Rights Reserved. * Copyright © 2013 James Simmons * * Permission is hereby granted, free of charge, to any person obtaining a @@ -537,6 +537,11 @@ void openchrome_ext_dvi_probe(struct drm_device *dev) dev_priv->ext_tmds_i2c_bus = VIA_I2C_BUS2; dev_priv->ext_tmds_transmitter = VIA_TMDS_VT1632; dev_priv->mapped_i2c_bus |= VIA_I2C_BUS2; + } else if (openchrome_sii164_probe(i2c_bus)) { + dev_priv->ext_tmds_presence = true; + dev_priv->ext_tmds_i2c_bus = VIA_I2C_BUS2; + dev_priv->ext_tmds_transmitter = VIA_TMDS_SII164; + dev_priv->mapped_i2c_bus |= VIA_I2C_BUS2; } } @@ -548,6 +553,11 @@ void openchrome_ext_dvi_probe(struct drm_device *dev) dev_priv->ext_tmds_i2c_bus = VIA_I2C_BUS4; dev_priv->ext_tmds_transmitter = VIA_TMDS_VT1632; dev_priv->mapped_i2c_bus |= VIA_I2C_BUS4; + } else if (openchrome_sii164_probe(i2c_bus)) { + dev_priv->ext_tmds_presence = true; + dev_priv->ext_tmds_i2c_bus = VIA_I2C_BUS4; + dev_priv->ext_tmds_transmitter = VIA_TMDS_SII164; + dev_priv->mapped_i2c_bus |= VIA_I2C_BUS4; } } @@ -641,6 +651,7 @@ void openchrome_ext_dvi_init(struct drm_device *dev) DRM_DEBUG_KMS("Entered %s.\n", __func__); openchrome_vt1632_init(dev); + openchrome_sii164_init(dev); DRM_DEBUG_KMS("Exiting %s.\n", __func__); } commit 90d58da557c7b242627d8e093741610ca1891e49 Author: Kevin Brace <kevinbr...@gmx.com> Date: Sat May 26 20:43:05 2018 -0700 drm/openchrome: Add openchrome_sii164.c This file handles Silicon Image SiI 164 DVI transmitter control in order to support DVI. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/Makefile b/drivers/gpu/drm/openchrome/Makefile index 6a1e291f9e92..c3f8ede797ec 100644 --- a/drivers/gpu/drm/openchrome/Makefile +++ b/drivers/gpu/drm/openchrome/Makefile @@ -21,6 +21,7 @@ openchrome-y := openchrome_analog.o \ openchrome_ioc32.o \ openchrome_irq.o \ openchrome_pm.o \ + openchrome_sii164.o \ openchrome_sgdma.o \ openchrome_tmds.o \ openchrome_ttm.o \ diff --git a/drivers/gpu/drm/openchrome/openchrome_display.h b/drivers/gpu/drm/openchrome/openchrome_display.h index 8be09b18cd72..14fc4e7317f3 100644 --- a/drivers/gpu/drm/openchrome/openchrome_display.h +++ b/drivers/gpu/drm/openchrome/openchrome_display.h @@ -191,6 +191,7 @@ extern void via_connector_destroy(struct drm_connector *connector); extern void via_analog_probe(struct drm_device *dev); extern bool openchrome_vt1632_probe(struct i2c_adapter *i2c_bus); +extern bool openchrome_sii164_probe(struct i2c_adapter *i2c_bus); extern void openchrome_ext_dvi_probe(struct drm_device *dev); extern void via_tmds_probe(struct drm_device *dev); extern void via_fp_probe(struct drm_device *dev); @@ -198,6 +199,7 @@ extern void via_fp_probe(struct drm_device *dev); extern void via_hdmi_init(struct drm_device *dev, u32 di_port); extern void via_analog_init(struct drm_device *dev); extern void openchrome_vt1632_init(struct drm_device *dev); +extern void openchrome_sii164_init(struct drm_device *dev); extern void openchrome_ext_dvi_init(struct drm_device *dev); extern void via_tmds_init(struct drm_device *dev); extern void via_fp_init(struct drm_device *dev); diff --git a/drivers/gpu/drm/openchrome/openchrome_sii164.c b/drivers/gpu/drm/openchrome/openchrome_sii164.c new file mode 100644 index 000000000000..d3fbfc45a541 --- /dev/null +++ b/drivers/gpu/drm/openchrome/openchrome_sii164.c @@ -0,0 +1,554 @@ +/* + * Copyright (C) 2016-2018 Kevin Brace. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ +/* + * Author(s): + * + * Kevin Brace <kevinbr...@gmx.com> + * + */ + +#include "openchrome_drv.h" +#include "openchrome_crtc_hw.h" + + +#define SII164_VEN BIT(5) +#define SII164_HEN BIT(4) +#define SII164_DSEL BIT(3) +#define SII164_BSEL BIT(2) +#define SII164_EDGE BIT(1) +#define SII164_PDB BIT(0) + + +static void openchrome_sii164_power(struct i2c_adapter *i2c_bus, bool power_state) +{ + u8 buf; + u8 power_bit; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + via_i2c_readbytes(i2c_bus, 0x38, 0x08, &buf, 1); + power_bit = power_state ? SII164_PDB : 0x00; + buf &= ~power_bit; + buf |= power_bit; + via_i2c_writebytes(i2c_bus, 0x38, 0x08, &buf, 1); + DRM_DEBUG_KMS("SiI 164 (DVI) Power: %s\n", + power_state ? "On" : "Off"); + + DRM_DEBUG_KMS("Exiting %s.\n", __func__); +} + + +static bool openchrome_sii164_sense(struct i2c_adapter *i2c_bus) +{ + u8 buf; + bool rx_detected = false; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + via_i2c_readbytes(i2c_bus, 0x38, 0x09, &buf, 1); + if (buf & BIT(2)) { + rx_detected = true; + } + + DRM_DEBUG_KMS("SiI 164 (DVI) Connector Sense: %s\n", + rx_detected ? "Connected" : "Not Connected"); + + DRM_DEBUG_KMS("Exiting %s.\n", __func__); + return rx_detected; +} + +static void openchrome_sii164_display_registers( + struct i2c_adapter *i2c_bus) +{ + uint8_t i; + u8 buf; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + DRM_DEBUG_KMS("SiI 164 Registers:\n"); + for (i = 0; i < 0x10; i++) { + via_i2c_readbytes(i2c_bus, 0x38, i, &buf, 1); + DRM_DEBUG_KMS("0x%02x: 0x%02x\n", i, buf); + } + + DRM_DEBUG_KMS("Exiting %s.\n", __func__); +} + +static void openchrome_sii164_init_registers( + struct i2c_adapter *i2c_bus) +{ + u8 buf; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + buf = SII164_VEN | SII164_HEN | + SII164_DSEL | + SII164_EDGE | SII164_PDB; + via_i2c_writebytes(i2c_bus, 0x38, 0x08, &buf, 1); + + /* + * Route receiver detect bit (Offset 0x09[2]) as the output + * of MSEN pin. + */ + buf = BIT(5); + via_i2c_writebytes(i2c_bus, 0x38, 0x09, &buf, 1); + + buf = 0x90; + via_i2c_writebytes(i2c_bus, 0x38, 0x0a, &buf, 1); + + buf = 0x89; + via_i2c_writebytes(i2c_bus, 0x38, 0x0c, &buf, 1); + + DRM_DEBUG_KMS("Exiting %s.\n", __func__); +} + + +static const struct drm_encoder_funcs openchrome_sii164_drm_encoder_funcs = { + .destroy = via_encoder_cleanup, +}; + +static void openchrome_sii164_dpms(struct drm_encoder *encoder, int mode) +{ + struct via_encoder *enc = container_of(encoder, + struct via_encoder, base); + struct via_device *dev_priv = encoder->dev->dev_private; + struct i2c_adapter *i2c_bus; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + if (enc->i2c_bus & VIA_I2C_BUS1) { + i2c_bus = via_find_ddc_bus(0x26); + } else if (enc->i2c_bus & VIA_I2C_BUS2) { + i2c_bus = via_find_ddc_bus(0x31); + } else if (enc->i2c_bus & VIA_I2C_BUS3) { + i2c_bus = via_find_ddc_bus(0x25); + } else if (enc->i2c_bus & VIA_I2C_BUS4) { + i2c_bus = via_find_ddc_bus(0x2c); + } else if (enc->i2c_bus & VIA_I2C_BUS5) { + i2c_bus = via_find_ddc_bus(0x3d); + } else { + i2c_bus = NULL; + goto exit; + } + + openchrome_sii164_display_registers(i2c_bus); + switch (mode) { + case DRM_MODE_DPMS_ON: + openchrome_sii164_power(i2c_bus, true); + openchrome_transmitter_io_pad_state(dev_priv, enc->di_port, true); + break; + case DRM_MODE_DPMS_STANDBY: + case DRM_MODE_DPMS_SUSPEND: + case DRM_MODE_DPMS_OFF: + openchrome_sii164_power(i2c_bus, false); + openchrome_transmitter_io_pad_state(dev_priv, enc->di_port, false); + break; + default: + DRM_ERROR("Bad DPMS mode."); + break; + } + +exit: + DRM_DEBUG_KMS("Exiting %s.\n", __func__); +} + +static bool openchrome_sii164_mode_fixup(struct drm_encoder *encoder, + const struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode) +{ + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + drm_mode_set_crtcinfo(adjusted_mode, 0); + + DRM_DEBUG_KMS("Exiting %s.\n", __func__); + return true; +} + +static void openchrome_sii164_mode_set(struct drm_encoder *encoder, + struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode) +{ + struct via_crtc *iga = container_of(encoder->crtc, struct via_crtc, base); + struct via_encoder *enc = container_of(encoder, + struct via_encoder, base); + struct via_device *dev_priv = encoder->dev->dev_private; + struct i2c_adapter *i2c_bus; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + if (enc->i2c_bus & VIA_I2C_BUS1) { + i2c_bus = via_find_ddc_bus(0x26); + } else if (enc->i2c_bus & VIA_I2C_BUS2) { + i2c_bus = via_find_ddc_bus(0x31); + } else if (enc->i2c_bus & VIA_I2C_BUS3) { + i2c_bus = via_find_ddc_bus(0x25); + } else if (enc->i2c_bus & VIA_I2C_BUS4) { + i2c_bus = via_find_ddc_bus(0x2c); + } else if (enc->i2c_bus & VIA_I2C_BUS5) { + i2c_bus = via_find_ddc_bus(0x3d); + } else { + i2c_bus = NULL; + goto exit; + } + + openchrome_transmitter_clock_drive_strength(dev_priv, enc->di_port, 0x03); + openchrome_transmitter_data_drive_strength(dev_priv, enc->di_port, 0x03); + openchrome_transmitter_io_pad_state(dev_priv, enc->di_port, true); + + openchrome_sii164_display_registers(i2c_bus); + openchrome_sii164_init_registers(i2c_bus); + openchrome_sii164_display_registers(i2c_bus); + + openchrome_transmitter_display_source(dev_priv, enc->di_port, iga->index); +exit: + + DRM_DEBUG_KMS("Exiting %s.\n", __func__); +} + +static void openchrome_sii164_prepare(struct drm_encoder *encoder) +{ + struct via_encoder *enc = container_of(encoder, + struct via_encoder, base); + struct via_device *dev_priv = encoder->dev->dev_private; + struct i2c_adapter *i2c_bus; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + if (enc->i2c_bus & VIA_I2C_BUS1) { + i2c_bus = via_find_ddc_bus(0x26); + } else if (enc->i2c_bus & VIA_I2C_BUS2) { + i2c_bus = via_find_ddc_bus(0x31); + } else if (enc->i2c_bus & VIA_I2C_BUS3) { + i2c_bus = via_find_ddc_bus(0x25); + } else if (enc->i2c_bus & VIA_I2C_BUS4) { + i2c_bus = via_find_ddc_bus(0x2c); + } else if (enc->i2c_bus & VIA_I2C_BUS5) { + i2c_bus = via_find_ddc_bus(0x3d); + } else { + i2c_bus = NULL; + goto exit; + } + + openchrome_sii164_power(i2c_bus, false); + openchrome_transmitter_io_pad_state(dev_priv, enc->di_port, false); +exit: + DRM_DEBUG_KMS("Exiting %s.\n", __func__); +} + +static void openchrome_sii164_commit(struct drm_encoder *encoder) +{ + struct via_encoder *enc = container_of(encoder, + struct via_encoder, base); + struct via_device *dev_priv = encoder->dev->dev_private; + struct i2c_adapter *i2c_bus; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + if (enc->i2c_bus & VIA_I2C_BUS1) { + i2c_bus = via_find_ddc_bus(0x26); + } else if (enc->i2c_bus & VIA_I2C_BUS2) { + i2c_bus = via_find_ddc_bus(0x31); + } else if (enc->i2c_bus & VIA_I2C_BUS3) { + i2c_bus = via_find_ddc_bus(0x25); + } else if (enc->i2c_bus & VIA_I2C_BUS4) { + i2c_bus = via_find_ddc_bus(0x2c); + } else if (enc->i2c_bus & VIA_I2C_BUS5) { + i2c_bus = via_find_ddc_bus(0x3d); + } else { + i2c_bus = NULL; + goto exit; + } + + openchrome_sii164_power(i2c_bus, true); + openchrome_transmitter_io_pad_state(dev_priv, enc->di_port, true); + +exit: + DRM_DEBUG_KMS("Exiting %s.\n", __func__); +} + +static void openchrome_sii164_disable(struct drm_encoder *encoder) +{ + struct via_encoder *enc = container_of(encoder, + struct via_encoder, base); + struct via_device *dev_priv = encoder->dev->dev_private; + struct i2c_adapter *i2c_bus; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + if (enc->i2c_bus & VIA_I2C_BUS1) { + i2c_bus = via_find_ddc_bus(0x26); + } else if (enc->i2c_bus & VIA_I2C_BUS2) { + i2c_bus = via_find_ddc_bus(0x31); + } else if (enc->i2c_bus & VIA_I2C_BUS3) { + i2c_bus = via_find_ddc_bus(0x25); + } else if (enc->i2c_bus & VIA_I2C_BUS4) { + i2c_bus = via_find_ddc_bus(0x2c); + } else if (enc->i2c_bus & VIA_I2C_BUS5) { + i2c_bus = via_find_ddc_bus(0x3d); + } else { + i2c_bus = NULL; + goto exit; + } + + openchrome_sii164_power(i2c_bus, false); + openchrome_transmitter_io_pad_state(dev_priv, enc->di_port, false); +exit: + DRM_DEBUG_KMS("Exiting %s.\n", __func__); +} + + +static const struct drm_encoder_helper_funcs openchrome_sii164_drm_encoder_helper_funcs = { + .dpms = openchrome_sii164_dpms, + .mode_fixup = openchrome_sii164_mode_fixup, + .mode_set = openchrome_sii164_mode_set, + .prepare = openchrome_sii164_prepare, + .commit = openchrome_sii164_commit, + .disable = openchrome_sii164_disable, +}; + + +static enum drm_connector_status openchrome_sii164_detect( + struct drm_connector *connector, + bool force) +{ + struct via_connector *con = container_of(connector, + struct via_connector, base); + struct i2c_adapter *i2c_bus; + enum drm_connector_status ret = connector_status_disconnected; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + if (con->i2c_bus & VIA_I2C_BUS1) { + i2c_bus = via_find_ddc_bus(0x26); + } else if (con->i2c_bus & VIA_I2C_BUS2) { + i2c_bus = via_find_ddc_bus(0x31); + } else if (con->i2c_bus & VIA_I2C_BUS3) { + i2c_bus = via_find_ddc_bus(0x25); + } else if (con->i2c_bus & VIA_I2C_BUS4) { + i2c_bus = via_find_ddc_bus(0x2c); + } else if (con->i2c_bus & VIA_I2C_BUS5) { + i2c_bus = via_find_ddc_bus(0x3d); + } else { + i2c_bus = NULL; + goto exit; + } + + if (openchrome_sii164_sense(i2c_bus)) { + ret = connector_status_connected; + DRM_DEBUG_KMS("DVI detected.\n"); + } + +exit: + DRM_DEBUG_KMS("Exiting %s.\n", __func__); + return ret; +} + +static const struct drm_connector_funcs openchrome_sii164_drm_connector_funcs = { + .dpms = drm_helper_connector_dpms, + .detect = openchrome_sii164_detect, + .fill_modes = drm_helper_probe_single_connector_modes, + .set_property = via_connector_set_property, + .destroy = via_connector_destroy, +}; + + +int openchrome_sii164_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) +{ + struct via_connector *con = container_of(connector, + struct via_connector, base); + struct i2c_adapter *i2c_bus; + u8 buf; + uint32_t low_freq_limit, high_freq_limit; + int ret; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + if (con->i2c_bus & VIA_I2C_BUS1) { + i2c_bus = via_find_ddc_bus(0x26); + } else if (con->i2c_bus & VIA_I2C_BUS2) { + i2c_bus = via_find_ddc_bus(0x31); + } else if (con->i2c_bus & VIA_I2C_BUS3) { + i2c_bus = via_find_ddc_bus(0x25); + } else if (con->i2c_bus & VIA_I2C_BUS4) { + i2c_bus = via_find_ddc_bus(0x2c); + } else if (con->i2c_bus & VIA_I2C_BUS5) { + i2c_bus = via_find_ddc_bus(0x3d); + } else { + i2c_bus = NULL; + ret = MODE_ERROR; + goto exit; + } + + via_i2c_readbytes(i2c_bus, 0x38, 0x06, &buf, 1); + low_freq_limit = buf * 1000; + via_i2c_readbytes(i2c_bus, 0x38, 0x07, &buf, 1); + high_freq_limit = (buf + 65) * 1000; + DRM_DEBUG_KMS("Low Frequency Limit: %u KHz\n", low_freq_limit); + DRM_DEBUG_KMS("High Frequency Limit: %u KHz\n", high_freq_limit); + + if (mode->clock < low_freq_limit) { + ret = MODE_CLOCK_LOW; + goto exit; + } + + if (mode->clock > high_freq_limit) { + ret = MODE_CLOCK_HIGH; + goto exit; + } + + ret = MODE_OK; +exit: + DRM_DEBUG_KMS("Exiting %s.\n", __func__); + return ret; +} + +static int openchrome_sii164_get_modes(struct drm_connector *connector) +{ + struct via_connector *con = container_of(connector, + struct via_connector, base); + int count = 0; + struct i2c_adapter *i2c_bus; + struct edid *edid = NULL; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + if (con->i2c_bus & VIA_I2C_BUS1) { + i2c_bus = via_find_ddc_bus(0x26); + } else if (con->i2c_bus & VIA_I2C_BUS2) { + i2c_bus = via_find_ddc_bus(0x31); + } else if (con->i2c_bus & VIA_I2C_BUS3) { + i2c_bus = via_find_ddc_bus(0x25); + } else if (con->i2c_bus & VIA_I2C_BUS4) { + i2c_bus = via_find_ddc_bus(0x2c); + } else if (con->i2c_bus & VIA_I2C_BUS5) { + i2c_bus = via_find_ddc_bus(0x3d); + } else { + i2c_bus = NULL; + goto exit; + } + + edid = drm_get_edid(&con->base, i2c_bus); + if (edid) { + if (edid->input & DRM_EDID_INPUT_DIGITAL) { + drm_mode_connector_update_edid_property(connector, edid); + count = drm_add_edid_modes(connector, edid); + DRM_DEBUG_KMS("DVI EDID information was obtained.\n"); + } + + kfree(edid); + } + +exit: + DRM_DEBUG_KMS("Exiting %s.\n", __func__); + return count; +} + +static const struct drm_connector_helper_funcs openchrome_sii164_drm_connector_helper_funcs = { + .mode_valid = openchrome_sii164_mode_valid, + .get_modes = openchrome_sii164_get_modes, + .best_encoder = via_best_encoder, +}; + +bool openchrome_sii164_probe(struct i2c_adapter *i2c_bus) +{ + u8 buf; + u16 vendor_id, device_id, revision; + bool device_detected = false; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + via_i2c_readbytes(i2c_bus, 0x38, 0x00, &buf, 1); + vendor_id = buf; + via_i2c_readbytes(i2c_bus, 0x38, 0x01, &buf, 1); + vendor_id |= (buf << 8); + DRM_DEBUG_KMS("Vendor ID: %x\n", vendor_id); + via_i2c_readbytes(i2c_bus, 0x38, 0x02, &buf, 1); + device_id = buf; + via_i2c_readbytes(i2c_bus, 0x38, 0x03, &buf, 1); + device_id |= (buf << 8); + DRM_DEBUG_KMS("Device ID: %x\n", device_id); + via_i2c_readbytes(i2c_bus, 0x38, 0x04, &buf, 1); + revision = buf; + DRM_DEBUG_KMS("Revision: %x\n", revision); + + if ((vendor_id != 0x0001) || (device_id != 0x0006)) { + goto exit; + } + + device_detected = true; +exit: + DRM_DEBUG_KMS("Exiting %s.\n", __func__); + return device_detected; +} + +void openchrome_sii164_init(struct drm_device *dev) +{ + struct via_connector *con; + struct via_encoder *enc; + struct via_device *dev_priv = dev->dev_private; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + if (!dev_priv->ext_tmds_presence) { + goto exit; + } + + enc = kzalloc(sizeof(*enc) + sizeof(*con), GFP_KERNEL); + if (!enc) { + DRM_ERROR("Failed to allocate connector " + "and encoder.\n"); + goto exit; + } + + drm_encoder_init(dev, &enc->base, &openchrome_sii164_drm_encoder_funcs, + DRM_MODE_ENCODER_TMDS, NULL); + drm_encoder_helper_add(&enc->base, &openchrome_sii164_drm_encoder_helper_funcs); + + enc->base.possible_crtcs = BIT(1) | BIT(0); + enc->base.possible_clones = 0; + + enc->i2c_bus = dev_priv->ext_tmds_i2c_bus; + enc->di_port = dev_priv->ext_tmds_di_port; + + /* Increment the number of DVI connectors. */ + dev_priv->number_dvi++; + + + con = &enc->cons[0]; + + drm_connector_init(dev, &con->base, &openchrome_sii164_drm_connector_funcs, + DRM_MODE_CONNECTOR_DVID); + drm_connector_helper_add(&con->base, &openchrome_sii164_drm_connector_helper_funcs); + drm_connector_register(&con->base); + + con->base.doublescan_allowed = false; + con->base.interlace_allowed = false; + + con->i2c_bus = dev_priv->ext_tmds_i2c_bus; + + INIT_LIST_HEAD(&con->props); + drm_mode_connector_attach_encoder(&con->base, &enc->base); +exit: + DRM_DEBUG_KMS("Exiting %s.\n", __func__); +} _______________________________________________ openchrome-devel mailing list openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel