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

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

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 2f54dc3dc5df4793c0f1e3507c03ada3178d3db3..78f0631b1c43ae33cf5259ea1672efdc0d5af484 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1958,6 +1958,9 @@ intel_sdvo_set_property(struct drm_connector *connector,
        }
 
        if (property == dev_priv->broadcast_rgb_property) {
+               bool old_auto = intel_sdvo->color_range_auto;
+               uint32_t old_range = intel_sdvo->color_range;
+
                switch (val) {
                case INTEL_BROADCAST_RGB_AUTO:
                        intel_sdvo->color_range_auto = true;
@@ -1975,6 +1978,11 @@ intel_sdvo_set_property(struct drm_connector *connector,
                default:
                        return -EINVAL;
                }
+
+               if (old_auto == intel_sdvo->color_range_auto &&
+                   old_range == intel_sdvo->color_range)
+                       return 0;
+
                goto done;
        }