@@ -1765,8 +1765,7 @@ static void write_i2c_retimer_setting(
1765
1765
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1766
1766
1767
1767
if (!i2c_success )
1768
- /* Write failure */
1769
- ASSERT (i2c_success );
1768
+ goto i2c_write_fail ;
1770
1769
1771
1770
/* Based on DP159 specs, APPLY_RX_TX_CHANGE bit in 0x0A
1772
1771
* needs to be set to 1 on every 0xA-0xC write.
@@ -1784,8 +1783,7 @@ static void write_i2c_retimer_setting(
1784
1783
pipe_ctx -> stream -> link -> ddc ,
1785
1784
slave_address , & offset , 1 , & value , 1 );
1786
1785
if (!i2c_success )
1787
- /* Write failure */
1788
- ASSERT (i2c_success );
1786
+ goto i2c_write_fail ;
1789
1787
}
1790
1788
1791
1789
buffer [0 ] = offset ;
@@ -1797,8 +1795,7 @@ static void write_i2c_retimer_setting(
1797
1795
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1798
1796
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1799
1797
if (!i2c_success )
1800
- /* Write failure */
1801
- ASSERT (i2c_success );
1798
+ goto i2c_write_fail ;
1802
1799
}
1803
1800
}
1804
1801
}
@@ -1818,8 +1815,7 @@ static void write_i2c_retimer_setting(
1818
1815
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1819
1816
1820
1817
if (!i2c_success )
1821
- /* Write failure */
1822
- ASSERT (i2c_success );
1818
+ goto i2c_write_fail ;
1823
1819
1824
1820
/* Based on DP159 specs, APPLY_RX_TX_CHANGE bit in 0x0A
1825
1821
* needs to be set to 1 on every 0xA-0xC write.
@@ -1837,8 +1833,7 @@ static void write_i2c_retimer_setting(
1837
1833
pipe_ctx -> stream -> link -> ddc ,
1838
1834
slave_address , & offset , 1 , & value , 1 );
1839
1835
if (!i2c_success )
1840
- /* Write failure */
1841
- ASSERT (i2c_success );
1836
+ goto i2c_write_fail ;
1842
1837
}
1843
1838
1844
1839
buffer [0 ] = offset ;
@@ -1850,8 +1845,7 @@ static void write_i2c_retimer_setting(
1850
1845
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1851
1846
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1852
1847
if (!i2c_success )
1853
- /* Write failure */
1854
- ASSERT (i2c_success );
1848
+ goto i2c_write_fail ;
1855
1849
}
1856
1850
}
1857
1851
}
@@ -1869,8 +1863,7 @@ static void write_i2c_retimer_setting(
1869
1863
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1870
1864
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1871
1865
if (!i2c_success )
1872
- /* Write failure */
1873
- ASSERT (i2c_success );
1866
+ goto i2c_write_fail ;
1874
1867
1875
1868
/* Write offset 0x00 to 0x23 */
1876
1869
buffer [0 ] = 0x00 ;
@@ -1881,8 +1874,7 @@ static void write_i2c_retimer_setting(
1881
1874
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1882
1875
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1883
1876
if (!i2c_success )
1884
- /* Write failure */
1885
- ASSERT (i2c_success );
1877
+ goto i2c_write_fail ;
1886
1878
1887
1879
/* Write offset 0xff to 0x00 */
1888
1880
buffer [0 ] = 0xff ;
@@ -1893,10 +1885,14 @@ static void write_i2c_retimer_setting(
1893
1885
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1894
1886
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1895
1887
if (!i2c_success )
1896
- /* Write failure */
1897
- ASSERT (i2c_success );
1888
+ goto i2c_write_fail ;
1898
1889
1899
1890
}
1891
+
1892
+ return ;
1893
+
1894
+ i2c_write_fail :
1895
+ DC_LOG_DEBUG ("Set retimer failed" );
1900
1896
}
1901
1897
1902
1898
static void write_i2c_default_retimer_setting (
@@ -1921,8 +1917,7 @@ static void write_i2c_default_retimer_setting(
1921
1917
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1922
1918
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1923
1919
if (!i2c_success )
1924
- /* Write failure */
1925
- ASSERT (i2c_success );
1920
+ goto i2c_write_fail ;
1926
1921
1927
1922
/* Write offset 0x0A to 0x17 */
1928
1923
buffer [0 ] = 0x0A ;
@@ -1933,8 +1928,7 @@ static void write_i2c_default_retimer_setting(
1933
1928
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1934
1929
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1935
1930
if (!i2c_success )
1936
- /* Write failure */
1937
- ASSERT (i2c_success );
1931
+ goto i2c_write_fail ;
1938
1932
1939
1933
/* Write offset 0x0B to 0xDA or 0xD8 */
1940
1934
buffer [0 ] = 0x0B ;
@@ -1945,8 +1939,7 @@ static void write_i2c_default_retimer_setting(
1945
1939
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1946
1940
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1947
1941
if (!i2c_success )
1948
- /* Write failure */
1949
- ASSERT (i2c_success );
1942
+ goto i2c_write_fail ;
1950
1943
1951
1944
/* Write offset 0x0A to 0x17 */
1952
1945
buffer [0 ] = 0x0A ;
@@ -1957,8 +1950,7 @@ static void write_i2c_default_retimer_setting(
1957
1950
offset = 0x%x, reg_val= 0x%x, i2c_success = %d\n" ,
1958
1951
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1959
1952
if (!i2c_success )
1960
- /* Write failure */
1961
- ASSERT (i2c_success );
1953
+ goto i2c_write_fail ;
1962
1954
1963
1955
/* Write offset 0x0C to 0x1D or 0x91 */
1964
1956
buffer [0 ] = 0x0C ;
@@ -1969,8 +1961,7 @@ static void write_i2c_default_retimer_setting(
1969
1961
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1970
1962
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1971
1963
if (!i2c_success )
1972
- /* Write failure */
1973
- ASSERT (i2c_success );
1964
+ goto i2c_write_fail ;
1974
1965
1975
1966
/* Write offset 0x0A to 0x17 */
1976
1967
buffer [0 ] = 0x0A ;
@@ -1981,8 +1972,7 @@ static void write_i2c_default_retimer_setting(
1981
1972
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1982
1973
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1983
1974
if (!i2c_success )
1984
- /* Write failure */
1985
- ASSERT (i2c_success );
1975
+ goto i2c_write_fail ;
1986
1976
1987
1977
1988
1978
if (is_vga_mode ) {
@@ -1997,8 +1987,7 @@ static void write_i2c_default_retimer_setting(
1997
1987
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1998
1988
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1999
1989
if (!i2c_success )
2000
- /* Write failure */
2001
- ASSERT (i2c_success );
1990
+ goto i2c_write_fail ;
2002
1991
2003
1992
/* Write offset 0x00 to 0x23 */
2004
1993
buffer [0 ] = 0x00 ;
@@ -2009,8 +1998,7 @@ static void write_i2c_default_retimer_setting(
2009
1998
offset = 0x%x, reg_val= 0x%x, i2c_success = %d\n" ,
2010
1999
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
2011
2000
if (!i2c_success )
2012
- /* Write failure */
2013
- ASSERT (i2c_success );
2001
+ goto i2c_write_fail ;
2014
2002
2015
2003
/* Write offset 0xff to 0x00 */
2016
2004
buffer [0 ] = 0xff ;
@@ -2021,9 +2009,13 @@ static void write_i2c_default_retimer_setting(
2021
2009
offset = 0x%x, reg_val= 0x%x, i2c_success = %d end here\n" ,
2022
2010
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
2023
2011
if (!i2c_success )
2024
- /* Write failure */
2025
- ASSERT (i2c_success );
2012
+ goto i2c_write_fail ;
2026
2013
}
2014
+
2015
+ return ;
2016
+
2017
+ i2c_write_fail :
2018
+ DC_LOG_DEBUG ("Set default retimer failed" );
2027
2019
}
2028
2020
2029
2021
static void write_i2c_redriver_setting (
@@ -2052,8 +2044,7 @@ static void write_i2c_redriver_setting(
2052
2044
slave_address , buffer [3 ], buffer [4 ], buffer [5 ], buffer [6 ], i2c_success ?1 :0 );
2053
2045
2054
2046
if (!i2c_success )
2055
- /* Write failure */
2056
- ASSERT (i2c_success );
2047
+ DC_LOG_DEBUG ("Set redriver failed" );
2057
2048
}
2058
2049
2059
2050
static void disable_link (struct dc_link * link , enum signal_type signal )
0 commit comments