]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
drm/i915: Release connector iterator on a digital port conflict.
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thu, 15 Feb 2018 09:14:25 +0000 (10:14 +0100)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Mon, 19 Feb 2018 09:36:14 +0000 (10:36 +0100)
commitbd67a8c15a3b59ea9b21aee31e867c728661977d
tree7eee28e34166d7d9cffdc10f038ec3d6313bd0b6
parentd081e021fd62497412f8c0c16ea6644cc7d4a154
drm/i915: Release connector iterator on a digital port conflict.

Hitting the failure path through check_digital_port_conflicts triggers:

================================================
WARNING: lock held when returning to user space!
4.16.0-rc1-CI-kasan_1+ #1 Tainted: G        W
------------------------------------------------
kms_3d/1439 is leaving the kernel with locks still held!
1 lock held by kms_3d/1439:
 #0:  (drm_connector_list_iter){.+.+}, at: [<000000003745d183>] intel_atomic_check+0x1d9d/0x3ff0 [i915]

Rearrange the code to have a single exit path through the unlock.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180215091425.42364-1-maarten.lankhorst@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/intel_display.c