Created
April 6, 2020 21:49
-
-
Save lovesegfault/ad2daaead9fc31747626478effd10525 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c | |
| index 4d1c58468dbc..a107d5b863c3 100644 | |
| --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c | |
| +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c | |
| @@ -742,11 +742,6 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct drm_display_mode *mode) | |
| if (!hdmi->scdc.scrambling.supported) | |
| return; | |
| - ret = drm_scdc_readb(nv_encoder->i2c, SCDC_TMDS_CONFIG, &config); | |
| - if (ret < 0) { | |
| - NV_ERROR(drm, "Failure to read SCDC_TMDS_CONFIG: %d\n", ret); | |
| - return; | |
| - } | |
| config &= ~(SCDC_TMDS_BIT_CLOCK_RATIO_BY_40 | SCDC_SCRAMBLING_ENABLE); | |
| config |= SCDC_TMDS_BIT_CLOCK_RATIO_BY_40 * high_tmds_clock_ratio; | |
| config |= SCDC_SCRAMBLING_ENABLE * scrambling; | |
| @@ -754,6 +749,12 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct drm_display_mode *mode) | |
| if (ret < 0) | |
| NV_ERROR(drm, "Failure to write SCDC_TMDS_CONFIG = 0x%02x: %d\n", | |
| config, ret); | |
| + | |
| + ret = drm_scdc_readb(nv_encoder->i2c, SCDC_TMDS_CONFIG, &config); | |
| + if (ret < 0) { | |
| + NV_ERROR(drm, "Failure to read SCDC_TMDS_CONFIG: %d\n", ret); | |
| + return; | |
| + } | |
| } | |
| /****************************************************************************** |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment