Commit ad49e38e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2019-09-06' of... 

Merge tag 'drm-misc-next-fixes-2019-09-06' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

 - A significant number of panfrost fixes for runtime_pm, MMU and GEM support
 - A fix for DCS transfers on mcde

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190906070500.dfxacpgxoxalcha3@flea
parents 0173ecf2 88537ddb

drivers/gpu/drm/drm_gem_shmem_helper.c

+11 −2
Original line number Diff line number Diff line
@@ -390,6 +390,12 @@ void drm_gem_shmem_purge_locked(struct drm_gem_object *obj) 


	WARN_ON(!drm_gem_shmem_is_purgeable(shmem));



	dma_unmap_sg(obj->dev->dev, shmem->sgt->sgl,

		     shmem->sgt->nents, DMA_BIDIRECTIONAL);

	sg_free_table(shmem->sgt);

	kfree(shmem->sgt);

	shmem->sgt = NULL;



	drm_gem_shmem_put_pages_locked(shmem);



	shmem->madv = -1;
@@ -409,13 +415,16 @@ void drm_gem_shmem_purge_locked(struct drm_gem_object *obj) 
}

EXPORT_SYMBOL(drm_gem_shmem_purge_locked);



void drm_gem_shmem_purge(struct drm_gem_object *obj)

bool drm_gem_shmem_purge(struct drm_gem_object *obj)

{

	struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);



	mutex_lock(&shmem->pages_lock);

	if (!mutex_trylock(&shmem->pages_lock))

		return false;

	drm_gem_shmem_purge_locked(obj);

	mutex_unlock(&shmem->pages_lock);



	return true;

}

EXPORT_SYMBOL(drm_gem_shmem_purge);

drivers/gpu/drm/mcde/mcde_dsi.c

+47 −23
Original line number Diff line number Diff line
@@ -178,22 +178,26 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, 
	const u32 loop_delay_us = 10; /* us */

	const u8 *tx = msg->tx_buf;

	u32 loop_counter;

	size_t txlen;

	size_t txlen = msg->tx_len;

	size_t rxlen = msg->rx_len;

	u32 val;

	int ret;

	int i;



	txlen = msg->tx_len;

	if (txlen > 12) {

	if (txlen > 16) {

		dev_err(d->dev,

			"dunno how to write more than 12 bytes yet\n");

			"dunno how to write more than 16 bytes yet\n");

		return -EIO;

	}

	if (rxlen > 4) {

		dev_err(d->dev,

			"dunno how to read more than 4 bytes yet\n");

		return -EIO;

	}



	dev_dbg(d->dev,

		"message to channel %d, %zd bytes",

		msg->channel,

		txlen);

		"message to channel %d, write %zd bytes read %zd bytes\n",

		msg->channel, txlen, rxlen);



	/* Command "nature" */

	if (MCDE_DSI_HOST_IS_READ(msg->type))
@@ -210,9 +214,7 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, 
	if (mipi_dsi_packet_format_is_long(msg->type))

		val |= DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_LONGNOTSHORT;

	val |= 0 << DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_ID_SHIFT;

	/* Add one to the length for the MIPI DCS command */

	val |= txlen

		<< DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_SIZE_SHIFT;

	val |= txlen << DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_SIZE_SHIFT;

	val |= DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_LP_EN;

	val |= msg->type << DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_HEAD_SHIFT;

	writel(val, d->regs + DSI_DIRECT_CMD_MAIN_SETTINGS);
@@ -249,6 +251,19 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, 
	writel(1, d->regs + DSI_DIRECT_CMD_SEND);



	loop_counter = 1000 * 1000 / loop_delay_us;

	if (MCDE_DSI_HOST_IS_READ(msg->type)) {

		/* Read command */

		while (!(readl(d->regs + DSI_DIRECT_CMD_STS) &

			 (DSI_DIRECT_CMD_STS_READ_COMPLETED |

			  DSI_DIRECT_CMD_STS_READ_COMPLETED_WITH_ERR))

		       && --loop_counter)

			usleep_range(loop_delay_us, (loop_delay_us * 3) / 2);

		if (!loop_counter) {

			dev_err(d->dev, "DSI read timeout!\n");

			return -ETIME;

		}

	} else {

		/* Writing only */

		while (!(readl(d->regs + DSI_DIRECT_CMD_STS) &

			 DSI_DIRECT_CMD_STS_WRITE_COMPLETED)

		       && --loop_counter)
@@ -258,8 +273,14 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, 
			dev_err(d->dev, "DSI write timeout!\n");

			return -ETIME;

		}

	}



	val = readl(d->regs + DSI_DIRECT_CMD_STS);

	if (val & DSI_DIRECT_CMD_STS_READ_COMPLETED_WITH_ERR) {

		dev_err(d->dev, "read completed with error\n");

		writel(1, d->regs + DSI_DIRECT_CMD_RD_INIT);

		return -EIO;

	}

	if (val & DSI_DIRECT_CMD_STS_ACKNOWLEDGE_WITH_ERR_RECEIVED) {

		val >>= DSI_DIRECT_CMD_STS_ACK_VAL_SHIFT;

		dev_err(d->dev, "error during transmission: %04x\n",
@@ -269,10 +290,7 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, 


	if (!MCDE_DSI_HOST_IS_READ(msg->type)) {

		/* Return number of bytes written */

		if (mipi_dsi_packet_format_is_long(msg->type))

			ret = 4 + txlen;

		else

			ret = 4;

		ret = txlen;

	} else {

		/* OK this is a read command, get the response */

		u32 rdsz;
@@ -282,7 +300,13 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, 
		rdsz = readl(d->regs + DSI_DIRECT_CMD_RD_PROPERTY);

		rdsz &= DSI_DIRECT_CMD_RD_PROPERTY_RD_SIZE_MASK;

		rddat = readl(d->regs + DSI_DIRECT_CMD_RDDAT);

		for (i = 0; i < 4 && i < rdsz; i++)

		if (rdsz < rxlen) {

			dev_err(d->dev, "read error, requested %zd got %d\n",

				rxlen, rdsz);

			return -EIO;

		}

		/* FIXME: read more than 4 bytes */

		for (i = 0; i < 4 && i < rxlen; i++)

			rx[i] = (rddat >> (i * 8)) & 0xff;

		ret = rdsz;

	}

drivers/gpu/drm/panfrost/panfrost_devfreq.c

+4 −2
Original line number Diff line number Diff line
@@ -53,7 +53,9 @@ static int panfrost_devfreq_target(struct device *dev, unsigned long *freq, 
	if (err) {

		dev_err(dev, "Cannot set frequency %lu (%d)\n", target_rate,

			err);

		regulator_set_voltage(pfdev->regulator, pfdev->devfreq.cur_volt,

		if (pfdev->regulator)

			regulator_set_voltage(pfdev->regulator,

					      pfdev->devfreq.cur_volt,

					      pfdev->devfreq.cur_volt);

		return err;

	}

drivers/gpu/drm/panfrost/panfrost_device.c

+0 −10
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <linux/clk.h>

#include <linux/reset.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/regulator/consumer.h>



#include "panfrost_device.h"
@@ -125,7 +124,6 @@ int panfrost_device_init(struct panfrost_device *pfdev) 
	INIT_LIST_HEAD(&pfdev->scheduled_jobs);

	INIT_LIST_HEAD(&pfdev->as_lru_list);



	spin_lock_init(&pfdev->hwaccess_lock);

	spin_lock_init(&pfdev->as_lock);



	err = panfrost_clk_init(pfdev);
@@ -166,14 +164,6 @@ int panfrost_device_init(struct panfrost_device *pfdev) 
	if (err)

		goto err_out4;



	/* runtime PM will wake us up later */

	panfrost_gpu_power_off(pfdev);



	pm_runtime_set_active(pfdev->dev);

	pm_runtime_get_sync(pfdev->dev);

	pm_runtime_mark_last_busy(pfdev->dev);

	pm_runtime_put_autosuspend(pfdev->dev);



	err = panfrost_perfcnt_init(pfdev);

	if (err)

		goto err_out5;

drivers/gpu/drm/panfrost/panfrost_device.h

+0 −3
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ struct panfrost_device { 
	struct drm_device *ddev;

	struct platform_device *pdev;



	spinlock_t hwaccess_lock;



	void __iomem *iomem;

	struct clk *clock;

	struct clk *bus_clock;
@@ -104,7 +102,6 @@ struct panfrost_device { 
struct panfrost_mmu {

	struct io_pgtable_cfg pgtbl_cfg;

	struct io_pgtable_ops *pgtbl_ops;

	struct mutex lock;

	int as;

	atomic_t as_count;

	struct list_head list;

CRA Git | Maintained and supported by SUSTech CRA and CCSE