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

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

Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes 

Just two small etnaviv fixes, one fixing a list corruption, the other
fixing a NULL ptr deref in an error path.

* 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux:
  etnaviv: fix gem object list corruption
  etnaviv: fix submit error path
parents f2e29534 51841752

drivers/gpu/drm/etnaviv/etnaviv_gem.c

+3 −0
Original line number Diff line number Diff line
@@ -551,12 +551,15 @@ static const struct etnaviv_gem_ops etnaviv_gem_shmem_ops = { 
void etnaviv_gem_free_object(struct drm_gem_object *obj)

{

	struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);

	struct etnaviv_drm_private *priv = obj->dev->dev_private;

	struct etnaviv_vram_mapping *mapping, *tmp;



	/* object should not be active */

	WARN_ON(is_active(etnaviv_obj));



	mutex_lock(&priv->gem_lock);

	list_del(&etnaviv_obj->gem_node);

	mutex_unlock(&priv->gem_lock);



	list_for_each_entry_safe(mapping, tmp, &etnaviv_obj->vram_list,

				 obj_node) {

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c

+4 −2
Original line number Diff line number Diff line
@@ -445,7 +445,9 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, 
	cmdbuf->user_size = ALIGN(args->stream_size, 8);



	ret = etnaviv_gpu_submit(gpu, submit, cmdbuf);

	if (ret == 0)

	if (ret)

		goto out;



	cmdbuf = NULL;



	if (args->flags & ETNA_SUBMIT_FENCE_FD_OUT) {