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)
commit80aa93128653c5f2502053c0d9740b336d975667
treee5b9cf9cf538f8f91841b2c430f21cd97f4cd796
parent245d96670d2655f70f4445d5247f26afbe705c84
drm/i915: disable_shared_pll doesn't work on pre-gen5

Looks like

commit eddfcbcdc27fbecb33bff098967bbdd7ca75bfa6
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