Commit 5dce58de authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-msm-fixes-2021-05-09' of https://gitlab.freedesktop.org/drm/msm into drm-fixes 



- dsi regression fix
- dma-buf pinning fix
- displayport fixes
- llc fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGuqLZDAEJwUFKb6m+h3kyxgjDEKa3DPA1fHA69vxbXH=g@mail.gmail.com
parents 89cd34a1 f2f46b87

drivers/gpu/drm/msm/adreno/a6xx_gpu.c

+5 −4
Original line number Diff line number Diff line
@@ -1153,10 +1153,6 @@ static void a6xx_llc_slices_init(struct platform_device *pdev, 
{

	struct device_node *phandle;



	a6xx_gpu->llc_mmio = msm_ioremap(pdev, "cx_mem", "gpu_cx");

	if (IS_ERR(a6xx_gpu->llc_mmio))

		return;



	/*

	 * There is a different programming path for targets with an mmu500

	 * attached, so detect if that is the case
@@ -1166,6 +1162,11 @@ static void a6xx_llc_slices_init(struct platform_device *pdev, 
		of_device_is_compatible(phandle, "arm,mmu-500"));

	of_node_put(phandle);



	if (a6xx_gpu->have_mmu500)

		a6xx_gpu->llc_mmio = NULL;

	else

		a6xx_gpu->llc_mmio = msm_ioremap(pdev, "cx_mem", "gpu_cx");



	a6xx_gpu->llc_slice = llcc_slice_getd(LLCC_GPU);

	a6xx_gpu->htw_llc_slice = llcc_slice_getd(LLCC_GPUHTW);

drivers/gpu/drm/msm/dp/dp_audio.c

+1 −0
Original line number Diff line number Diff line
@@ -527,6 +527,7 @@ int dp_audio_hw_params(struct device *dev, 
	dp_audio_setup_acr(audio);

	dp_audio_safe_to_exit_level(audio);

	dp_audio_enable(audio, true);

	dp_display_signal_audio_start(dp_display);

	dp_display->audio_enabled = true;



end:

drivers/gpu/drm/msm/dp/dp_display.c

+17 −9
Original line number Diff line number Diff line
@@ -178,6 +178,15 @@ static int dp_del_event(struct dp_display_private *dp_priv, u32 event) 
	return 0;

}



void dp_display_signal_audio_start(struct msm_dp *dp_display)

{

	struct dp_display_private *dp;



	dp = container_of(dp_display, struct dp_display_private, dp_display);



	reinit_completion(&dp->audio_comp);

}



void dp_display_signal_audio_complete(struct msm_dp *dp_display)

{

	struct dp_display_private *dp;
@@ -586,10 +595,8 @@ static int dp_connect_pending_timeout(struct dp_display_private *dp, u32 data) 
	mutex_lock(&dp->event_mutex);



	state = dp->hpd_state;

	if (state == ST_CONNECT_PENDING) {

		dp_display_enable(dp, 0);

	if (state == ST_CONNECT_PENDING)

		dp->hpd_state = ST_CONNECTED;

	}



	mutex_unlock(&dp->event_mutex);
@@ -651,7 +658,6 @@ static int dp_hpd_unplug_handle(struct dp_display_private *dp, u32 data) 
	dp_add_event(dp, EV_DISCONNECT_PENDING_TIMEOUT, 0, DP_TIMEOUT_5_SECOND);



	/* signal the disconnect event early to ensure proper teardown */

	reinit_completion(&dp->audio_comp);

	dp_display_handle_plugged_change(g_dp_display, false);



	dp_catalog_hpd_config_intr(dp->catalog, DP_DP_HPD_PLUG_INT_MASK |
@@ -669,10 +675,8 @@ static int dp_disconnect_pending_timeout(struct dp_display_private *dp, u32 data 
	mutex_lock(&dp->event_mutex);



	state =  dp->hpd_state;

	if (state == ST_DISCONNECT_PENDING) {

		dp_display_disable(dp, 0);

	if (state == ST_DISCONNECT_PENDING)

		dp->hpd_state = ST_DISCONNECTED;

	}



	mutex_unlock(&dp->event_mutex);
@@ -898,7 +902,6 @@ static int dp_display_disable(struct dp_display_private *dp, u32 data) 
	/* wait only if audio was enabled */

	if (dp_display->audio_enabled) {

		/* signal the disconnect event */

		reinit_completion(&dp->audio_comp);

		dp_display_handle_plugged_change(dp_display, false);

		if (!wait_for_completion_timeout(&dp->audio_comp,

				HZ * 5))
@@ -1272,7 +1275,12 @@ static int dp_pm_resume(struct device *dev) 


	status = dp_catalog_link_is_connected(dp->catalog);



	if (status)

	/*

	 * can not declared display is connected unless

	 * HDMI cable is plugged in and sink_count of

	 * dongle become 1

	 */

	if (status && dp->link->sink_count)

		dp->dp_display.is_connected = true;

	else

		dp->dp_display.is_connected = false;

drivers/gpu/drm/msm/dp/dp_display.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ int dp_display_get_modes(struct msm_dp *dp_display, 
int dp_display_request_irq(struct msm_dp *dp_display);

bool dp_display_check_video_test(struct msm_dp *dp_display);

int dp_display_get_test_bpp(struct msm_dp *dp_display);

void dp_display_signal_audio_start(struct msm_dp *dp_display);

void dp_display_signal_audio_complete(struct msm_dp *dp_display);



#endif /* _DP_DISPLAY_H_ */

drivers/gpu/drm/msm/dsi/phy/dsi_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -843,7 +843,7 @@ int msm_dsi_phy_get_clk_provider(struct msm_dsi_phy *phy, 
	if (pixel_clk_provider)

		*pixel_clk_provider = phy->provided_clocks->hws[DSI_PIXEL_PLL_CLK]->clk;



	return -EINVAL;

	return 0;

}



void msm_dsi_phy_pll_save_state(struct msm_dsi_phy *phy)