aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/drm2/i915/intel_hdmi.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/drm2/i915/intel_hdmi.c')
-rw-r--r--sys/dev/drm2/i915/intel_hdmi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/drm2/i915/intel_hdmi.c b/sys/dev/drm2/i915/intel_hdmi.c
index 3f0572f260c7..c009b03e01b3 100644
--- a/sys/dev/drm2/i915/intel_hdmi.c
+++ b/sys/dev/drm2/i915/intel_hdmi.c
@@ -446,7 +446,7 @@ static int intel_hdmi_mode_valid(struct drm_connector *connector,
}
static bool intel_hdmi_mode_fixup(struct drm_encoder *encoder,
- struct drm_display_mode *mode,
+ const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
@@ -473,7 +473,6 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
drm_detect_hdmi_monitor(edid);
intel_hdmi->has_audio = drm_detect_monitor_audio(edid);
}
- connector->display_info.raw_edid = NULL;
free(edid, DRM_MEM_KMS);
} else {
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] got no edid, ddc port %d\n",
@@ -519,7 +518,6 @@ intel_hdmi_detect_audio(struct drm_connector *connector)
if (edid->input & DRM_EDID_INPUT_DIGITAL)
has_audio = drm_detect_monitor_audio(edid);
- connector->display_info.raw_edid = NULL;
free(edid, DRM_MEM_KMS);
}
@@ -535,7 +533,7 @@ intel_hdmi_set_property(struct drm_connector *connector,
struct drm_i915_private *dev_priv = connector->dev->dev_private;
int ret;
- ret = drm_connector_property_set_value(connector, property, val);
+ ret = drm_object_property_set_value(&connector->base, property, val);
if (ret)
return ret;