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

Commit 5b370979 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Gerd Hoffmann
Browse files

drm/ast: Convert AST driver to |struct drm_gem_vram_object| 



The data structure |struct drm_gem_vram_object| and its helpers replace
|struct ast_bo|. It's the same implementation; except for the type names.

v4:
	* cleanups from checkpatch.pl

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20190508082630.15116-10-tzimmermann@suse.de


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 59f5989a

drivers/gpu/drm/ast/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ config DRM_AST 
	depends on DRM && PCI && MMU

	select DRM_TTM

	select DRM_KMS_HELPER

	select DRM_TTM

	select DRM_VRAM_HELPER

	help

	 Say yes for experimental AST GPU driver. Do not enable

	 this driver without having a working -modesetting,

drivers/gpu/drm/ast/ast_drv.c

+3 −2
Original line number Diff line number Diff line
@@ -228,9 +228,10 @@ static struct drm_driver driver = { 
	.minor = DRIVER_MINOR,

	.patchlevel = DRIVER_PATCHLEVEL,



	.gem_free_object_unlocked = ast_gem_free_object,

	.gem_free_object_unlocked =

		drm_gem_vram_driver_gem_free_object_unlocked,

	.dumb_create = ast_dumb_create,

	.dumb_map_offset = ast_dumb_mmap_offset,

	.dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset,



};

drivers/gpu/drm/ast/ast_drv.h

+1 −51
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <drm/ttm/ttm_module.h>



#include <drm/drm_gem.h>

#include <drm/drm_gem_vram_helper.h>



#include <linux/i2c.h>

#include <linux/i2c-algo-bit.h>
@@ -321,25 +322,6 @@ void ast_fbdev_fini(struct drm_device *dev); 
void ast_fbdev_set_suspend(struct drm_device *dev, int state);

void ast_fbdev_set_base(struct ast_private *ast, unsigned long gpu_addr);



struct ast_bo {

	struct ttm_buffer_object bo;

	struct ttm_placement placement;

	struct ttm_bo_kmap_obj kmap;

	struct drm_gem_object gem;

	struct ttm_place placements[3];

	int pin_count;

};

#define gem_to_ast_bo(gobj) container_of((gobj), struct ast_bo, gem)



static inline struct ast_bo *

ast_bo(struct ttm_buffer_object *bo)

{

	return container_of(bo, struct ast_bo, bo);

}





#define to_ast_obj(x) container_of(x, struct ast_gem_object, base)



#define AST_MM_ALIGN_SHIFT 4

#define AST_MM_ALIGN_MASK ((1 << AST_MM_ALIGN_SHIFT) - 1)
@@ -347,45 +329,13 @@ extern int ast_dumb_create(struct drm_file *file, 
			   struct drm_device *dev,

			   struct drm_mode_create_dumb *args);



extern void ast_gem_free_object(struct drm_gem_object *obj);

extern int ast_dumb_mmap_offset(struct drm_file *file,

				struct drm_device *dev,

				uint32_t handle,

				uint64_t *offset);



int ast_mm_init(struct ast_private *ast);

void ast_mm_fini(struct ast_private *ast);



int ast_bo_create(struct drm_device *dev, int size, int align,

		  uint32_t flags, struct ast_bo **pastbo);



int ast_gem_create(struct drm_device *dev,

		   u32 size, bool iskernel,

		   struct drm_gem_object **obj);



int ast_bo_pin(struct ast_bo *bo, u32 pl_flag, u64 *gpu_addr);

int ast_bo_unpin(struct ast_bo *bo);



static inline int ast_bo_reserve(struct ast_bo *bo, bool no_wait)

{

	int ret;



	ret = ttm_bo_reserve(&bo->bo, true, no_wait, NULL);

	if (ret) {

		if (ret != -ERESTARTSYS && ret != -EBUSY)

			DRM_ERROR("reserve failed %p\n", bo);

		return ret;

	}

	return 0;

}



static inline void ast_bo_unreserve(struct ast_bo *bo)

{

	ttm_bo_unreserve(&bo->bo);

}



void ast_ttm_placement(struct ast_bo *bo, int domain);

int ast_bo_push_sysram(struct ast_bo *bo);

int ast_mmap(struct file *filp, struct vm_area_struct *vma);



/* ast post */

drivers/gpu/drm/ast/ast_fb.c

