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

Commit 2757de4c authored Jul 16, 2018 by Dave Airlie

Merge tag 'drm/tegra/for-4.18-rc5' of git://anongit.freedesktop.org/tegra/linux into drm-fixes



drm/tegra: Fixes for v4.18-rc5

This contains a couple of one- or two-line fixes for various minor
issues in the Tegra driver.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180712070142.15571-1-thierry.reding@gmail.com

parents e2800577 5265f033

drivers/gpu/drm/tegra/drm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -398,7 +398,7 @@ int tegra_drm_submit(struct tegra_drm_context *context,
		* unaligned offset is malformed and cause commands stream
		* corruption on the buffer address relocation.
		*/
		if (offset & 3 \|\| offset >= obj->gem.size) {
		if (offset & 3 \|\| offset > obj->gem.size) {
		err = -EINVAL;
		goto fail;
		}

drivers/gpu/host1x/dev.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -218,6 +218,9 @@ static int host1x_probe(struct platform_device *pdev)
		return err;
		}

		if (IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL))
		goto skip_iommu;

		host->group = iommu_group_get(&pdev->dev);
		if (host->group) {
		struct iommu_domain_geometry *geometry;

drivers/gpu/host1x/job.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -569,7 +569,8 @@ void host1x_job_unpin(struct host1x_job *job)
		for (i = 0; i < job->num_unpins; i++) {
		struct host1x_job_unpin_data *unpin = &job->unpins[i];

		if (!IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL) && host->domain) {
		if (!IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL) &&
		unpin->size && host->domain) {
		iommu_unmap(host->domain, job->addr_phys[i],
		unpin->size);
		free_iova(&host->iova,