Commit 2a8cb489 authored by Joonyoung Shim's avatar Joonyoung Shim Committed by Inki Dae
Browse files

drm/exynos: merge exynos_drm_buf.c to exynos_drm_gem.c 



The struct exynos_drm_gem_obj can have fields of the struct
exynos_drm_gem_buf then don't need to use exynos_drm_buf.c file.

Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 01ed50dd

drivers/gpu/drm/exynos/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/exynos

exynosdrm-y := exynos_drm_drv.o exynos_drm_crtc.o exynos_drm_fbdev.o \

		exynos_drm_fb.o exynos_drm_buf.o exynos_drm_gem.o \

		exynos_drm_core.o exynos_drm_plane.o

		exynos_drm_fb.o exynos_drm_gem.o exynos_drm_core.o \

		exynos_drm_plane.o



exynosdrm-$(CONFIG_DRM_EXYNOS_IOMMU) += exynos_drm_iommu.o

exynosdrm-$(CONFIG_DRM_EXYNOS_FIMD)	+= exynos_drm_fimd.o

drivers/gpu/drm/exynos/exynos_drm_buf.c

deleted100644 → 0
+0 −170
Original line number Diff line number Diff line 
/* exynos_drm_buf.c

 *

 * Copyright (c) 2011 Samsung Electronics Co., Ltd.

 * Author: Inki Dae <inki.dae@samsung.com>

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */



#include <drm/drmP.h>

#include <drm/exynos_drm.h>



#include "exynos_drm_drv.h"

#include "exynos_drm_gem.h"

#include "exynos_drm_buf.h"

#include "exynos_drm_iommu.h"



static int lowlevel_buffer_allocate(struct drm_device *dev,

		unsigned int flags, struct exynos_drm_gem_buf *buf)

{

	int ret = 0;

	enum dma_attr attr;

	unsigned int nr_pages;



	if (buf->dma_addr) {

		DRM_DEBUG_KMS("already allocated.\n");

		return 0;

	}



	init_dma_attrs(&buf->dma_attrs);



	/*

	 * if EXYNOS_BO_CONTIG, fully physically contiguous memory

	 * region will be allocated else physically contiguous

	 * as possible.

	 */

	if (!(flags & EXYNOS_BO_NONCONTIG))

		dma_set_attr(DMA_ATTR_FORCE_CONTIGUOUS, &buf->dma_attrs);



	/*

	 * if EXYNOS_BO_WC or EXYNOS_BO_NONCACHABLE, writecombine mapping

	 * else cachable mapping.

	 */

	if (flags & EXYNOS_BO_WC || !(flags & EXYNOS_BO_CACHABLE))

		attr = DMA_ATTR_WRITE_COMBINE;

	else

		attr = DMA_ATTR_NON_CONSISTENT;



	dma_set_attr(attr, &buf->dma_attrs);

	dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &buf->dma_attrs);



	nr_pages = buf->size >> PAGE_SHIFT;



	if (!is_drm_iommu_supported(dev)) {

		dma_addr_t start_addr;

		unsigned int i = 0;



		buf->pages = drm_calloc_large(nr_pages, sizeof(struct page *));

		if (!buf->pages) {

			DRM_ERROR("failed to allocate pages.\n");

			return -ENOMEM;

		}



		buf->cookie = dma_alloc_attrs(dev->dev,

					buf->size,

					&buf->dma_addr, GFP_KERNEL,

					&buf->dma_attrs);

		if (!buf->cookie) {

			DRM_ERROR("failed to allocate buffer.\n");

			ret = -ENOMEM;

			goto err_free;

		}



		start_addr = buf->dma_addr;

		while (i < nr_pages) {

			buf->pages[i] = phys_to_page(start_addr);

			start_addr += PAGE_SIZE;

			i++;

		}

	} else {



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

					&buf->dma_addr, GFP_KERNEL,

					&buf->dma_attrs);

		if (!buf->pages) {

			DRM_ERROR("failed to allocate buffer.\n");

			return -ENOMEM;

		}

	}



	DRM_DEBUG_KMS("dma_addr(0x%lx), size(0x%lx)\n",

			(unsigned long)buf->dma_addr,

			buf->size);



	return ret;



err_free:

	if (!is_drm_iommu_supported(dev))

		drm_free_large(buf->pages);



	return ret;

}



static void lowlevel_buffer_deallocate(struct drm_device *dev,

		unsigned int flags, struct exynos_drm_gem_buf *buf)

