diff -Naur linux-5.3.5/drivers/gpu/drm/amd/display/dc/core/dc_link.c linux-5.3.5-p/drivers/gpu/drm/amd/display/dc/core/dc_link.c --- linux-5.3.5/drivers/gpu/drm/amd/display/dc/core/dc_link.c 2019-10-07 19:01:58.000000000 +0200 +++ linux-5.3.5-p/drivers/gpu/drm/amd/display/dc/core/dc_link.c 2019-10-10 23:30:11.410468583 +0200 @@ -1721,10 +1721,6 @@ offset = 0x%x, reg_val= 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); - /* Based on DP159 specs, APPLY_RX_TX_CHANGE bit in 0x0A * needs to be set to 1 on every 0xA-0xC write. */ @@ -1740,9 +1736,6 @@ dal_ddc_service_query_ddc_data( pipe_ctx->stream->link->ddc, slave_address, &offset, 1, &value, 1); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); } buffer[0] = offset; @@ -1753,9 +1746,6 @@ RETIMER_REDRIVER_INFO("retimer write to slave_address = 0x%x,\ offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); } } } @@ -1774,9 +1764,6 @@ offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); /* Based on DP159 specs, APPLY_RX_TX_CHANGE bit in 0x0A * needs to be set to 1 on every 0xA-0xC write. @@ -1793,9 +1780,6 @@ dal_ddc_service_query_ddc_data( pipe_ctx->stream->link->ddc, slave_address, &offset, 1, &value, 1); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); } buffer[0] = offset; @@ -1806,9 +1790,6 @@ RETIMER_REDRIVER_INFO("retimer write to slave_address = 0x%x,\ offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); } } } @@ -1825,9 +1806,6 @@ RETIMER_REDRIVER_INFO("retimer write to slave_address = 0x%x,\ offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); /* Write offset 0x00 to 0x23 */ buffer[0] = 0x00; @@ -1837,9 +1815,6 @@ RETIMER_REDRIVER_INFO("retimer write to slave_address = 0x%x,\ offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); /* Write offset 0xff to 0x00 */ buffer[0] = 0xff; @@ -1849,10 +1824,6 @@ RETIMER_REDRIVER_INFO("retimer write to slave_address = 0x%x,\ offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); - } } @@ -1877,9 +1848,6 @@ RETIMER_REDRIVER_INFO("retimer writes default setting to slave_address = 0x%x,\ offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); /* Write offset 0x0A to 0x17 */ buffer[0] = 0x0A; @@ -1889,9 +1857,6 @@ RETIMER_REDRIVER_INFO("retimer write to slave_addr = 0x%x,\ offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); /* Write offset 0x0B to 0xDA or 0xD8 */ buffer[0] = 0x0B; @@ -1901,9 +1866,6 @@ RETIMER_REDRIVER_INFO("retimer write to slave_addr = 0x%x,\ offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); /* Write offset 0x0A to 0x17 */ buffer[0] = 0x0A; @@ -1913,9 +1875,6 @@ RETIMER_REDRIVER_INFO("retimer write to slave_addr = 0x%x,\ offset = 0x%x, reg_val= 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); /* Write offset 0x0C to 0x1D or 0x91 */ buffer[0] = 0x0C; @@ -1925,9 +1884,6 @@ RETIMER_REDRIVER_INFO("retimer write to slave_addr = 0x%x,\ offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); /* Write offset 0x0A to 0x17 */ buffer[0] = 0x0A; @@ -1937,9 +1893,6 @@ RETIMER_REDRIVER_INFO("retimer write to slave_addr = 0x%x,\ offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); if (is_vga_mode) { @@ -1953,9 +1906,7 @@ RETIMER_REDRIVER_INFO("retimer write to slave_addr = 0x%x,\ offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); + /* Write offset 0x00 to 0x23 */ buffer[0] = 0x00; @@ -1965,9 +1916,6 @@ RETIMER_REDRIVER_INFO("retimer write to slave_addr = 0x%x,\ offset = 0x%x, reg_val= 0x%x, i2c_success = %d\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); /* Write offset 0xff to 0x00 */ buffer[0] = 0xff; @@ -1977,9 +1925,6 @@ RETIMER_REDRIVER_INFO("retimer write default setting to slave_addr = 0x%x,\ offset = 0x%x, reg_val= 0x%x, i2c_success = %d end here\n", slave_address, buffer[0], buffer[1], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); } } @@ -2008,9 +1953,6 @@ i2c_success = %d\n", slave_address, buffer[3], buffer[4], buffer[5], buffer[6], i2c_success?1:0); - if (!i2c_success) - /* Write failure */ - ASSERT(i2c_success); } static void enable_link_hdmi(struct pipe_ctx *pipe_ctx)