In future patches, we intend to introduce a generic interface to the
various get_edid() functions. All the other get_edid() functions accept
two arguments: a struct drm_connector *, and a struct i2c_adapter *. So,
introduce a second dummy variable in intel_sdvo_get_edid().
Cc: Chris Wilson <ch...@chris-wilson.co.uk>
Cc: Andreas Heider <andr...@meetr.de>
Cc: Seth Forshee <seth.fors...@canonical.com>
Signed-off-by: Ramkumar Ramachandra <artag...@gmail.com>
---
drivers/gpu/drm/i915/intel_sdvo.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c
b/drivers/gpu/drm/i915/intel_sdvo.c
index a583e8f..beb40e5 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1612,7 +1612,8 @@ intel_sdvo_multifunc_encoder(struct intel_sdvo
*intel_sdvo)
}
static struct edid *
-intel_sdvo_get_edid(struct drm_connector *connector)
+intel_sdvo_get_edid(struct drm_connector *connector,
+ struct i2c_adapter __maybe_unused *dummy)
{
struct intel_sdvo *sdvo = intel_attached_sdvo(connector);
return drm_get_edid(connector, &sdvo->ddc);
@@ -1636,7 +1637,7 @@ intel_sdvo_tmds_sink_detect(struct drm_connector
*connector)
enum drm_connector_status status;
struct edid *edid;
- edid = intel_sdvo_get_edid(connector);
+ edid = intel_sdvo_get_edid(connector, NULL);
if (edid == NULL && intel_sdvo_multifunc_encoder(intel_sdvo)) {
u8 ddc, saved_ddc = intel_sdvo->ddc_bus;
@@ -1647,7 +1648,7 @@ intel_sdvo_tmds_sink_detect(struct drm_connector
*connector)
*/
for (ddc = intel_sdvo->ddc_bus >> 1; ddc > 1; ddc >>= 1) {
intel_sdvo->ddc_bus = ddc;
- edid = intel_sdvo_get_edid(connector);
+ edid = intel_sdvo_get_edid(connector, NULL);
if (edid)
break;
}
@@ -1740,7 +1741,7 @@ intel_sdvo_detect(struct drm_connector *connector, bool
force)
struct edid *edid;
/* if we have an edid check it matches the connection */
- edid = intel_sdvo_get_edid(connector);
+ edid = intel_sdvo_get_edid(connector, NULL);
if (edid == NULL)
edid = intel_sdvo_get_analog_edid(connector);
if (edid != NULL) {
@@ -1777,7 +1778,7 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector
*connector)
connector->base.id, drm_get_connector_name(connector));
/* set the bus switch and get the modes */
- edid = intel_sdvo_get_edid(connector);
+ edid = intel_sdvo_get_edid(connector, NULL);
/*
* Mac mini hack. On this device, the DVI-I connector shares one DDC
@@ -2022,7 +2023,7 @@ static bool intel_sdvo_detect_hdmi_audio(struct
drm_connector *connector)
if (!intel_sdvo->is_hdmi)
return false;
- edid = intel_sdvo_get_edid(connector);
+ edid = intel_sdvo_get_edid(connector, NULL);
if (edid != NULL && edid->input & DRM_EDID_INPUT_DIGITAL)
has_audio = drm_detect_monitor_audio(edid);
kfree(edid);
--
1.8.5.2.229.g4448466
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
