]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915: fix regression leading to display audio probe failure on GLK
authorKai Vehmanen <kai.vehmanen@linux.intel.com>
Tue, 1 Sep 2020 15:10:36 +0000 (18:10 +0300)
committerJani Nikula <jani.nikula@intel.com>
Tue, 8 Sep 2020 11:38:46 +0000 (14:38 +0300)
commit0c4c801b31f89cfc1b97207abbab687f43d8e258
treefeaa03b6ade1f48908b7079208e621f7febcb875
parentf4d51dffc6c01a9e94650d95ce0104964f8ae822
drm/i915: fix regression leading to display audio probe failure on GLK

In commit 4f0b4352bd26 ("drm/i915: Extract cdclk requirements checking
to separate function") the order of force_min_cdclk_changed check and
intel_modeset_checks(), was reversed. This broke the mechanism to
immediately force a new CDCLK minimum, and lead to driver probe
errors for display audio on GLK platform with 5.9-rc1 kernel. Fix
the issue by moving intel_modeset_checks() call later.

[vsyrjala: It also broke the ability of planes to bump up the cdclk
and thus could lead to underruns when eg. flipping from 32bpp to
64bpp framebuffer. To be clear, we still compute the new cdclk
correctly but fail to actually program it to the hardware due to
intel_set_cdclk_{pre,post}_plane_update() not getting called on
account of state->modeset==false.]

Fixes: 4f0b4352bd26 ("drm/i915: Extract cdclk requirements checking to separate function")
BugLink: https://github.com/thesofproject/linux/issues/2410
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200901151036.1312357-1-kai.vehmanen@linux.intel.com
(cherry picked from commit cf696856bc54a31f78e6538b84c8f7a006b6108b)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_display.c