{

	if (!buf->dma_addr) {

		DRM_DEBUG_KMS("dma_addr is invalid.\n");

		return;

	}



	DRM_DEBUG_KMS("dma_addr(0x%lx), size(0x%lx)\n",

			(unsigned long)buf->dma_addr,

			buf->size);



	if (!is_drm_iommu_supported(dev)) {

		dma_free_attrs(dev->dev, buf->size, buf->cookie,

				(dma_addr_t)buf->dma_addr, &buf->dma_attrs);

		drm_free_large(buf->pages);

	} else

		dma_free_attrs(dev->dev, buf->size, buf->pages,

				(dma_addr_t)buf->dma_addr, &buf->dma_attrs);



	buf->dma_addr = (dma_addr_t)NULL;

}



struct exynos_drm_gem_buf *exynos_drm_init_buf(struct drm_device *dev,

						unsigned int size)

{

	struct exynos_drm_gem_buf *buffer;



	DRM_DEBUG_KMS("desired size = 0x%x\n", size);



	buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);

	if (!buffer)

		return NULL;



	buffer->size = size;

	return buffer;

}



void exynos_drm_fini_buf(struct drm_device *dev,

				struct exynos_drm_gem_buf *buffer)

{

	kfree(buffer);

	buffer = NULL;

}



int exynos_drm_alloc_buf(struct drm_device *dev,

		struct exynos_drm_gem_buf *buf, unsigned int flags)

{



	/*

	 * allocate memory region and set the memory information

	 * to vaddr and dma_addr of a buffer object.

	 */

	if (lowlevel_buffer_allocate(dev, flags, buf) < 0)

		return -ENOMEM;



	return 0;

}



void exynos_drm_free_buf(struct drm_device *dev,

		unsigned int flags, struct exynos_drm_gem_buf *buffer)

{



	lowlevel_buffer_deallocate(dev, flags, buffer);

}

drivers/gpu/drm/exynos/exynos_drm_buf.h

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/* exynos_drm_buf.h

 *

 * Copyright (c) 2011 Samsung Electronics Co., Ltd.

 * Author: Inki Dae <inki.dae@samsung.com>

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */



#ifndef _EXYNOS_DRM_BUF_H_

#define _EXYNOS_DRM_BUF_H_



/* create and initialize buffer object. */

struct exynos_drm_gem_buf *exynos_drm_init_buf(struct drm_device *dev,

						unsigned int size);



/* destroy buffer object. */

void exynos_drm_fini_buf(struct drm_device *dev,

				struct exynos_drm_gem_buf *buffer);



/* allocate physical memory region and setup sgt. */

int exynos_drm_alloc_buf(struct drm_device *dev,

				struct exynos_drm_gem_buf *buf,

				unsigned int flags);



/* release physical memory region, and sgt. */

void exynos_drm_free_buf(struct drm_device *dev,

				unsigned int flags,

				struct exynos_drm_gem_buf *buffer);



#endif

drivers/gpu/drm/exynos/exynos_drm_fb.c

+7 −7
Original line number Diff line number Diff line
@@ -238,22 +238,22 @@ err_free: 
	return ERR_PTR(ret);

}



struct exynos_drm_gem_buf *exynos_drm_fb_buffer(struct drm_framebuffer *fb,

struct exynos_drm_gem_obj *exynos_drm_fb_gem_obj(struct drm_framebuffer *fb,

						 int index)

{

	struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb);

	struct exynos_drm_gem_buf *buffer;

	struct exynos_drm_gem_obj *obj;



	if (index >= MAX_FB_BUFFER)

		return NULL;



	buffer = exynos_fb->exynos_gem_obj[index]->buffer;

	if (!buffer)

	obj = exynos_fb->exynos_gem_obj[index];

	if (!obj)

		return NULL;



	DRM_DEBUG_KMS("dma_addr = 0x%lx\n", (unsigned long)buffer->dma_addr);

	DRM_DEBUG_KMS("dma_addr = 0x%lx\n", (unsigned long)obj->dma_addr);



	return buffer;

	return obj;

}



static void exynos_drm_output_poll_changed(struct drm_device *dev)

drivers/gpu/drm/exynos/exynos_drm_fb.h

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ exynos_drm_framebuffer_init(struct drm_device *dev, 
			    struct drm_mode_fb_cmd2 *mode_cmd,

			    struct drm_gem_object *obj);



/* get memory information of a drm framebuffer */

struct exynos_drm_gem_buf *exynos_drm_fb_buffer(struct drm_framebuffer *fb,

/* get gem object of a drm framebuffer */

struct exynos_drm_gem_obj *exynos_drm_fb_gem_obj(struct drm_framebuffer *fb,

						 int index);



void exynos_drm_mode_config_init(struct drm_device *dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE