drm/tegra: Move fbdev unmap special case (c34a997d) · Commits · 戴 / test

User framebuffers are created with either bo->pages or bo->vaddr set, depending on whether or not an IOMMU is present. On the other hand, the framebuffer created for fbdev emulation has a vaddr mapping made if bo->pages is set after creation. This is set up in fbdev probe. Remove the special case unmapping from the general-purpose framebuffer destroy, and move it to fbdev teardown. Signed-off-by:

Daniel Stone <daniels@collabora.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: linux-tegra@vger.kernel.org Signed-off-by:

Thierry Reding <treding@nvidia.com>

drivers/gpu/drm/tegra/fb.c

+11 −6

Original line number	Diff line number	Diff line
		@@ -99,13 +99,9 @@ static void tegra_fb_destroy(struct drm_framebuffer *framebuffer)
		for (i = 0; i < framebuffer->format->num_planes; i++) {
		struct tegra_bo *bo = tegra_fb_get_plane(framebuffer, i);

		if (bo) {
		if (bo->pages)
		vunmap(bo->vaddr);

		if (bo)
		drm_gem_object_put_unlocked(&bo->gem);
		}
		}

		drm_framebuffer_cleanup(framebuffer);
		kfree(framebuffer);
		@@ -369,8 +365,17 @@ static void tegra_fbdev_exit(struct tegra_fbdev *fbdev)
		{
		drm_fb_helper_unregister_fbi(&fbdev->base);

		if (fbdev->fb)
		if (fbdev->fb) {
		struct tegra_bo *bo = tegra_fb_get_plane(fbdev->fb, 0);

		/* Undo the special mapping we made in fbdev probe. */
		if (bo && bo->pages) {
		vunmap(bo->vaddr);
		bo->vaddr = 0;
		}

		drm_framebuffer_remove(fbdev->fb);
		}

		drm_fb_helper_fini(&fbdev->base);
		tegra_fbdev_free(fbdev);

Admin message