]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: disable_shared_pll doesn't work on pre-gen5
authorJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 3 Aug 2015 20:09:11 +0000 (13:09 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 5 Aug 2015 09:20:09 +0000 (11:20 +0200)
commitccae35f95cb08e096f12599f7982c24a3d295ee9
treee5b9cf9cf538f8f91841b2c430f21cd97f4cd796
parenta39684f7e37dba683bd5695ea991a59faca417b5
drm/i915: disable_shared_pll doesn't work on pre-gen5

Looks like

commit a6bd4e74986245e86051dbe176254a7e3a0be724
Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date:   Mon Jun 15 12:33:53 2015 +0200
    drm/i915: Update less state during modeset.

introduced the unconditional calling of disable_shared_dpll, but didn't
fix up pre-gen5 to avoid the BUG_ON at the top of the function.

So change the BUG_ON into a gen check (alternately we could move the
BUG_ON until later, since we shouldn't have a pll struct here either,
but this seems clearer to read).

This fixes a crash on load on my x200s platform.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c