drivers/gpu/drm/openchrome/via_analog.c | 3 ++-
drivers/gpu/drm/openchrome/via_fp.c | 2 +-
drivers/gpu/drm/openchrome/via_hdmi.c | 7 ++++---
drivers/gpu/drm/openchrome/via_ioc32.c | 2 +-
drivers/gpu/drm/openchrome/via_tmds.c | 3 ++-
5 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 95ed0b5be7d610cd142384ae7b260110fd3f6297
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Aug 4 16:02:14 2017 -0700
Update drm_edid_block_valid input parameter
Commit 6ba2bd3da7d3f9af3db83f704ca055943fd9ee40 made this change,
so our side needs to change as well.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_hdmi.c
b/drivers/gpu/drm/openchrome/via_hdmi.c
index 8ca071b16f4d..646927063f94 100644
--- a/drivers/gpu/drm/openchrome/via_hdmi.c
+++ b/drivers/gpu/drm/openchrome/via_hdmi.c
@@ -498,7 +498,7 @@ via_hdmi_get_edid(struct drm_connector *connector)
if (!via_ddc_read_bytes_by_hdmi(dev_priv, 0, block))
goto out;
- if (drm_edid_block_valid(block, 0, print_bad_edid))
+ if (drm_edid_block_valid(block, 0, print_bad_edid, NULL))
break;
if (i == 0 && !memchr_inv(block, 0, EDID_LENGTH)) {
@@ -526,7 +526,7 @@ via_hdmi_get_edid(struct drm_connector *connector)
if (!via_ddc_read_bytes_by_hdmi(dev_priv,
offset, new))
goto out;
- if (drm_edid_block_valid(new, j,
print_bad_edid)) {
+ if (drm_edid_block_valid(new, j,
print_bad_edid, NULL)) {
valid_extensions++;
break;
}
commit c8f6342528fcfbb00b33319ee42b440df5d2bb37
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Aug 4 15:55:15 2017 -0700
Update drm_encoder_init() input parameter
Commit 13a3d91f17a5f7ed2acd275d18b6acfdb131fb15 made this change,
so our side needs to change as well.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_analog.c
b/drivers/gpu/drm/openchrome/via_analog.c
index 1c513bdfe6fe..7f4d838774f4 100644
--- a/drivers/gpu/drm/openchrome/via_analog.c
+++ b/drivers/gpu/drm/openchrome/via_analog.c
@@ -270,7 +270,8 @@ via_analog_init(struct drm_device *dev)
con->base.interlace_allowed = true;
/* Setup the encoders and attach them */
- drm_encoder_init(dev, &enc->base, &via_dac_enc_funcs,
DRM_MODE_ENCODER_DAC);
+ drm_encoder_init(dev, &enc->base, &via_dac_enc_funcs,
+ DRM_MODE_ENCODER_DAC, NULL);
drm_encoder_helper_add(&enc->base, &via_dac_enc_helper_funcs);
enc->base.possible_crtcs = BIT(0);
diff --git a/drivers/gpu/drm/openchrome/via_fp.c
b/drivers/gpu/drm/openchrome/via_fp.c
index 7bfc56e73820..04928d67c43d 100644
--- a/drivers/gpu/drm/openchrome/via_fp.c
+++ b/drivers/gpu/drm/openchrome/via_fp.c
@@ -1180,7 +1180,7 @@ via_lvds_init(struct drm_device *dev)
/* Now setup the encoder */
drm_encoder_init(dev, &enc->base, &via_lvds_enc_funcs,
- DRM_MODE_ENCODER_LVDS);
+ DRM_MODE_ENCODER_LVDS, NULL);
drm_encoder_helper_add(&enc->base, &via_lvds_helper_funcs);
enc->base.possible_crtcs = BIT(1);
diff --git a/drivers/gpu/drm/openchrome/via_hdmi.c
b/drivers/gpu/drm/openchrome/via_hdmi.c
index bde11475a7c3..8ca071b16f4d 100644
--- a/drivers/gpu/drm/openchrome/via_hdmi.c
+++ b/drivers/gpu/drm/openchrome/via_hdmi.c
@@ -659,7 +659,8 @@ via_hdmi_init(struct drm_device *dev, u32 di_port)
dvi = &enc->cons[1];
/* Setup the encoders and attach them */
- drm_encoder_init(dev, &enc->base, &via_hdmi_enc_funcs,
DRM_MODE_ENCODER_TMDS);
+ drm_encoder_init(dev, &enc->base, &via_hdmi_enc_funcs,
+ DRM_MODE_ENCODER_TMDS, NULL);
drm_encoder_helper_add(&enc->base, &via_hdmi_enc_helper_funcs);
enc->base.possible_crtcs = BIT(1) | BIT(0);
diff --git a/drivers/gpu/drm/openchrome/via_tmds.c
b/drivers/gpu/drm/openchrome/via_tmds.c
index 7fbf9275e766..c043e4c957fa 100644
--- a/drivers/gpu/drm/openchrome/via_tmds.c
+++ b/drivers/gpu/drm/openchrome/via_tmds.c
@@ -229,7 +229,8 @@ via_tmds_init(struct drm_device *dev)
}
/* Setup the encoders and attach them */
- drm_encoder_init(dev, &enc->base, &via_tmds_enc_funcs,
DRM_MODE_ENCODER_DAC);
+ drm_encoder_init(dev, &enc->base, &via_tmds_enc_funcs,
+ DRM_MODE_ENCODER_DAC, NULL);
drm_encoder_helper_add(&enc->base, &via_tmds_enc_helper_funcs);
enc->base.possible_crtcs = BIT(1) | BIT(0);
commit d22d4063a8d4126db261c521a546178229c1b837
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Aug 4 15:46:29 2017 -0700
Remove lazy parameter from ttm_bo_wait
Commit 8aa6d4fc5f470c5e4363c705bbae96ccb1b033b0 made this change,
so our side needs to change as well.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_ioc32.c
b/drivers/gpu/drm/openchrome/via_ioc32.c
index d37e99b080b1..bfda82eb5b7f 100644
--- a/drivers/gpu/drm/openchrome/via_ioc32.c
+++ b/drivers/gpu/drm/openchrome/via_ioc32.c
@@ -152,7 +152,7 @@ via_gem_wait(struct drm_device *dev, void *data, struct
drm_file *file_priv)
if (unlikely(ret != 0))
return ret;
- ret = ttm_bo_wait(bo, true, true, no_wait);
+ ret = ttm_bo_wait(bo, true, no_wait);
ttm_bo_unreserve(bo);
mutex_lock(&dev->struct_mutex);
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
