diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-07-03 11:22:27 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-06 11:38:47 +0200 |
| commit | e72072b6d7a49ea09dd833c3bdaa300e86ab0671 (patch) | |
| tree | 63a900bbb3453b1efc34946e40d87ac66acc541c | |
| parent | dfc2066d8f8f2d87c1d8d00024478403c04d4e50 (diff) | |
drm/i915: Drop a spurious intel_pre_plane_update() call
Kill the extra intel_pre_plane_update() I accidentally added in
commit 852eb00dc44ea2b8896e2fa27c6a36a1f697ba5a
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Wed Jun 24 22:00:07 2015 +0300
drm/i915: Try to make sure cxsr is disabled around plane
enable/disable
This fixes a load of warnings from the frontbuffer tracking.
Testcase: igt/kms_frontbuffer_tracking/fbc-1p-rte
Tested-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Tested-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5ba35bb8e1a54..136b533718786 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13141,8 +13141,6 @@ static int __intel_set_mode(struct drm_atomic_state *state) if (!needs_modeset(crtc->state)) continue; - intel_pre_plane_update(intel_crtc); - any_ms = true; intel_pre_plane_update(intel_crtc); |