Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: Get rid of crtc->config in chv_data_lane_soft_reset

Fixing chv_set_phy_signal_level() still requires too many levels of
indirection to pass crtc_state along, but chv_data_lane_soft_reset()
already has a crtc_state we can use.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181004094604.2646-13-maarten.lankhorst@linux.intel.com

+2 -2
+2 -2
drivers/gpu/drm/i915/intel_dpio_phy.c
··· 748 748 val |= DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET; 749 749 vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW0(ch), val); 750 750 751 - if (crtc->config->lane_count > 2) { 751 + if (crtc_state->lane_count > 2) { 752 752 val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW0(ch)); 753 753 if (reset) 754 754 val &= ~(DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET); ··· 765 765 val |= DPIO_PCS_CLK_SOFT_RESET; 766 766 vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW1(ch), val); 767 767 768 - if (crtc->config->lane_count > 2) { 768 + if (crtc_state->lane_count > 2) { 769 769 val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW1(ch)); 770 770 val |= CHV_PCS_REQ_SOFTRESET_EN; 771 771 if (reset)