Merge tag 'exynos-drm-fixes-for-v5.6-rc5' of... (755d7a92) · Commits · 戴 / test

drivers/gpu/drm/exynos/exynos_drm_dsi.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -1773,8 +1773,9 @@ static int exynos_dsi_probe(struct platform_device *pdev)
		ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(dsi->supplies),
		dsi->supplies);
		if (ret) {
		if (ret != -EPROBE_DEFER)
		dev_info(dev, "failed to get regulators: %d\n", ret);
		return -EPROBE_DEFER;
		return ret;
		}

		dsi->clks = devm_kcalloc(dev,
		@@ -1787,8 +1788,9 @@ static int exynos_dsi_probe(struct platform_device *pdev)
		dsi->clks[i] = devm_clk_get(dev, clk_names[i]);
		if (IS_ERR(dsi->clks[i])) {
		if (strcmp(clk_names[i], "sclk_mipi") == 0) {
		strcpy(clk_names[i], OLD_SCLK_MIPI_CLK_NAME);
		i--;
		dsi->clks[i] = devm_clk_get(dev,
		OLD_SCLK_MIPI_CLK_NAME);
		if (!IS_ERR(dsi->clks[i]))
		continue;
		}

+12 −10

Original line number	Diff line number	Diff line
		@@ -1805,18 +1805,10 @@ static int hdmi_resources_init(struct hdmi_context *hdata)

		hdata->reg_hdmi_en = devm_regulator_get_optional(dev, "hdmi-en");

		if (PTR_ERR(hdata->reg_hdmi_en) != -ENODEV) {
		if (PTR_ERR(hdata->reg_hdmi_en) != -ENODEV)
		if (IS_ERR(hdata->reg_hdmi_en))
		return PTR_ERR(hdata->reg_hdmi_en);

		ret = regulator_enable(hdata->reg_hdmi_en);
		if (ret) {
		DRM_DEV_ERROR(dev,
		"failed to enable hdmi-en regulator\n");
		return ret;
		}
		}

		return hdmi_bridge_init(hdata);
		}

		@@ -2023,6 +2015,15 @@ static int hdmi_probe(struct platform_device *pdev)
		}
		}

		if (!IS_ERR(hdata->reg_hdmi_en)) {
		ret = regulator_enable(hdata->reg_hdmi_en);
		if (ret) {
		DRM_DEV_ERROR(dev,
		"failed to enable hdmi-en regulator\n");
		goto err_hdmiphy;
		}
		}

		pm_runtime_enable(dev);

		audio_infoframe = &hdata->audio.infoframe;
		@@ -2047,7 +2048,8 @@ err_unregister_audio:

		err_rpm_disable:
		pm_runtime_disable(dev);

		if (!IS_ERR(hdata->reg_hdmi_en))
		regulator_disable(hdata->reg_hdmi_en);
		err_hdmiphy:
		if (hdata->hdmiphy_port)
		put_device(&hdata->hdmiphy_port->dev);