Commit 7315c0ed authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2019-12-12' of... 

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

 into drm-fixes

-mgag200: more startadd mitigation (Thomas)
-panfrost: devfreq fix + several memory fixes (Steven, Boris)

Cc: Boris Brezillon <boris.brezillon@collabora.com>
Cc: Steven Price <steven.price@arm.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20191212140145.GA145200@art_vandelay
parents cdf1d28c 0a523998

drivers/gpu/drm/mgag200/mgag200_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -30,9 +30,8 @@ module_param_named(modeset, mgag200_modeset, int, 0400); 
static struct drm_driver driver;



static const struct pci_device_id pciidlist[] = {

	{ PCI_VENDOR_ID_MATROX, 0x522, PCI_VENDOR_ID_SUN, 0x4852, 0, 0,

	{ PCI_VENDOR_ID_MATROX, 0x522, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		G200_SE_A | MGAG200_FLAG_HW_BUG_NO_STARTADD},

	{ PCI_VENDOR_ID_MATROX, 0x522, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_SE_A },

	{ PCI_VENDOR_ID_MATROX, 0x524, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_SE_B },

	{ PCI_VENDOR_ID_MATROX, 0x530, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_EV },

	{ PCI_VENDOR_ID_MATROX, 0x532, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_WB },

drivers/gpu/drm/panfrost/panfrost_devfreq.c

+6 −13
Original line number Diff line number Diff line
@@ -18,15 +18,18 @@ static void panfrost_devfreq_update_utilization(struct panfrost_device *pfdev); 
static int panfrost_devfreq_target(struct device *dev, unsigned long *freq,

				   u32 flags)

{

	struct panfrost_device *pfdev = dev_get_drvdata(dev);

	struct dev_pm_opp *opp;

	int err;



	opp = devfreq_recommended_opp(dev, freq, flags);

	if (IS_ERR(opp))

		return PTR_ERR(opp);

	dev_pm_opp_put(opp);



	err = dev_pm_opp_set_rate(dev, *freq);

	if (err)

		return err;



	*freq = clk_get_rate(pfdev->clock);



	return 0;

}
@@ -60,20 +63,10 @@ static int panfrost_devfreq_get_dev_status(struct device *dev, 
	return 0;

}



static int panfrost_devfreq_get_cur_freq(struct device *dev, unsigned long *freq)

{

	struct panfrost_device *pfdev = platform_get_drvdata(to_platform_device(dev));



	*freq = clk_get_rate(pfdev->clock);



	return 0;

}



static struct devfreq_dev_profile panfrost_devfreq_profile = {

	.polling_ms = 50, /* ~3 frames */

	.target = panfrost_devfreq_target,

	.get_dev_status = panfrost_devfreq_get_dev_status,

	.get_cur_freq = panfrost_devfreq_get_cur_freq,

};



int panfrost_devfreq_init(struct panfrost_device *pfdev)

drivers/gpu/drm/panfrost/panfrost_drv.c

+11 −9
Original line number Diff line number Diff line
@@ -303,14 +303,17 @@ static int panfrost_ioctl_mmap_bo(struct drm_device *dev, void *data, 
	}



	/* Don't allow mmapping of heap objects as pages are not pinned. */

	if (to_panfrost_bo(gem_obj)->is_heap)

		return -EINVAL;

	if (to_panfrost_bo(gem_obj)->is_heap) {

		ret = -EINVAL;

		goto out;

	}



	ret = drm_gem_create_mmap_offset(gem_obj);

	if (ret == 0)

		args->offset = drm_vma_node_offset_addr(&gem_obj->vma_node);

	drm_gem_object_put_unlocked(gem_obj);



out:

	drm_gem_object_put_unlocked(gem_obj);

	return ret;

}
@@ -347,20 +350,19 @@ static int panfrost_ioctl_madvise(struct drm_device *dev, void *data, 
		return -ENOENT;

	}



	mutex_lock(&pfdev->shrinker_lock);

	args->retained = drm_gem_shmem_madvise(gem_obj, args->madv);



	if (args->retained) {

		struct panfrost_gem_object *bo = to_panfrost_bo(gem_obj);



		mutex_lock(&pfdev->shrinker_lock);



		if (args->madv == PANFROST_MADV_DONTNEED)

			list_add_tail(&bo->base.madv_list, &pfdev->shrinker_list);

			list_add_tail(&bo->base.madv_list,

				      &pfdev->shrinker_list);

		else if (args->madv == PANFROST_MADV_WILLNEED)

			list_del_init(&bo->base.madv_list);



		mutex_unlock(&pfdev->shrinker_lock);

	}

	mutex_unlock(&pfdev->shrinker_lock);



	drm_gem_object_put_unlocked(gem_obj);

	return 0;
@@ -443,7 +445,7 @@ panfrost_postclose(struct drm_device *dev, struct drm_file *file) 
{

	struct panfrost_file_priv *panfrost_priv = file->driver_priv;



	panfrost_perfcnt_close(panfrost_priv);

	panfrost_perfcnt_close(file);

	panfrost_job_close(panfrost_priv);



	panfrost_mmu_pgtable_free(panfrost_priv);

drivers/gpu/drm/panfrost/panfrost_gem.c

+12 −7
Original line number Diff line number Diff line
@@ -19,6 +19,16 @@ static void panfrost_gem_free_object(struct drm_gem_object *obj) 
	struct panfrost_gem_object *bo = to_panfrost_bo(obj);

	struct panfrost_device *pfdev = obj->dev->dev_private;



	/*

	 * Make sure the BO is no longer inserted in the shrinker list before

	 * taking care of the destruction itself. If we don't do that we have a

	 * race condition between this function and what's done in

	 * panfrost_gem_shrinker_scan().

	 */

	mutex_lock(&pfdev->shrinker_lock);

	list_del_init(&bo->base.madv_list);

	mutex_unlock(&pfdev->shrinker_lock);



	if (bo->sgts) {

		int i;

		int n_sgt = bo->base.base.size / SZ_2M;
@@ -33,15 +43,10 @@ static void panfrost_gem_free_object(struct drm_gem_object *obj) 
		kfree(bo->sgts);

	}



	mutex_lock(&pfdev->shrinker_lock);

	if (!list_empty(&bo->base.madv_list))

		list_del(&bo->base.madv_list);

	mutex_unlock(&pfdev->shrinker_lock);



	drm_gem_shmem_free_object(obj);

}



static int panfrost_gem_open(struct drm_gem_object *obj, struct drm_file *file_priv)

int panfrost_gem_open(struct drm_gem_object *obj, struct drm_file *file_priv)

{

	int ret;

	size_t size = obj->size;
@@ -80,7 +85,7 @@ static int panfrost_gem_open(struct drm_gem_object *obj, struct drm_file *file_p 
	return ret;

}



static void panfrost_gem_close(struct drm_gem_object *obj, struct drm_file *file_priv)

void panfrost_gem_close(struct drm_gem_object *obj, struct drm_file *file_priv)

{

	struct panfrost_gem_object *bo = to_panfrost_bo(obj);

	struct panfrost_file_priv *priv = file_priv->driver_priv;

drivers/gpu/drm/panfrost/panfrost_gem.h

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv, 
				u32 flags,

				uint32_t *handle);



int panfrost_gem_open(struct drm_gem_object *obj, struct drm_file *file_priv);

void panfrost_gem_close(struct drm_gem_object *obj,

			struct drm_file *file_priv);



void panfrost_gem_shrinker_init(struct drm_device *dev);

void panfrost_gem_shrinker_cleanup(struct drm_device *dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE