Merge tag 'drm/tegra/for-4.10-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next (a77a1ad1) · Commits · 戴 / test

drivers/gpu/drm/tegra/dpaux.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -539,9 +539,9 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
		dpaux->desc.owner = THIS_MODULE;

		dpaux->pinctrl = devm_pinctrl_register(&pdev->dev, &dpaux->desc, dpaux);
		if (!dpaux->pinctrl) {
		if (IS_ERR(dpaux->pinctrl)) {
		dev_err(&pdev->dev, "failed to register pincontrol\n");
		return -ENODEV;
		return PTR_ERR(dpaux->pinctrl);
		}
		#endif
		/* enable and clear all interrupts */

drivers/gpu/drm/tegra/gem.c

+33 −8

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		* NVIDIA Tegra DRM GEM helper functions
		*
		* Copyright (C) 2012 Sascha Hauer, Pengutronix
		* Copyright (C) 2013 NVIDIA CORPORATION, All rights reserved.
		* Copyright (C) 2013-2015 NVIDIA CORPORATION, All rights reserved.
		*
		* Based on the GEM/CMA helpers
		*
		@@ -36,6 +36,8 @@ static dma_addr_t tegra_bo_pin(struct host1x_bo bo, struct sg_table *sgt)
		{
		struct tegra_bo *obj = host1x_to_tegra_bo(bo);

		*sgt = obj->sgt;

		return obj->paddr;
		}

		@@ -47,23 +49,51 @@ static void tegra_bo_mmap(struct host1x_bo bo)
		{
		struct tegra_bo *obj = host1x_to_tegra_bo(bo);

		if (obj->vaddr)
		return obj->vaddr;
		else if (obj->gem.import_attach)
		return dma_buf_vmap(obj->gem.import_attach->dmabuf);
		else
		return vmap(obj->pages, obj->num_pages, VM_MAP,
		pgprot_writecombine(PAGE_KERNEL));
		}

		static void tegra_bo_munmap(struct host1x_bo bo, void addr)
		{
		struct tegra_bo *obj = host1x_to_tegra_bo(bo);

		if (obj->vaddr)
		return;
		else if (obj->gem.import_attach)
		dma_buf_vunmap(obj->gem.import_attach->dmabuf, addr);
		else
		vunmap(addr);
		}

		static void tegra_bo_kmap(struct host1x_bo bo, unsigned int page)
		{
		struct tegra_bo *obj = host1x_to_tegra_bo(bo);

		if (obj->vaddr)
		return obj->vaddr + page * PAGE_SIZE;
		else if (obj->gem.import_attach)
		return dma_buf_kmap(obj->gem.import_attach->dmabuf, page);
		else
		return vmap(obj->pages + page, 1, VM_MAP,
		pgprot_writecombine(PAGE_KERNEL));
		}

		static void tegra_bo_kunmap(struct host1x_bo *bo, unsigned int page,
		void *addr)
		{
		struct tegra_bo *obj = host1x_to_tegra_bo(bo);

		if (obj->vaddr)
		return;
		else if (obj->gem.import_attach)
		dma_buf_kunmap(obj->gem.import_attach->dmabuf, page, addr);
		else
		vunmap(addr);
		}

		static struct host1x_bo tegra_bo_get(struct host1x_bo bo)
		@@ -318,11 +348,6 @@ static struct tegra_bo tegra_bo_import(struct drm_device drm,
		get_dma_buf(buf);

		bo->sgt = dma_buf_map_attachment(attach, DMA_TO_DEVICE);
		if (!bo->sgt) {
		err = -ENOMEM;
		goto detach;
		}

		if (IS_ERR(bo->sgt)) {
		err = PTR_ERR(bo->sgt);
		goto detach;

drivers/gpu/drm/tegra/gr3d.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -268,9 +268,9 @@ static int gr3d_probe(struct platform_device *pdev)

		if (of_device_is_compatible(np, "nvidia,tegra30-gr3d")) {
		gr3d->clk_secondary = devm_clk_get(&pdev->dev, "3d2");
		if (IS_ERR(gr3d->clk)) {
		if (IS_ERR(gr3d->clk_secondary)) {
		dev_err(&pdev->dev, "cannot get secondary clock\n");
		return PTR_ERR(gr3d->clk);
		return PTR_ERR(gr3d->clk_secondary);
		}

		gr3d->rst_secondary = devm_reset_control_get(&pdev->dev,

drivers/gpu/drm/tegra/sor.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -349,8 +349,6 @@ static struct clk tegra_clk_sor_brick_register(struct tegra_sor sor,
		brick->hw.init = &init;

		clk = devm_clk_register(sor->dev, &brick->hw);
		if (IS_ERR(clk))
		kfree(brick);

		return clk;
		}

drivers/gpu/host1x/dev.h

+2 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2013, NVIDIA Corporation.
		* Copyright (c) 2012-2015, NVIDIA Corporation.
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms and conditions of the GNU General Public License,
		@@ -120,6 +120,7 @@ struct host1x {

		struct host1x_syncpt *nop_sp;

		struct mutex syncpt_mutex;
		struct mutex chlist_mutex;
		struct host1x_channel chlist;
		unsigned long allocated_channels;

Admin message