drivers/gpu/drm/openchrome/openchrome_analog.c | 6 +++--- drivers/gpu/drm/openchrome/openchrome_display.c | 2 +- drivers/gpu/drm/openchrome/openchrome_drv.h | 4 ++-- drivers/gpu/drm/openchrome/openchrome_fp.c | 4 ++-- drivers/gpu/drm/openchrome/openchrome_hdmi.c | 10 +++++----- drivers/gpu/drm/openchrome/openchrome_sii164.c | 4 ++-- drivers/gpu/drm/openchrome/openchrome_tmds.c | 6 +++--- drivers/gpu/drm/openchrome/openchrome_vt1632.c | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-)
New commits: commit 11caaac976273a6e2de473cf537ef3920d9b9244 Author: Kevin Brace <kevinbr...@gmx.com> Date: Wed Sep 5 07:28:08 2018 -0700 drm/openchrome: Version bumped to 3.0.86 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 341d8a04e385..73e5e933fb76 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 "20180716" +#define DRIVER_DATE "20180905" #define DRIVER_MAJOR 3 #define DRIVER_MINOR 0 -#define DRIVER_PATCHLEVEL 85 +#define DRIVER_PATCHLEVEL 86 #include <linux/module.h> #include "ttm/ttm_bo_api.h" commit e5cb134c0300aad35d69201b387bd38ea7b0ef15 Author: Kevin Brace <kevinbr...@gmx.com> Date: Wed Sep 5 07:05:37 2018 -0700 drm/openchrome: Drop _mode_ from drm_mode_connector_attach_encoder Due to commit cde4c44d8769c1be16074c097592c46c7d64092b. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/openchrome_analog.c b/drivers/gpu/drm/openchrome/openchrome_analog.c index 954f34bb47b8..3a023a0007bb 100644 --- a/drivers/gpu/drm/openchrome/openchrome_analog.c +++ b/drivers/gpu/drm/openchrome/openchrome_analog.c @@ -419,5 +419,5 @@ void via_analog_init(struct drm_device *dev) enc->base.possible_clones = 0; enc->di_port = VIA_DI_PORT_NONE; - drm_mode_connector_attach_encoder(&con->base, &enc->base); + drm_connector_attach_encoder(&con->base, &enc->base); } diff --git a/drivers/gpu/drm/openchrome/openchrome_fp.c b/drivers/gpu/drm/openchrome/openchrome_fp.c index 1b46a6d193b7..e62fef3ee97d 100644 --- a/drivers/gpu/drm/openchrome/openchrome_fp.c +++ b/drivers/gpu/drm/openchrome/openchrome_fp.c @@ -1362,7 +1362,7 @@ void via_fp_init(struct drm_device *dev) } /* Put it all together */ - drm_mode_connector_attach_encoder(&con->base, &enc->base); + drm_connector_attach_encoder(&con->base, &enc->base); exit: DRM_DEBUG_KMS("Exiting %s.\n", __func__); return; diff --git a/drivers/gpu/drm/openchrome/openchrome_hdmi.c b/drivers/gpu/drm/openchrome/openchrome_hdmi.c index 2c04576bd77e..e31a94f1b139 100644 --- a/drivers/gpu/drm/openchrome/openchrome_hdmi.c +++ b/drivers/gpu/drm/openchrome/openchrome_hdmi.c @@ -686,7 +686,7 @@ via_hdmi_init(struct drm_device *dev, u32 di_port) hdmi->base.interlace_allowed = true; break; } - drm_mode_connector_attach_encoder(&hdmi->base, &enc->base); + drm_connector_attach_encoder(&hdmi->base, &enc->base); /* Setup the DVI connector */ drm_connector_init(dev, &dvi->base, &via_hdmi_connector_funcs, @@ -707,5 +707,5 @@ via_hdmi_init(struct drm_device *dev, u32 di_port) dvi->base.interlace_allowed = true; break; } - drm_mode_connector_attach_encoder(&dvi->base, &enc->base); + drm_connector_attach_encoder(&dvi->base, &enc->base); } diff --git a/drivers/gpu/drm/openchrome/openchrome_sii164.c b/drivers/gpu/drm/openchrome/openchrome_sii164.c index 7d16a08fedf5..a3d4654f668f 100644 --- a/drivers/gpu/drm/openchrome/openchrome_sii164.c +++ b/drivers/gpu/drm/openchrome/openchrome_sii164.c @@ -548,7 +548,7 @@ void openchrome_sii164_init(struct drm_device *dev) con->i2c_bus = dev_priv->ext_tmds_i2c_bus; INIT_LIST_HEAD(&con->props); - drm_mode_connector_attach_encoder(&con->base, &enc->base); + drm_connector_attach_encoder(&con->base, &enc->base); exit: DRM_DEBUG_KMS("Exiting %s.\n", __func__); } diff --git a/drivers/gpu/drm/openchrome/openchrome_tmds.c b/drivers/gpu/drm/openchrome/openchrome_tmds.c index c0cb08731b2b..536ae09dcf62 100644 --- a/drivers/gpu/drm/openchrome/openchrome_tmds.c +++ b/drivers/gpu/drm/openchrome/openchrome_tmds.c @@ -508,7 +508,7 @@ void via_tmds_init(struct drm_device *dev) con->base.interlace_allowed = true; INIT_LIST_HEAD(&con->props); - drm_mode_connector_attach_encoder(&con->base, &enc->base); + drm_connector_attach_encoder(&con->base, &enc->base); exit: DRM_DEBUG_KMS("Exiting %s.\n", __func__); } diff --git a/drivers/gpu/drm/openchrome/openchrome_vt1632.c b/drivers/gpu/drm/openchrome/openchrome_vt1632.c index e168c4e2d002..de7c5951283f 100644 --- a/drivers/gpu/drm/openchrome/openchrome_vt1632.c +++ b/drivers/gpu/drm/openchrome/openchrome_vt1632.c @@ -568,7 +568,7 @@ void openchrome_vt1632_init(struct drm_device *dev) con->i2c_bus = dev_priv->ext_tmds_i2c_bus; INIT_LIST_HEAD(&con->props); - drm_mode_connector_attach_encoder(&con->base, &enc->base); + drm_connector_attach_encoder(&con->base, &enc->base); exit: DRM_DEBUG_KMS("Exiting %s.\n", __func__); } commit aa48166fdf1e092367a20c2e0f1b2eb2e2d7cdc4 Author: Kevin Brace <kevinbr...@gmx.com> Date: Wed Sep 5 06:53:24 2018 -0700 drm/openchrome: Drop _mode_ from update_edit_property() Due to commit c555f02371c338b06752577aebf738dbdb6907bd. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/openchrome_analog.c b/drivers/gpu/drm/openchrome/openchrome_analog.c index 45fca805023a..954f34bb47b8 100644 --- a/drivers/gpu/drm/openchrome/openchrome_analog.c +++ b/drivers/gpu/drm/openchrome/openchrome_analog.c @@ -293,7 +293,7 @@ static int via_analog_get_modes(struct drm_connector *connector) edid = drm_get_edid(&con->base, i2c_bus); if (edid) { if (!(edid->input & DRM_EDID_INPUT_DIGITAL)) { - drm_mode_connector_update_edid_property(connector, + drm_connector_update_edid_property(connector, edid); count = drm_add_edid_modes(connector, edid); } @@ -313,7 +313,7 @@ static int via_analog_get_modes(struct drm_connector *connector) edid = drm_get_edid(&con->base, i2c_bus); if (edid) { if (!(edid->input & DRM_EDID_INPUT_DIGITAL)) { - drm_mode_connector_update_edid_property(connector, + drm_connector_update_edid_property(connector, edid); count = drm_add_edid_modes(connector, edid); } diff --git a/drivers/gpu/drm/openchrome/openchrome_display.c b/drivers/gpu/drm/openchrome/openchrome_display.c index 5bf85a8971eb..28d3f86c87d9 100644 --- a/drivers/gpu/drm/openchrome/openchrome_display.c +++ b/drivers/gpu/drm/openchrome/openchrome_display.c @@ -311,7 +311,7 @@ via_connector_destroy(struct drm_connector *connector) drm_property_destroy(connector->dev, property); list_del(&con->props); - drm_mode_connector_update_edid_property(connector, NULL); + drm_connector_update_edid_property(connector, NULL); drm_connector_unregister(connector); drm_connector_cleanup(connector); } diff --git a/drivers/gpu/drm/openchrome/openchrome_fp.c b/drivers/gpu/drm/openchrome/openchrome_fp.c index a63600bd340d..1b46a6d193b7 100644 --- a/drivers/gpu/drm/openchrome/openchrome_fp.c +++ b/drivers/gpu/drm/openchrome/openchrome_fp.c @@ -962,7 +962,7 @@ via_fp_get_modes(struct drm_connector *connector) 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); + drm_connector_update_edid_property(connector, edid); count = drm_add_edid_modes(connector, edid); kfree(edid); DRM_DEBUG_KMS("FP EDID information was obtained.\n"); diff --git a/drivers/gpu/drm/openchrome/openchrome_hdmi.c b/drivers/gpu/drm/openchrome/openchrome_hdmi.c index 9f87856c5316..2c04576bd77e 100644 --- a/drivers/gpu/drm/openchrome/openchrome_hdmi.c +++ b/drivers/gpu/drm/openchrome/openchrome_hdmi.c @@ -489,7 +489,7 @@ via_hdmi_get_edid(struct drm_connector *connector) u8 *block; /* Clear out old EDID block */ - drm_mode_connector_update_edid_property(connector, edid); + drm_connector_update_edid_property(connector, edid); block = kmalloc(EDID_LENGTH, GFP_KERNEL); if (!block) @@ -554,7 +554,7 @@ via_hdmi_get_edid(struct drm_connector *connector) } } edid = (struct edid *) block; - drm_mode_connector_update_edid_property(connector, edid); + drm_connector_update_edid_property(connector, edid); return edid; carp: @@ -577,7 +577,7 @@ via_hdmi_detect(struct drm_connector *connector, bool force) struct edid *edid = NULL; if (VIA_IRQ_DP_HOT_UNPLUG == mm_c730) { - drm_mode_connector_update_edid_property(connector, NULL); + drm_connector_update_edid_property(connector, NULL); return ret; } diff --git a/drivers/gpu/drm/openchrome/openchrome_sii164.c b/drivers/gpu/drm/openchrome/openchrome_sii164.c index d3fbfc45a541..7d16a08fedf5 100644 --- a/drivers/gpu/drm/openchrome/openchrome_sii164.c +++ b/drivers/gpu/drm/openchrome/openchrome_sii164.c @@ -451,7 +451,7 @@ static int openchrome_sii164_get_modes(struct drm_connector *connector) 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); + drm_connector_update_edid_property(connector, edid); count = drm_add_edid_modes(connector, edid); DRM_DEBUG_KMS("DVI EDID information was obtained.\n"); } diff --git a/drivers/gpu/drm/openchrome/openchrome_tmds.c b/drivers/gpu/drm/openchrome/openchrome_tmds.c index 044b6a719e79..c0cb08731b2b 100644 --- a/drivers/gpu/drm/openchrome/openchrome_tmds.c +++ b/drivers/gpu/drm/openchrome/openchrome_tmds.c @@ -326,7 +326,7 @@ via_tmds_detect(struct drm_connector *connector, bool force) 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); + drm_connector_update_edid_property(connector, edid); ret = connector_status_connected; } @@ -366,7 +366,7 @@ static int via_tmds_get_modes(struct drm_connector *connector) if (i2c_bus) { edid = drm_get_edid(&con->base, i2c_bus); if (edid->input & DRM_EDID_INPUT_DIGITAL) { - drm_mode_connector_update_edid_property(connector, + drm_connector_update_edid_property(connector, edid); count = drm_add_edid_modes(connector, edid); DRM_DEBUG_KMS("DVI EDID information was obtained.\n"); diff --git a/drivers/gpu/drm/openchrome/openchrome_vt1632.c b/drivers/gpu/drm/openchrome/openchrome_vt1632.c index 8f1482387207..e168c4e2d002 100644 --- a/drivers/gpu/drm/openchrome/openchrome_vt1632.c +++ b/drivers/gpu/drm/openchrome/openchrome_vt1632.c @@ -471,7 +471,7 @@ static int openchrome_vt1632_get_modes(struct drm_connector *connector) 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); + drm_connector_update_edid_property(connector, edid); count = drm_add_edid_modes(connector, edid); DRM_DEBUG_KMS("DVI EDID information was obtained.\n"); } _______________________________________________ openchrome-devel mailing list openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel