Merge "drm/msm/sde: initialize display info during connector setup" (411ec27f) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+18 −0

Original line number	Diff line number	Diff line
		@@ -95,10 +95,28 @@ int dsi_display_set_backlight(void *display, u32 bl_lvl)

		pr_debug("bl_scale = %u, bl_scale_ad = %u, bl_lvl = %u\n",
		bl_scale, bl_scale_ad, (u32)bl_temp);

		rc = dsi_display_clk_ctrl(dsi_display->dsi_clk_handle,
		DSI_CORE_CLK, DSI_CLK_ON);
		if (rc) {
		pr_err("[%s] failed to enable DSI core clocks, rc=%d\n",
		dsi_display->name, rc);
		goto error;
		}

		rc = dsi_panel_set_backlight(panel, (u32)bl_temp);
		if (rc)
		pr_err("unable to set backlight\n");

		rc = dsi_display_clk_ctrl(dsi_display->dsi_clk_handle,
		DSI_CORE_CLK, DSI_CLK_OFF);
		if (rc) {
		pr_err("[%s] failed to disable DSI core clocks, rc=%d\n",
		dsi_display->name, rc);
		goto error;
		}

		error:
		return rc;
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -1197,6 +1197,8 @@ struct drm_connector sde_connector_init(struct drm_device dev,
		return ERR_PTR(-ENOMEM);
		}

		memset(&display_info, 0, sizeof(display_info));

		rc = drm_connector_init(dev,
		&c_conn->base,
		&sde_connector_ops,