diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-12-30 15:20:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-12-30 15:20:18 +1000 |
| commit | 011e8c3239ed36b4720113cafc5539d22cbb76cd (patch) | |
| tree | 7e8fa444846bb79dfe7266f8414fdce48346162b | |
| parent | 2b534e90a1e31c7fc9536b512b72274cc3575f4c (diff) | |
| parent | c65fe9cbbfd61dbc12868f9ed4940c80fcb249e8 (diff) | |
Merge tag 'drm-intel-next-fixes-2021-12-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
drm/i915 fixes for the v5.17-rc1:
- Update FBC state even when not reallocating CFB
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87ee5vk54u.fsf@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_fbc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c index 8be01b93015f..160fd2bdafe5 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/drivers/gpu/drm/i915/display/intel_fbc.c @@ -1384,8 +1384,10 @@ static void __intel_fbc_enable(struct intel_atomic_state *state, if (fbc->state.plane != plane) return; - if (intel_fbc_is_ok(plane_state)) + if (intel_fbc_is_ok(plane_state)) { + intel_fbc_update_state(state, crtc, plane); return; + } __intel_fbc_disable(fbc); } |