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

Commit 9808cc94 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'exynos-drm-fixes' of... 

Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes

Just small fixes, and code cleanups.

* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: fix return value check in lowlevel_buffer_allocate()
  drm/exynos: Fix address space warnings in exynos_drm_fbdev.c
  drm/exynos: Fix address space warning in exynos_drm_buf.c
  drm/exynos: Remove redundant OF dependency
parents 8e1f80c0 662bb699

drivers/gpu/drm/exynos/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ config DRM_EXYNOS_IPP 


config DRM_EXYNOS_FIMC

	bool "Exynos DRM FIMC"

	depends on DRM_EXYNOS_IPP && MFD_SYSCON && OF

	depends on DRM_EXYNOS_IPP && MFD_SYSCON

	help

	  Choose this option if you want to use Exynos FIMC for DRM.

drivers/gpu/drm/exynos/exynos_drm_buf.c

+4 −3
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ static int lowlevel_buffer_allocate(struct drm_device *dev, 
			return -ENOMEM;

		}



		buf->kvaddr = dma_alloc_attrs(dev->dev, buf->size,

		buf->kvaddr = (void __iomem *)dma_alloc_attrs(dev->dev,

					buf->size,

					&buf->dma_addr, GFP_KERNEL,

					&buf->dma_attrs);

		if (!buf->kvaddr) {
@@ -90,9 +91,9 @@ static int lowlevel_buffer_allocate(struct drm_device *dev, 
	}



	buf->sgt = drm_prime_pages_to_sg(buf->pages, nr_pages);

	if (!buf->sgt) {

	if (IS_ERR(buf->sgt)) {

		DRM_ERROR("failed to get sg table.\n");

		ret = -ENOMEM;

		ret = PTR_ERR(buf->sgt);

		goto err_free_attrs;

	}

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+3 −2
Original line number Diff line number Diff line
@@ -99,12 +99,13 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper, 
		if (is_drm_iommu_supported(dev)) {

			unsigned int nr_pages = buffer->size >> PAGE_SHIFT;



			buffer->kvaddr = vmap(buffer->pages, nr_pages, VM_MAP,

			buffer->kvaddr = (void __iomem *) vmap(buffer->pages,

					nr_pages, VM_MAP,

					pgprot_writecombine(PAGE_KERNEL));

		} else {

			phys_addr_t dma_addr = buffer->dma_addr;

			if (dma_addr)

				buffer->kvaddr = phys_to_virt(dma_addr);

				buffer->kvaddr = (void __iomem *)phys_to_virt(dma_addr);

			else

				buffer->kvaddr = (void __iomem *)NULL;

		}