@@ -1733,8 +1733,7 @@ static void write_i2c_retimer_setting(
1733
1733
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1734
1734
1735
1735
if (!i2c_success )
1736
- /* Write failure */
1737
- ASSERT (i2c_success );
1736
+ goto i2c_write_fail ;
1738
1737
1739
1738
/* Based on DP159 specs, APPLY_RX_TX_CHANGE bit in 0x0A
1740
1739
* needs to be set to 1 on every 0xA-0xC write.
@@ -1752,8 +1751,7 @@ static void write_i2c_retimer_setting(
1752
1751
pipe_ctx -> stream -> link -> ddc ,
1753
1752
slave_address , & offset , 1 , & value , 1 );
1754
1753
if (!i2c_success )
1755
- /* Write failure */
1756
- ASSERT (i2c_success );
1754
+ goto i2c_write_fail ;
1757
1755
}
1758
1756
1759
1757
buffer [0 ] = offset ;
@@ -1765,8 +1763,7 @@ static void write_i2c_retimer_setting(
1765
1763
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1766
1764
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1767
1765
if (!i2c_success )
1768
- /* Write failure */
1769
- ASSERT (i2c_success );
1766
+ goto i2c_write_fail ;
1770
1767
}
1771
1768
}
1772
1769
}
@@ -1786,8 +1783,7 @@ static void write_i2c_retimer_setting(
1786
1783
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1787
1784
1788
1785
if (!i2c_success )
1789
- /* Write failure */
1790
- ASSERT (i2c_success );
1786
+ goto i2c_write_fail ;
1791
1787
1792
1788
/* Based on DP159 specs, APPLY_RX_TX_CHANGE bit in 0x0A
1793
1789
* needs to be set to 1 on every 0xA-0xC write.
@@ -1805,8 +1801,7 @@ static void write_i2c_retimer_setting(
1805
1801
pipe_ctx -> stream -> link -> ddc ,
1806
1802
slave_address , & offset , 1 , & value , 1 );
1807
1803
if (!i2c_success )
1808
- /* Write failure */
1809
- ASSERT (i2c_success );
1804
+ goto i2c_write_fail ;
1810
1805
}
1811
1806
1812
1807
buffer [0 ] = offset ;
@@ -1818,8 +1813,7 @@ static void write_i2c_retimer_setting(
1818
1813
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1819
1814
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1820
1815
if (!i2c_success )
1821
- /* Write failure */
1822
- ASSERT (i2c_success );
1816
+ goto i2c_write_fail ;
1823
1817
}
1824
1818
}
1825
1819
}
@@ -1837,8 +1831,7 @@ static void write_i2c_retimer_setting(
1837
1831
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1838
1832
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1839
1833
if (!i2c_success )
1840
- /* Write failure */
1841
- ASSERT (i2c_success );
1834
+ goto i2c_write_fail ;
1842
1835
1843
1836
/* Write offset 0x00 to 0x23 */
1844
1837
buffer [0 ] = 0x00 ;
@@ -1849,8 +1842,7 @@ static void write_i2c_retimer_setting(
1849
1842
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1850
1843
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1851
1844
if (!i2c_success )
1852
- /* Write failure */
1853
- ASSERT (i2c_success );
1845
+ goto i2c_write_fail ;
1854
1846
1855
1847
/* Write offset 0xff to 0x00 */
1856
1848
buffer [0 ] = 0xff ;
@@ -1861,10 +1853,14 @@ static void write_i2c_retimer_setting(
1861
1853
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1862
1854
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1863
1855
if (!i2c_success )
1864
- /* Write failure */
1865
- ASSERT (i2c_success );
1856
+ goto i2c_write_fail ;
1866
1857
1867
1858
}
1859
+
1860
+ return ;
1861
+
1862
+ i2c_write_fail :
1863
+ DC_LOG_DEBUG ("Set retimer failed" );
1868
1864
}
1869
1865
1870
1866
static void write_i2c_default_retimer_setting (
@@ -1889,8 +1885,7 @@ static void write_i2c_default_retimer_setting(
1889
1885
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1890
1886
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1891
1887
if (!i2c_success )
1892
- /* Write failure */
1893
- ASSERT (i2c_success );
1888
+ goto i2c_write_fail ;
1894
1889
1895
1890
/* Write offset 0x0A to 0x17 */
1896
1891
buffer [0 ] = 0x0A ;
@@ -1901,8 +1896,7 @@ static void write_i2c_default_retimer_setting(
1901
1896
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1902
1897
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1903
1898
if (!i2c_success )
1904
- /* Write failure */
1905
- ASSERT (i2c_success );
1899
+ goto i2c_write_fail ;
1906
1900
1907
1901
/* Write offset 0x0B to 0xDA or 0xD8 */
1908
1902
buffer [0 ] = 0x0B ;
@@ -1913,8 +1907,7 @@ static void write_i2c_default_retimer_setting(
1913
1907
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1914
1908
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1915
1909
if (!i2c_success )
1916
- /* Write failure */
1917
- ASSERT (i2c_success );
1910
+ goto i2c_write_fail ;
1918
1911
1919
1912
/* Write offset 0x0A to 0x17 */
1920
1913
buffer [0 ] = 0x0A ;
@@ -1925,8 +1918,7 @@ static void write_i2c_default_retimer_setting(
1925
1918
offset = 0x%x, reg_val= 0x%x, i2c_success = %d\n" ,
1926
1919
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1927
1920
if (!i2c_success )
1928
- /* Write failure */
1929
- ASSERT (i2c_success );
1921
+ goto i2c_write_fail ;
1930
1922
1931
1923
/* Write offset 0x0C to 0x1D or 0x91 */
1932
1924
buffer [0 ] = 0x0C ;
@@ -1937,8 +1929,7 @@ static void write_i2c_default_retimer_setting(
1937
1929
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1938
1930
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1939
1931
if (!i2c_success )
1940
- /* Write failure */
1941
- ASSERT (i2c_success );
1932
+ goto i2c_write_fail ;
1942
1933
1943
1934
/* Write offset 0x0A to 0x17 */
1944
1935
buffer [0 ] = 0x0A ;
@@ -1949,8 +1940,7 @@ static void write_i2c_default_retimer_setting(
1949
1940
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1950
1941
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1951
1942
if (!i2c_success )
1952
- /* Write failure */
1953
- ASSERT (i2c_success );
1943
+ goto i2c_write_fail ;
1954
1944
1955
1945
1956
1946
if (is_vga_mode ) {
@@ -1965,8 +1955,7 @@ static void write_i2c_default_retimer_setting(
1965
1955
offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n" ,
1966
1956
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1967
1957
if (!i2c_success )
1968
- /* Write failure */
1969
- ASSERT (i2c_success );
1958
+ goto i2c_write_fail ;
1970
1959
1971
1960
/* Write offset 0x00 to 0x23 */
1972
1961
buffer [0 ] = 0x00 ;
@@ -1977,8 +1966,7 @@ static void write_i2c_default_retimer_setting(
1977
1966
offset = 0x%x, reg_val= 0x%x, i2c_success = %d\n" ,
1978
1967
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1979
1968
if (!i2c_success )
1980
- /* Write failure */
1981
- ASSERT (i2c_success );
1969
+ goto i2c_write_fail ;
1982
1970
1983
1971
/* Write offset 0xff to 0x00 */
1984
1972
buffer [0 ] = 0xff ;
@@ -1989,9 +1977,13 @@ static void write_i2c_default_retimer_setting(
1989
1977
offset = 0x%x, reg_val= 0x%x, i2c_success = %d end here\n" ,
1990
1978
slave_address , buffer [0 ], buffer [1 ], i2c_success ?1 :0 );
1991
1979
if (!i2c_success )
1992
- /* Write failure */
1993
- ASSERT (i2c_success );
1980
+ goto i2c_write_fail ;
1994
1981
}
1982
+
1983
+ return ;
1984
+
1985
+ i2c_write_fail :
1986
+ DC_LOG_DEBUG ("Set default retimer failed" );
1995
1987
}
1996
1988
1997
1989
static void write_i2c_redriver_setting (
@@ -2020,8 +2012,7 @@ static void write_i2c_redriver_setting(
2020
2012
slave_address , buffer [3 ], buffer [4 ], buffer [5 ], buffer [6 ], i2c_success ?1 :0 );
2021
2013
2022
2014
if (!i2c_success )
2023
- /* Write failure */
2024
- ASSERT (i2c_success );
2015
+ DC_LOG_DEBUG ("Set redriver failed" );
2025
2016
}
2026
2017
2027
2018
static void enable_link_hdmi (struct pipe_ctx * pipe_ctx )
0 commit comments