Commit 534c6307 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'msm-fixes-2018-12-04' of... 

Merge tag 'msm-fixes-2018-12-04' of https://gitlab.freedesktop.org/seanpaul/dpu-staging

 into drm-fixes

- Several related to incorrect error checking/handling (Various)
- Prevent IRQ storm on MDP5 HDMI hotplug (Todor)
- Don't capture crash state if unsupported (Sharat)
- Properly grab vblank reference in atomic wait for commit done (Sean)

Cc: Sharat Masetty <smasetty@codeaurora.org>
Cc: Todor Tomov <todor.tomov@linaro.org>
Cc: Sean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20181205194207.GY154160@art_vandelay
parents 25956467 098336de

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

+0 −1
Original line number Diff line number Diff line
@@ -1594,7 +1594,6 @@ struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane, 
				NULL);



	drm_crtc_helper_add(crtc, &dpu_crtc_helper_funcs);

	plane->crtc = crtc;



	/* save user friendly CRTC name for later */

	snprintf(dpu_crtc->name, DPU_CRTC_NAME_SIZE, "crtc%u", crtc->base.id);

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

+0 −2
Original line number Diff line number Diff line
@@ -488,8 +488,6 @@ static void dpu_encoder_destroy(struct drm_encoder *drm_enc) 


	drm_encoder_cleanup(drm_enc);

	mutex_destroy(&dpu_enc->enc_lock);



	kfree(dpu_enc);

}



void dpu_encoder_helper_split_config(

drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static const struct dpu_format dpu_format_map[] = { 
	INTERLEAVED_RGB_FMT(XBGR8888,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		true, 4, 0,

		false, 4, 0,

		DPU_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGBA8888,

drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c

+3 −1
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#define DSI_PIXEL_PLL_CLK		1

#define NUM_PROVIDED_CLKS		2



#define VCO_REF_CLK_RATE		19200000



struct dsi_pll_regs {

	u32 pll_prop_gain_rate;

	u32 pll_lockdet_rate;
@@ -316,7 +318,7 @@ static int dsi_pll_10nm_vco_set_rate(struct clk_hw *hw, unsigned long rate, 
	    parent_rate);



	pll_10nm->vco_current_rate = rate;

	pll_10nm->vco_ref_clk_rate = parent_rate;

	pll_10nm->vco_ref_clk_rate = VCO_REF_CLK_RATE;



	dsi_pll_setup_config(pll_10nm);

drivers/gpu/drm/msm/hdmi/hdmi.c

+7 −1
Original line number Diff line number Diff line
@@ -332,6 +332,12 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, 
		goto fail;

	}



	ret = msm_hdmi_hpd_enable(hdmi->connector);

	if (ret < 0) {

		DRM_DEV_ERROR(&hdmi->pdev->dev, "failed to enable HPD: %d\n", ret);

		goto fail;

	}



	encoder->bridge = hdmi->bridge;



	priv->bridges[priv->num_bridges++]       = hdmi->bridge;
@@ -571,7 +577,7 @@ static int msm_hdmi_bind(struct device *dev, struct device *master, void *data) 
{

	struct drm_device *drm = dev_get_drvdata(master);

	struct msm_drm_private *priv = drm->dev_private;

	static struct hdmi_platform_config *hdmi_cfg;

	struct hdmi_platform_config *hdmi_cfg;

	struct hdmi *hdmi;

	struct device_node *of_node = dev->of_node;

	int i, err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE