Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2750a367 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: populate primary display flag" into dev/msm-4.14-display

parents bc4c4c09 a4114769

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

+5 −1
Original line number Diff line number Diff line
@@ -5066,7 +5066,11 @@ int dsi_display_get_info(struct drm_connector *connector, 
		info->h_tile_instance[i] = display->ctrl[i].ctrl->cell_index;



	info->is_connected = true;

	info->is_primary = false;



	if (!strcmp(display->display_type, "primary"))

		info->is_primary = true;



	info->width_mm = phy_props.panel_width_mm;

	info->height_mm = phy_props.panel_height_mm;

	info->max_width = 1920;

drivers/gpu/drm/msm/sde/sde_encoder.c

+1 −0
Original line number Diff line number Diff line
@@ -4331,6 +4331,7 @@ void sde_encoder_kickoff(struct drm_encoder *drm_enc, bool is_error) 
	}



	if (sde_enc->disp_info.intf_type == DRM_MODE_CONNECTOR_DSI &&

			sde_enc->disp_info.is_primary &&

			!_sde_encoder_wakeup_time(drm_enc, &wakeup_time)) {

		SDE_EVT32_VERBOSE(ktime_to_ms(wakeup_time));

		mod_timer(&sde_enc->vsync_event_timer,