[Openchrome-devel] drm-openchrome: Branch 'drm-next-3.19' - 4 commits - drivers/gpu/drm
Kevin Brace
kevinbrace at kemper.freedesktop.org
Fri Nov 3 08:58:43 UTC 2017
drivers/gpu/drm/openchrome/via_analog.c | 2 ++
drivers/gpu/drm/openchrome/via_drv.c | 4 ++--
drivers/gpu/drm/openchrome/via_drv.h | 4 ++--
drivers/gpu/drm/openchrome/via_fp.c | 22 ++++++++++++----------
drivers/gpu/drm/openchrome/via_tmds.c | 10 +++++-----
5 files changed, 23 insertions(+), 19 deletions(-)
New commits:
commit b86403791b2578ffc524cbe96d263dbc0b076d30
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Nov 2 23:48:16 2017 -0700
drm/openchrome: Version bumped to 3.0.54
This version fixes the I2C display detection regression introduced
by Version 3.0.52.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_drv.h b/drivers/gpu/drm/openchrome/via_drv.h
index 4c08bba0267c..00d35f37f51f 100644
--- a/drivers/gpu/drm/openchrome/via_drv.h
+++ b/drivers/gpu/drm/openchrome/via_drv.h
@@ -30,11 +30,11 @@
#define DRIVER_AUTHOR "OpenChrome Project"
#define DRIVER_NAME "openchrome"
#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE "20171030"
+#define DRIVER_DATE "20171102"
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 0
-#define DRIVER_PATCHLEVEL 53
+#define DRIVER_PATCHLEVEL 54
#include <linux/module.h>
commit 3aded78ab95f7cbcd2a01deb48070a4b62e6a3f0
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Nov 2 23:47:24 2017 -0700
drm/openchrome: Fix debug messages
Carriage return was missing.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_drv.c b/drivers/gpu/drm/openchrome/via_drv.c
index 5fc26da8d179..92109b805380 100644
--- a/drivers/gpu/drm/openchrome/via_drv.c
+++ b/drivers/gpu/drm/openchrome/via_drv.c
@@ -543,7 +543,7 @@ static int via_pm_ops_suspend(struct device *dev)
struct drm_device *drm_dev = pci_get_drvdata(pdev);
struct via_device *dev_priv = drm_dev->dev_private;
- DRM_DEBUG_KMS("Entered %s.", __func__);
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
console_lock();
if (dev_priv->via_fbdev->helper.fbdev) {
@@ -575,7 +575,7 @@ static int via_pm_ops_resume(struct device *dev)
void __iomem *regs = ioport_map(0x3c0, 100);
u8 val;
- DRM_DEBUG_KMS("Entered %s.", __func__);
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
console_lock();
diff --git a/drivers/gpu/drm/openchrome/via_fp.c b/drivers/gpu/drm/openchrome/via_fp.c
index e88e779895d8..e64e4eba3bc8 100644
--- a/drivers/gpu/drm/openchrome/via_fp.c
+++ b/drivers/gpu/drm/openchrome/via_fp.c
@@ -686,7 +686,7 @@ static void via_fp_dpms(struct drm_encoder *encoder, int mode)
/* PCI Device ID */
u16 chipset = dev->pdev->device;
- DRM_DEBUG_KMS("Entered %s.", __func__);
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
switch (mode) {
case DRM_MODE_DPMS_ON:
@@ -703,7 +703,7 @@ static void via_fp_dpms(struct drm_encoder *encoder, int mode)
break;
}
- DRM_DEBUG_KMS("Exiting %s.", __func__);
+ DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
static bool
@@ -781,7 +781,7 @@ static void via_fp_prepare(struct drm_encoder *encoder)
/* PCI Device ID */
u16 chipset = dev->pdev->device;
- DRM_DEBUG_KMS("Entered %s.", __func__);
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
via_fp_power(dev_priv, chipset, enc->di_port, false);
via_fp_io_pad_setting(dev_priv, enc->di_port, false);
@@ -799,7 +799,7 @@ static void via_fp_commit(struct drm_encoder *encoder)
/* PCI Device ID */
u16 chipset = dev->pdev->device;
- DRM_DEBUG_KMS("Entered %s.", __func__);
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
via_fp_power(dev_priv, chipset, enc->di_port, true);
via_fp_io_pad_setting(dev_priv, enc->di_port, true);
@@ -897,7 +897,7 @@ static void via_fp_disable(struct drm_encoder *encoder)
/* PCI Device ID */
u16 chipset = dev->pdev->device;
- DRM_DEBUG_KMS("Entered %s.", __func__);
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
via_fp_power(dev_priv, chipset, enc->di_port, false);
via_fp_io_pad_setting(dev_priv, enc->di_port, false);
diff --git a/drivers/gpu/drm/openchrome/via_tmds.c b/drivers/gpu/drm/openchrome/via_tmds.c
index 9834307d158a..7b936fda7c9f 100644
--- a/drivers/gpu/drm/openchrome/via_tmds.c
+++ b/drivers/gpu/drm/openchrome/via_tmds.c
@@ -236,7 +236,7 @@ static void via_tmds_prepare(struct drm_encoder *encoder)
struct via_encoder, base);
struct via_device *dev_priv = encoder->dev->dev_private;
- DRM_DEBUG_KMS("Entered %s.", __func__);
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
via_tmds_power(dev_priv, false);
via_tmds_io_pad_setting(dev_priv, enc->di_port, false);
@@ -250,7 +250,7 @@ static void via_tmds_commit(struct drm_encoder *encoder)
struct via_encoder, base);
struct via_device *dev_priv = encoder->dev->dev_private;
- DRM_DEBUG_KMS("Entered %s.", __func__);
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
via_tmds_power(dev_priv, true);
via_tmds_io_pad_setting(dev_priv, enc->di_port, true);
@@ -270,7 +270,7 @@ via_tmds_mode_set(struct drm_encoder *encoder,
struct via_crtc *iga = container_of(encoder->crtc,
struct via_crtc, base);
- DRM_DEBUG_KMS("Entered %s.", __func__);
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
via_tmds_init_reg(dev_priv);
via_tmds_sync_polarity(dev_priv, adjusted_mode->flags);
@@ -285,7 +285,7 @@ static void via_tmds_disable(struct drm_encoder *encoder)
struct via_encoder, base);
struct via_device *dev_priv = encoder->dev->dev_private;
- DRM_DEBUG_KMS("Entered %s.", __func__);
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
via_tmds_power(dev_priv, false);
via_tmds_io_pad_setting(dev_priv, enc->di_port, false);
commit b545ff8a0ebfc675a77d936d9953de3b2b2bda10
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Nov 2 22:32:45 2017 -0700
drm/openchrome: Remove unused variables from via_fp_probe
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_fp.c b/drivers/gpu/drm/openchrome/via_fp.c
index 84306da895cb..e88e779895d8 100644
--- a/drivers/gpu/drm/openchrome/via_fp.c
+++ b/drivers/gpu/drm/openchrome/via_fp.c
@@ -1446,11 +1446,9 @@ void via_fp_probe(struct drm_device *dev)
void via_lvds_init(struct drm_device *dev)
{
struct via_device *dev_priv = dev->dev_private;
- bool dual_channel = false, is_msb = false;
+ bool dual_channel = false;
struct via_connector *con;
struct via_encoder *enc;
- struct edid *edid;
- u8 reg_value;
if ((!(dev_priv->int_fp1_presence)) &&
(!(dev_priv->int_fp2_presence))) {
commit 17c2c1a41e015412345818fcf95888a92b915977
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Nov 2 22:18:59 2017 -0700
drm/openchrome: Fix I2C display detection regression
This affected analog, FP, and DVI (integrated TMDS transmitter).
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_analog.c b/drivers/gpu/drm/openchrome/via_analog.c
index 723939de8e07..960b8eea2618 100644
--- a/drivers/gpu/drm/openchrome/via_analog.c
+++ b/drivers/gpu/drm/openchrome/via_analog.c
@@ -223,6 +223,8 @@ via_analog_detect(struct drm_connector *connector, bool force)
DRM_DEBUG_KMS("Entered %s.\n", __func__);
+ drm_mode_connector_update_edid_property(connector, edid);
+
if (con->i2c_bus & VIA_I2C_BUS1) {
i2c_bus = via_find_ddc_bus(0x26);
} else {
diff --git a/drivers/gpu/drm/openchrome/via_fp.c b/drivers/gpu/drm/openchrome/via_fp.c
index 4b8918b17ab3..84306da895cb 100644
--- a/drivers/gpu/drm/openchrome/via_fp.c
+++ b/drivers/gpu/drm/openchrome/via_fp.c
@@ -922,13 +922,16 @@ const struct drm_encoder_funcs via_lvds_enc_funcs = {
static enum drm_connector_status
via_lcd_detect(struct drm_connector *connector, bool force)
{
- struct via_connector *con = container_of(connector, struct via_connector, base);
+ struct via_connector *con = container_of(connector,
+ struct via_connector, base);
enum drm_connector_status ret = connector_status_disconnected;
struct i2c_adapter *i2c_bus;
struct edid *edid = NULL;
DRM_DEBUG_KMS("Entered %s.\n", __func__);
+ drm_mode_connector_update_edid_property(connector, edid);
+
if (con->i2c_bus & VIA_I2C_BUS2) {
i2c_bus = via_find_ddc_bus(0x31);
} else if (con->i2c_bus & VIA_I2C_BUS3) {
@@ -940,7 +943,8 @@ via_lcd_detect(struct drm_connector *connector, bool force)
if (i2c_bus) {
edid = drm_get_edid(&con->base, i2c_bus);
if (edid) {
- drm_mode_connector_update_edid_property(&con->base, edid);
+ drm_mode_connector_update_edid_property(connector,
+ edid);
kfree(edid);
ret = connector_status_connected;
}
diff --git a/drivers/gpu/drm/openchrome/via_tmds.c b/drivers/gpu/drm/openchrome/via_tmds.c
index 970eb0f2aac1..9834307d158a 100644
--- a/drivers/gpu/drm/openchrome/via_tmds.c
+++ b/drivers/gpu/drm/openchrome/via_tmds.c
@@ -324,7 +324,7 @@ via_tmds_detect(struct drm_connector *connector, bool force)
}
if (i2c_bus) {
- edid = drm_get_edid(connector, i2c_bus);
+ edid = drm_get_edid(&con->base, i2c_bus);
if (edid) {
if ((connector->connector_type == DRM_MODE_CONNECTOR_DVIA) ^
(edid->input & DRM_EDID_INPUT_DIGITAL)) {
More information about the Openchrome-devel
mailing list