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

Commit 0e5dc9a8 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm/tegra/for-4.6-rc1' of http://anongit.freedesktop.org/git/tegra/linux into drm-next 

drm/tegra: Changes for v4.6-rc1

Only two cleanups this time around. One fixes reference counting of
device tree nodes, the other changes the return value of a function
from an unsigned int to an int to reflect that it will return error
codes.

* tag 'drm/tegra/for-4.6-rc1' of http://anongit.freedesktop.org/git/tegra/linux:
  gpu: host1x: Use a signed return type for do_relocs()
  gpu: host1x: bus: Add missing of_node_put()
parents 86d65b7e 341917fe

drivers/gpu/host1x/bus.c

+3 −1
Original line number Diff line number Diff line
@@ -83,10 +83,12 @@ static int host1x_device_parse_dt(struct host1x_device *device, 
		if (of_match_node(driver->subdevs, np) &&

		    of_device_is_available(np)) {

			err = host1x_subdev_add(device, np);

			if (err < 0)

			if (err < 0) {

				of_node_put(np);

				return err;

			}

		}

	}



	return 0;

}

drivers/gpu/host1x/job.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static unsigned int pin_job(struct host1x_job *job) 
	return 0;

}



static unsigned int do_relocs(struct host1x_job *job, struct host1x_bo *cmdbuf)

static int do_relocs(struct host1x_job *job, struct host1x_bo *cmdbuf)

{

	int i = 0;

	u32 last_page = ~0;