Merge tag 'v3.10-rc2' into drm-intel-next-queued

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_hdmi.c

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 93de5ff77912aaf9f46bdca2a5c3dc766addec39..2b727f0d201fd8e7e0f82e5efa5e77553fcff630 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -947,6 +947,9 @@ intel_hdmi_set_property(struct drm_connector *connector,
        }
 
        if (property == dev_priv->broadcast_rgb_property) {
+               bool old_auto = intel_hdmi->color_range_auto;
+               uint32_t old_range = intel_hdmi->color_range;
+
                switch (val) {
                case INTEL_BROADCAST_RGB_AUTO:
                        intel_hdmi->color_range_auto = true;
@@ -962,6 +965,11 @@ intel_hdmi_set_property(struct drm_connector *connector,
                default:
                        return -EINVAL;
                }
+
+               if (old_auto == intel_hdmi->color_range_auto &&
+                   old_range == intel_hdmi->color_range)
+                       return 0;
+
                goto done;
        }