Merge "drm/msm/sde: report rsc timeout state" (90ee51fc) · Commits · e / devices / android_kernel_fairphone_FP3

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -4997,7 +4997,10 @@ int dsi_display_get_info(struct msm_display_info info, void disp)
		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;

+1 −0

Original line number	Diff line number	Diff line
		@@ -4009,6 +4009,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,

+10 −2

Original line number	Diff line number	Diff line
		@@ -579,8 +579,12 @@ static int sde_rsc_switch_to_clk(struct sde_rsc_priv *rsc,
		msecs_to_jiffies(PRIMARY_VBLANK_WORST_CASE_MS*2));
		if (!rc) {
		pr_err("Timeout waiting for vsync\n");
		SDE_EVT32(atomic_read(&rsc->rsc_vsync_wait),
		rc = -ETIMEDOUT;
		SDE_EVT32(atomic_read(&rsc->rsc_vsync_wait), rc,
		SDE_EVTLOG_ERROR);
		} else {
		SDE_EVT32(atomic_read(&rsc->rsc_vsync_wait), rc);
		rc = 0;
		}
		}
		end:
		@@ -635,8 +639,12 @@ static int sde_rsc_switch_to_vid(struct sde_rsc_priv *rsc,
		msecs_to_jiffies(PRIMARY_VBLANK_WORST_CASE_MS*2));
		if (!rc) {
		pr_err("Timeout waiting for vsync\n");
		SDE_EVT32(atomic_read(&rsc->rsc_vsync_wait),
		rc = -ETIMEDOUT;
		SDE_EVT32(atomic_read(&rsc->rsc_vsync_wait), rc,
		SDE_EVTLOG_ERROR);
		} else {
		SDE_EVT32(atomic_read(&rsc->rsc_vsync_wait), rc);
		rc = 0;
		}
		}