Merge drm/drm-next into drm-intel-next-queued

[linux-block.git] / drivers / gpu / drm / i915 / display / intel_tv.c

diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c
index abc67207f2f3e2a1d965e5e10fdc42604fa30a7a..777032d9697b578c2c5e18aa0e19d6950f8719fd 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_tv.c
+++ b/drivers/gpu/drm/i915/display/intel_tv.c
@@ -1158,7 +1158,7 @@ intel_tv_get_config(struct intel_encoder *encoder,
 
        /* pixel counter doesn't work on i965gm TV output */
        if (IS_I965GM(dev_priv))
-               adjusted_mode->private_flags |=
+               pipe_config->mode_flags |=
                        I915_MODE_FLAG_USE_SCANLINE_COUNTER;
 }
 
@@ -1328,7 +1328,7 @@ intel_tv_compute_config(struct intel_encoder *encoder,
 
        /* pixel counter doesn't work on i965gm TV output */
        if (IS_I965GM(dev_priv))
-               adjusted_mode->private_flags |=
+               pipe_config->mode_flags |=
                        I915_MODE_FLAG_USE_SCANLINE_COUNTER;
 
        return 0;