+13 −10
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev, 
{

	int i;

	struct drm_gem_object *obj;

	struct ast_bo *bo;

	struct drm_gem_vram_object *gbo;

	int src_offset, dst_offset;

	int bpp = afbdev->afb.base.format->cpp[0];

	int ret = -EBUSY;
@@ -59,7 +59,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev, 
	unsigned long flags;



	obj = afbdev->afb.obj;

	bo = gem_to_ast_bo(obj);

	gbo = drm_gem_vram_of_gem(obj);



	/*

	 * try and reserve the BO, if we fail with busy
@@ -67,7 +67,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev, 
	 * store up the damage until later.

	 */

	if (drm_can_sleep())

		ret = ast_bo_reserve(bo, true);

		ret = drm_gem_vram_reserve(gbo, true);

	if (ret) {

		if (ret != -EBUSY)

			return;
@@ -101,25 +101,28 @@ static void ast_dirty_update(struct ast_fbdev *afbdev, 
	afbdev->x2 = afbdev->y2 = 0;

	spin_unlock_irqrestore(&afbdev->dirty_lock, flags);



	if (!bo->kmap.virtual) {

		ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap);

	if (!gbo->kmap.virtual) {

		ret = ttm_bo_kmap(&gbo->bo, 0, gbo->bo.num_pages, &gbo->kmap);

		if (ret) {

			DRM_ERROR("failed to kmap fb updates\n");

			ast_bo_unreserve(bo);

			drm_gem_vram_unreserve(gbo);

			return;

		}

		unmap = true;

	}

	for (i = y; i <= y2; i++) {

		/* assume equal stride for now */

		src_offset = dst_offset = i * afbdev->afb.base.pitches[0] + (x * bpp);

		memcpy_toio(bo->kmap.virtual + src_offset, afbdev->sysram + src_offset, (x2 - x + 1) * bpp);

		src_offset = dst_offset =

			i * afbdev->afb.base.pitches[0] + (x * bpp);

		memcpy_toio(gbo->kmap.virtual + src_offset,

			    afbdev->sysram + dst_offset,

			    (x2 - x + 1) * bpp);



	}

	if (unmap)

		ttm_bo_kunmap(&bo->kmap);

		ttm_bo_kunmap(&gbo->kmap);



	ast_bo_unreserve(bo);

	drm_gem_vram_unreserve(gbo);

}



static void ast_fillrect(struct fb_info *info,

drivers/gpu/drm/ast/ast_main.c

+9 −65
Original line number Diff line number Diff line
@@ -593,7 +593,8 @@ int ast_gem_create(struct drm_device *dev, 
		   u32 size, bool iskernel,

		   struct drm_gem_object **obj)

{

	struct ast_bo *astbo;

	struct ast_private *ast = dev->dev_private;

	struct drm_gem_vram_object *gbo;

	int ret;



	*obj = NULL;
@@ -602,13 +603,14 @@ int ast_gem_create(struct drm_device *dev, 
	if (size == 0)

		return -EINVAL;



	ret = ast_bo_create(dev, size, 0, 0, &astbo);

	if (ret) {

	gbo = drm_gem_vram_create(dev, &ast->ttm.bdev, size, 0, false);

	if (IS_ERR(gbo)) {

		ret = PTR_ERR(gbo);

		if (ret != -ERESTARTSYS)

			DRM_ERROR("failed to allocate GEM object\n");

		return ret;

	}

	*obj = &astbo->gem;

	*obj = &gbo->gem;

	return 0;

}
@@ -616,66 +618,8 @@ int ast_dumb_create(struct drm_file *file, 
		    struct drm_device *dev,

		    struct drm_mode_create_dumb *args)

{

	int ret;

	struct drm_gem_object *gobj;

	u32 handle;



	args->pitch = args->width * ((args->bpp + 7) / 8);

	args->size = args->pitch * args->height;



	ret = ast_gem_create(dev, args->size, false,

			     &gobj);

	if (ret)

		return ret;



	ret = drm_gem_handle_create(file, gobj, &handle);

	drm_gem_object_put_unlocked(gobj);

	if (ret)

		return ret;



	args->handle = handle;

	return 0;

}



static void ast_bo_unref(struct ast_bo **bo)

{

	if ((*bo) == NULL)

		return;

	ttm_bo_put(&((*bo)->bo));

	*bo = NULL;

}



void ast_gem_free_object(struct drm_gem_object *obj)

{

	struct ast_bo *ast_bo = gem_to_ast_bo(obj);



	ast_bo_unref(&ast_bo);

}





static inline u64 ast_bo_mmap_offset(struct ast_bo *bo)

{

	return drm_vma_node_offset_addr(&bo->bo.vma_node);

}

int

ast_dumb_mmap_offset(struct drm_file *file,

		     struct drm_device *dev,

		     uint32_t handle,

		     uint64_t *offset)

{

	struct drm_gem_object *obj;

	struct ast_bo *bo;



	obj = drm_gem_object_lookup(file, handle);

	if (obj == NULL)

		return -ENOENT;



	bo = gem_to_ast_bo(obj);

	*offset = ast_bo_mmap_offset(bo);



	drm_gem_object_put_unlocked(obj);



	return 0;

	struct ast_private *ast = dev->dev_private;



	return drm_gem_vram_fill_create_dumb(file, dev, &ast->ttm.bdev, 0,

					     false, args);

}