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

Commit 14cdea89 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-msm-fixes-2018-04-25' of git://people.freedesktop.org/~robclark/linux into drm-fixes 

A few fixes for 4.17.. thanks to Sean for helping pull together some
of the display related fixes while I was off in compute-land.

* tag 'drm-msm-fixes-2018-04-25' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: don't deref error pointer in the msm_fbdev_create error path
  drm/msm/dsi: use correct enum in dsi_get_cmd_fmt
  drm/msm: Fix possible null dereference on failure of get_pages()
  drm/msm: Add modifier to mdp_get_format arguments
  drm/msm: Mark the crtc->state->event consumed
  drm/msm/dsi: implement auto PHY timing calculator for 10nm PHY
  drm/msm/dsi: check video mode engine status before waiting
  drm/msm/dsi: check return value for video done waits
parents 8eb8ad52 789d4c30

drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c

+1 −0
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ static void mdp4_crtc_atomic_flush(struct drm_crtc *crtc, 


	spin_lock_irqsave(&dev->event_lock, flags);

	mdp4_crtc->event = crtc->state->event;

	crtc->state->event = NULL;

	spin_unlock_irqrestore(&dev->event_lock, flags);



	blend_setup(crtc);

drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c

+1 −0
Original line number Diff line number Diff line
@@ -708,6 +708,7 @@ static void mdp5_crtc_atomic_flush(struct drm_crtc *crtc, 


	spin_lock_irqsave(&dev->event_lock, flags);

	mdp5_crtc->event = crtc->state->event;

	crtc->state->event = NULL;

	spin_unlock_irqrestore(&dev->event_lock, flags);



	/*

drivers/gpu/drm/msm/disp/mdp_format.c

+2 −1
Original line number Diff line number Diff line
@@ -171,7 +171,8 @@ uint32_t mdp_get_formats(uint32_t *pixel_formats, uint32_t max_formats, 
	return i;

}



const struct msm_format *mdp_get_format(struct msm_kms *kms, uint32_t format)

const struct msm_format *mdp_get_format(struct msm_kms *kms, uint32_t format,

		uint64_t modifier)

{

	int i;

	for (i = 0; i < ARRAY_SIZE(formats); i++) {

drivers/gpu/drm/msm/disp/mdp_kms.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct mdp_format { 
#define MDP_FORMAT_IS_YUV(mdp_format) ((mdp_format)->is_yuv)



uint32_t mdp_get_formats(uint32_t *formats, uint32_t max_formats, bool rgb_only);

const struct msm_format *mdp_get_format(struct msm_kms *kms, uint32_t format);

const struct msm_format *mdp_get_format(struct msm_kms *kms, uint32_t format, uint64_t modifier);



/* MDP capabilities */

#define MDP_CAP_SMP		BIT(0)	/* Shared Memory Pool                 */

drivers/gpu/drm/msm/dsi/dsi_host.c

+12 −4
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ struct msm_dsi_host { 


	bool registered;

	bool power_on;

	bool enabled;

	int irq;

};
@@ -775,7 +776,7 @@ static inline enum dsi_cmd_dst_format dsi_get_cmd_fmt( 
	switch (mipi_fmt) {

	case MIPI_DSI_FMT_RGB888:	return CMD_DST_FORMAT_RGB888;

	case MIPI_DSI_FMT_RGB666_PACKED:

	case MIPI_DSI_FMT_RGB666:	return VID_DST_FORMAT_RGB666;

	case MIPI_DSI_FMT_RGB666:	return CMD_DST_FORMAT_RGB666;

	case MIPI_DSI_FMT_RGB565:	return CMD_DST_FORMAT_RGB565;

	default:			return CMD_DST_FORMAT_RGB888;

	}
@@ -986,13 +987,19 @@ static void dsi_set_tx_power_mode(int mode, struct msm_dsi_host *msm_host) 


static void dsi_wait4video_done(struct msm_dsi_host *msm_host)

{

	u32 ret = 0;

	struct device *dev = &msm_host->pdev->dev;



	dsi_intr_ctrl(msm_host, DSI_IRQ_MASK_VIDEO_DONE, 1);



	reinit_completion(&msm_host->video_comp);



	wait_for_completion_timeout(&msm_host->video_comp,

	ret = wait_for_completion_timeout(&msm_host->video_comp,

			msecs_to_jiffies(70));



	if (ret <= 0)

		dev_err(dev, "wait for video done timed out\n");



	dsi_intr_ctrl(msm_host, DSI_IRQ_MASK_VIDEO_DONE, 0);

}
@@ -1001,7 +1008,7 @@ static void dsi_wait4video_eng_busy(struct msm_dsi_host *msm_host) 
	if (!(msm_host->mode_flags & MIPI_DSI_MODE_VIDEO))

		return;



	if (msm_host->power_on) {

	if (msm_host->power_on && msm_host->enabled) {

		dsi_wait4video_done(msm_host);

		/* delay 4 ms to skip BLLP */

		usleep_range(2000, 4000);
@@ -2203,7 +2210,7 @@ int msm_dsi_host_enable(struct mipi_dsi_host *host) 
	 *	pm_runtime_put_autosuspend(&msm_host->pdev->dev);

	 * }

	 */



	msm_host->enabled = true;

	return 0;

}
@@ -2211,6 +2218,7 @@ int msm_dsi_host_disable(struct mipi_dsi_host *host) 
{

	struct msm_dsi_host *msm_host = to_msm_dsi_host(host);



	msm_host->enabled = false;

	dsi_op_mode_config(msm_host,

		!!(msm_host->mode_flags & MIPI_DSI_MODE_VIDEO), false);