diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2016-01-19 11:35:52 -0200 |
|---|---|---|
| committer | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2016-01-29 18:17:36 -0200 |
| commit | 49227c4ae3d2c8ccb6c71bfb5dfac80ad8c73021 (patch) | |
| tree | 193dfe7617aac3b3e2829e5272a607e6dd39130b /drivers/gpu/drm/i915/intel_display.c | |
| parent | 58f9c0bc557588fbe3f54c521dd8c6f20598e64e (diff) | |
| download | linux-stable-49227c4ae3d2c8ccb6c71bfb5dfac80ad8c73021.tar.gz linux-stable-49227c4ae3d2c8ccb6c71bfb5dfac80ad8c73021.tar.bz2 linux-stable-49227c4ae3d2c8ccb6c71bfb5dfac80ad8c73021.zip | |
drm/i915/fbc: make FBC work with fastboot
Move intel_fbc_enable to a place where it is called regardless of the
"modeset" variable, and make sure intel_fbc_enable can be called
multiple times without intel_fbc_disable being called.
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453210558-7875-20-git-send-email-paulo.r.zanoni@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 69ab07758c7e..a832ff1c8e32 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13558,7 +13558,6 @@ static int intel_atomic_commit(struct drm_device *dev, if (modeset && crtc->state->active) { update_scanline_offset(to_intel_crtc(crtc)); dev_priv->display.crtc_enable(crtc); - intel_fbc_enable(intel_crtc); } if (update_pipe) { @@ -13571,6 +13570,9 @@ static int intel_atomic_commit(struct drm_device *dev, if (!modeset) intel_pre_plane_update(intel_crtc); + if (crtc->state->active && intel_crtc->atomic.update_fbc) + intel_fbc_enable(intel_crtc); + if (crtc->state->active && (crtc->state->planes_changed || update_pipe)) drm_atomic_helper_commit_planes_on_crtc(crtc_state); |