]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: move shared_dpll into the pipe config
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 7 Jun 2013 21:10:32 +0000 (23:10 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 10 Jun 2013 17:48:40 +0000 (19:48 +0200)
commit2298e07d5d6a9de2e0ca4d459244271b039f02d9
tree13168e92612e637ca89f8279fd367758230ca724
parentce99f68e55b9dd40eed63261afc2e47dbf2906b4
drm/i915: move shared_dpll into the pipe config

With the big sed-job prep work done this is now really simple. With
the exception that we only assign the right shared dpll id in the
->mode_set callback but also depend upon the old one still being
around.

Until that mess is fixed up we need to jump through a few hoops to
keep the old value save.

v2: Kill the funny whitespace spotted by Chris.

v3: Move the shared_dpll pipe config fixup into this patch as noticed
by Ville. Also unconditionally set the shared_dpll with the current
one, since otherwise we won't handle direct pch port -> cpu edp
transitions correctly.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h