Merge airlied/drm-next into drm-misc-next

Backmerge 4.15 and hdcp topic branch

Signed-off-by: Sean Paul <seanpaul@chromium.org>
This commit is contained in:
Sean Paul
2018-02-16 15:47:43 -05:00
10586 changed files with 442860 additions and 211688 deletions

View File

@@ -913,7 +913,7 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
has_lvds_alt = false;
} else {
dev_err(dev, "Couldn't get the LVDS PLL\n");
return PTR_ERR(tcon->lvds_rst);
return PTR_ERR(tcon->lvds_pll);
}
} else {
has_lvds_alt = true;