openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: use for_each_port_masked in bxt phy init for clarity 

Make it easier to see which ports are configured for each phy. No
functional changes.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1459496681-398-1-git-send-email-jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2016-04-01 10:44:41 +03:00 committed by Imre Deak
parent b61e79967a
commit 11b538cd6d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/intel_ddi.c
View File

@ -1726,7 +1726,7 @@ static void broxton_phy_init(struct drm_i915_private *dev_priv,
enum dpio_phy phy) enum dpio_phy phy)
{ {
enum port port; enum port port;
uint32_t val; u32 ports, val;
val = I915_READ(BXT_P_CR_GT_DISP_PWRON); val = I915_READ(BXT_P_CR_GT_DISP_PWRON);
val |= GT_DISPLAY_POWER_ON(phy); val |= GT_DISPLAY_POWER_ON(phy);
@ -1745,8 +1745,12 @@ static void broxton_phy_init(struct drm_i915_private *dev_priv,
DRM_ERROR("timeout during PHY%d power on\n", phy); DRM_ERROR("timeout during PHY%d power on\n", phy);
} }
for (port = (phy == DPIO_PHY0 ? PORT_B : PORT_A); if (phy == DPIO_PHY0)
port <= (phy == DPIO_PHY0 ? PORT_C : PORT_A); port++) { ports = BIT(PORT_B) | BIT(PORT_C);
else
ports = BIT(PORT_A);
for_each_port_masked(port, ports) {
int lane; int lane;
for (lane = 0; lane < 4; lane++) { for (lane = 0; lane < 4; lane++) {