OSDN Git Service

drm/i915/display: Handle lost primary_port across suspend
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 2 Jul 2019 14:09:50 +0000 (15:09 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 3 Jul 2019 09:09:58 +0000 (10:09 +0100)
commit8e9ecb3e1e3366559cd4ed5ab698c391f8236a37
tree7745a5fdeeb71b4702896107a80289dc39b380a9
parent315ca4c408ed3bcfe3a204fec9f5c397a98e97a0
drm/i915/display: Handle lost primary_port across suspend

icl-dsi is dying on suspend/resume at

RIP: 0010:icl_update_active_dpll+0x2c/0xa0 [i915]

which appears due to the loss of the time primary_port across suspend.
Protect against the potential NULL dereference by assuming
ICL_PORT_DPLL_DEFAULT unless the port is actively specified otherwise.

Fixes: 24a7bfe0c2d7 ("drm/i915: Keep the TypeC port mode fixed when the port is active")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190702140950.7069-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/display/intel_dpll_mgr.c