diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-16 14:18:30 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-16 14:18:30 +0200 |
| commit | c19941218c9a1cae578dfbf30190b13b9cdb9aa8 (patch) | |
| tree | 0014d2ac89e6209c565f5a8fc53abd8dce13e63e /drivers/gpu/drm/i915/intel_fbc.c | |
| parent | drm/i915/ilk: Don't disable SSC source if it's in use (diff) | |
| parent | Merge tag 'topic/drm-misc-2016-06-15' of git://anongit.freedesktop.org/drm-in... (diff) | |
| download | linux-c19941218c9a1cae578dfbf30190b13b9cdb9aa8.tar.xz linux-c19941218c9a1cae578dfbf30190b13b9cdb9aa8.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge drm-next to get at the nonblocking atomic helpers, needed to
merge the i915 conversion.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fbc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c index 0dea5fbcd8aa..45ee07b888a0 100644 --- a/drivers/gpu/drm/i915/intel_fbc.c +++ b/drivers/gpu/drm/i915/intel_fbc.c @@ -374,8 +374,9 @@ static void intel_fbc_hw_deactivate(struct drm_i915_private *dev_priv) * @dev_priv: i915 device instance * * This function is used to verify the current state of FBC. + * * FIXME: This should be tracked in the plane config eventually - * instead of queried at runtime for most callers. + * instead of queried at runtime for most callers. */ bool intel_fbc_is_active(struct drm_i915_private *dev_priv) { |