diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-05-12 22:17:24 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-04 10:41:25 -0700 |
| commit | 3f43c48d333777e815ae68d66396cb6dfbc2dd79 (patch) | |
| tree | e5e4ac284969b45f912c5d025c7016914c2455bb /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | 4bce2da393dbbc6650a1d62683ef60e03594b4c7 (diff) | |
| download | kernel_samsung_smdk4412-3f43c48d333777e815ae68d66396cb6dfbc2dd79.zip kernel_samsung_smdk4412-3f43c48d333777e815ae68d66396cb6dfbc2dd79.tar.gz kernel_samsung_smdk4412-3f43c48d333777e815ae68d66396cb6dfbc2dd79.tar.bz2 | |
drm/i915: Share the common force-audio property between connectors
Make the audio property creation routine common and share the single
property between the connectors.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 655bbd9..aa0a8e8 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -45,7 +45,6 @@ struct intel_hdmi { bool has_hdmi_sink; bool has_audio; int force_audio; - struct drm_property *force_audio_property; }; static struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder) @@ -287,7 +286,7 @@ intel_hdmi_set_property(struct drm_connector *connector, if (ret) return ret; - if (property == intel_hdmi->force_audio_property) { + if (property == dev_priv->force_audio_property) { int i = val; bool has_audio; @@ -365,16 +364,7 @@ static const struct drm_encoder_funcs intel_hdmi_enc_funcs = { static void intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector) { - struct drm_device *dev = connector->dev; - - intel_hdmi->force_audio_property = - drm_property_create(dev, DRM_MODE_PROP_RANGE, "force_audio", 2); - if (intel_hdmi->force_audio_property) { - intel_hdmi->force_audio_property->values[0] = -1; - intel_hdmi->force_audio_property->values[1] = 1; - drm_connector_attach_property(connector, intel_hdmi->force_audio_property, 0); - } - + intel_attach_force_audio_property(connector); intel_attach_broadcast_rgb_property(connector); } |