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

Commit dbc4a5b8 authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie
Browse files

drm/ttm: Remove mm init error printouts and checks 



Replace with BUG_ON(). These error messages remained from the time
when TTM was initialized from user-space. Nowadays hitting one of those
is really a kernel bug.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 6e4c55db

drivers/gpu/drm/ttm/ttm_bo.c

+2 −18
Original line number Diff line number Diff line
@@ -1354,18 +1354,9 @@ int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type, 
	int ret = -EINVAL;

	struct ttm_mem_type_manager *man;



	if (type >= TTM_NUM_MEM_TYPES) {

		printk(KERN_ERR TTM_PFX "Illegal memory type %d\n", type);

		return ret;

	}



	BUG_ON(type >= TTM_NUM_MEM_TYPES);

	man = &bdev->man[type];

	if (man->has_type) {

		printk(KERN_ERR TTM_PFX

		       "Memory manager already initialized for type %d\n",

		       type);

		return ret;

	}

	BUG_ON(man->has_type);



	ret = bdev->driver->init_mem_type(bdev, type, man);

	if (ret)
@@ -1374,13 +1365,6 @@ int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type, 


	ret = 0;

	if (type != TTM_PL_SYSTEM) {

		if (!p_size) {

			printk(KERN_ERR TTM_PFX

			       "Zero size memory manager type %d\n",

			       type);

			return ret;

		}



		ret = (*man->func->init)(man, p_size);

		if (ret)

			return ret;