Commit 64d237e6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'msm-fixes-4.1' of git://people.freedesktop.org/~robclark/linux into drm-fixes 

msm fixes, pretty scattered.

* 'msm-fixes-4.1' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: fix locking inconsistencies in gpu->destroy()
  drm/msm/dsi: Simplify the code to get the number of read byte
  drm/msm: Attach assigned encoder to eDP and DSI connectors
  drm/msm: setup vram after component_bind_all()
  drm/msm/dsi: use pr_err_ratelimited
  drm/msm: fix unbalanced DRM framebuffer init/destroy
  drm/msm/mdp5: Fix iteration on INTF config array
  drm/msm/dsi: Fixup missing *break* statement during cmd rx
  drm/msm/dp: fix error return code
  drm: msm: Fix build when legacy fbdev support isn't set
  drm/msm/dsi: Fix a couple more 64-bit build warnings
  drm/msm: Fix a couple of 64-bit build warnings
parents e2608180 774449eb

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

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ void adreno_gpu_cleanup(struct adreno_gpu *gpu) 
	if (gpu->memptrs_bo) {

		if (gpu->memptrs_iova)

			msm_gem_put_iova(gpu->memptrs_bo, gpu->base.id);

		drm_gem_object_unreference(gpu->memptrs_bo);

		drm_gem_object_unreference_unlocked(gpu->memptrs_bo);

	}

	release_firmware(gpu->pm4);

	release_firmware(gpu->pfp);

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

+5 −5
Original line number Diff line number Diff line
@@ -177,6 +177,11 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, 
		goto fail;

	}



	for (i = 0; i < MSM_DSI_ENCODER_NUM; i++) {

		encoders[i]->bridge = msm_dsi->bridge;

		msm_dsi->encoders[i] = encoders[i];

	}



	msm_dsi->connector = msm_dsi_manager_connector_init(msm_dsi->id);

	if (IS_ERR(msm_dsi->connector)) {

		ret = PTR_ERR(msm_dsi->connector);
@@ -185,11 +190,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, 
		goto fail;

	}



	for (i = 0; i < MSM_DSI_ENCODER_NUM; i++) {

		encoders[i]->bridge = msm_dsi->bridge;

		msm_dsi->encoders[i] = encoders[i];

	}



	priv->bridges[priv->num_bridges++]       = msm_dsi->bridge;

	priv->connectors[priv->num_connectors++] = msm_dsi->connector;

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

+8 −13
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ static int dsi_short_read1_resp(u8 *buf, const struct mipi_dsi_msg *msg) 
		*data = buf[1]; /* strip out dcs type */

		return 1;

	} else {

		pr_err("%s: read data does not match with rx_buf len %d\n",

		pr_err("%s: read data does not match with rx_buf len %zu\n",

			__func__, msg->rx_len);

		return -EINVAL;

	}
@@ -1040,7 +1040,7 @@ static int dsi_short_read2_resp(u8 *buf, const struct mipi_dsi_msg *msg) 
		data[1] = buf[2];

		return 2;

	} else {

		pr_err("%s: read data does not match with rx_buf len %d\n",

		pr_err("%s: read data does not match with rx_buf len %zu\n",

			__func__, msg->rx_len);

		return -EINVAL;

	}
@@ -1093,7 +1093,6 @@ static int dsi_cmd_dma_rx(struct msm_dsi_host *msm_host, 
{

	u32 *lp, *temp, data;

	int i, j = 0, cnt;

	bool ack_error = false;

	u32 read_cnt;

	u8 reg[16];

	int repeated_bytes = 0;
@@ -1105,15 +1104,10 @@ static int dsi_cmd_dma_rx(struct msm_dsi_host *msm_host, 
	if (cnt > 4)

		cnt = 4; /* 4 x 32 bits registers only */



	/* Calculate real read data count */

	read_cnt = dsi_read(msm_host, 0x1d4) >> 16;



	ack_error = (rx_byte == 4) ?

		(read_cnt == 8) : /* short pkt + 4-byte error pkt */

		(read_cnt == (pkt_size + 6 + 4)); /* long pkt+4-byte error pkt*/



	if (ack_error)

		read_cnt -= 4; /* Remove 4 byte error pkt */

	if (rx_byte == 4)

		read_cnt = 4;

	else

		read_cnt = pkt_size + 6;



	/*

	 * In case of multiple reads from the panel, after the first read, there
@@ -1215,7 +1209,7 @@ static void dsi_err_worker(struct work_struct *work) 
		container_of(work, struct msm_dsi_host, err_work);

	u32 status = msm_host->err_work_state;



	pr_err("%s: status=%x\n", __func__, status);

	pr_err_ratelimited("%s: status=%x\n", __func__, status);

	if (status & DSI_ERR_STATE_MDP_FIFO_UNDERFLOW)

		dsi_sw_reset_restore(msm_host);
@@ -1797,6 +1791,7 @@ int msm_dsi_host_cmd_rx(struct mipi_dsi_host *host, 
	case MIPI_DSI_RX_ACKNOWLEDGE_AND_ERROR_REPORT:

		pr_err("%s: rx ACK_ERR_PACLAGE\n", __func__);

		ret = 0;

		break;

	case MIPI_DSI_RX_GENERIC_SHORT_READ_RESPONSE_1BYTE:

	case MIPI_DSI_RX_DCS_SHORT_READ_RESPONSE_1BYTE:

		ret = dsi_short_read1_resp(buf, msg);

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

+5 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) 
	struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id);

	struct drm_connector *connector = NULL;

	struct dsi_connector *dsi_connector;

	int ret;

	int ret, i;



	dsi_connector = devm_kzalloc(msm_dsi->dev->dev,

				sizeof(*dsi_connector), GFP_KERNEL);
@@ -495,6 +495,10 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) 
	if (ret)

		goto fail;



	for (i = 0; i < MSM_DSI_ENCODER_NUM; i++)

		drm_mode_connector_attach_encoder(connector,

						msm_dsi->encoders[i]);



	return connector;



fail:

drivers/gpu/drm/msm/edp/edp_aux.c

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ ssize_t edp_aux_transfer(struct drm_dp_aux *drm_aux, struct drm_dp_aux_msg *msg) 
	/* msg sanity check */

	if ((native && (msg->size > AUX_CMD_NATIVE_MAX)) ||

		(msg->size > AUX_CMD_I2C_MAX)) {

		pr_err("%s: invalid msg: size(%d), request(%x)\n",

		pr_err("%s: invalid msg: size(%zu), request(%x)\n",

			__func__, msg->size, msg->request);

		return -EINVAL;

	}
@@ -155,7 +155,7 @@ ssize_t edp_aux_transfer(struct drm_dp_aux *drm_aux, struct drm_dp_aux_msg *msg) 
		 */

		edp_write(aux->base + REG_EDP_AUX_TRANS_CTRL, 0);

		msm_edp_aux_ctrl(aux, 1);

		pr_err("%s: aux timeout, %d\n", __func__, ret);

		pr_err("%s: aux timeout, %zd\n", __func__, ret);

		goto unlock_exit;

	}

	DBG("completion");

CRA Git | Maintained and supported by SUSTech CRA and CCSE