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

Commit 8b955034 authored by Inki Dae's avatar Inki Dae
Browse files

drm/ipp: clean up debug messages 



Print out debug messages with correct device name.

As for this, this patch adds device pointer to exynos_drm_ipp structure,
and in case of exynos_drm_ipp_task structure, replace drm_device pointer
with device one. This will make each ipp driver to print out debug
messages with correct device name.

Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent df90a64e

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+3 −2
Original line number Diff line number Diff line
@@ -1134,9 +1134,10 @@ static int fimc_bind(struct device *dev, struct device *master, void *data) 
	struct exynos_drm_ipp *ipp = &ctx->ipp;



	ctx->drm_dev = drm_dev;

	ipp->drm_dev = drm_dev;

	exynos_drm_register_dma(drm_dev, dev);



	exynos_drm_ipp_register(drm_dev, ipp, &ipp_funcs,

	exynos_drm_ipp_register(dev, ipp, &ipp_funcs,

			DRM_EXYNOS_IPP_CAP_CROP | DRM_EXYNOS_IPP_CAP_ROTATE |

			DRM_EXYNOS_IPP_CAP_SCALE | DRM_EXYNOS_IPP_CAP_CONVERT,

			ctx->formats, ctx->num_formats, "fimc");
@@ -1153,7 +1154,7 @@ static void fimc_unbind(struct device *dev, struct device *master, 
	struct drm_device *drm_dev = data;

	struct exynos_drm_ipp *ipp = &ctx->ipp;



	exynos_drm_ipp_unregister(drm_dev, ipp);

	exynos_drm_ipp_unregister(dev, ipp);

	exynos_drm_unregister_dma(drm_dev, dev);

}

drivers/gpu/drm/exynos/exynos_drm_gsc.c

+3 −2
Original line number Diff line number Diff line
@@ -1169,10 +1169,11 @@ static int gsc_bind(struct device *dev, struct device *master, void *data) 
	struct drm_device *drm_dev = data;

	struct exynos_drm_ipp *ipp = &ctx->ipp;



	ctx->drm_dev = drm_dev;

	ctx->drm_dev = drm_dev;

	exynos_drm_register_dma(drm_dev, dev);



	exynos_drm_ipp_register(drm_dev, ipp, &ipp_funcs,

	exynos_drm_ipp_register(dev, ipp, &ipp_funcs,

			DRM_EXYNOS_IPP_CAP_CROP | DRM_EXYNOS_IPP_CAP_ROTATE |

			DRM_EXYNOS_IPP_CAP_SCALE | DRM_EXYNOS_IPP_CAP_CONVERT,

			ctx->formats, ctx->num_formats, "gsc");
@@ -1189,7 +1190,7 @@ static void gsc_unbind(struct device *dev, struct device *master, 
	struct drm_device *drm_dev = data;

	struct exynos_drm_ipp *ipp = &ctx->ipp;



	exynos_drm_ipp_unregister(drm_dev, ipp);

	exynos_drm_ipp_unregister(dev, ipp);

	exynos_drm_unregister_dma(drm_dev, dev);

}

drivers/gpu/drm/exynos/exynos_drm_ipp.c

+23 −23
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static LIST_HEAD(ipp_list); 
 * Returns:

 * Zero on success, error code on failure.

 */

int exynos_drm_ipp_register(struct drm_device *dev, struct exynos_drm_ipp *ipp,

int exynos_drm_ipp_register(struct device *dev, struct exynos_drm_ipp *ipp,

		const struct exynos_drm_ipp_funcs *funcs, unsigned int caps,

		const struct exynos_drm_ipp_formats *formats,

		unsigned int num_formats, const char *name)
@@ -67,7 +67,7 @@ int exynos_drm_ipp_register(struct drm_device *dev, struct exynos_drm_ipp *ipp, 
	list_add_tail(&ipp->head, &ipp_list);

	ipp->id = num_ipp++;



	DRM_DEV_DEBUG_DRIVER(dev->dev, "Registered ipp %d\n", ipp->id);

	DRM_DEV_DEBUG_DRIVER(dev, "Registered ipp %d\n", ipp->id);



	return 0;

}
@@ -77,7 +77,7 @@ int exynos_drm_ipp_register(struct drm_device *dev, struct exynos_drm_ipp *ipp, 
 * @dev: DRM device

 * @ipp: ipp module

 */

void exynos_drm_ipp_unregister(struct drm_device *dev,

void exynos_drm_ipp_unregister(struct device *dev,

			       struct exynos_drm_ipp *ipp)

{

	WARN_ON(ipp->task);
@@ -268,7 +268,7 @@ static inline struct exynos_drm_ipp_task * 
	task->src.rect.h = task->dst.rect.h = UINT_MAX;

	task->transform.rotation = DRM_MODE_ROTATE_0;



	DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "Allocated task %pK\n", task);

	DRM_DEV_DEBUG_DRIVER(task->dev, "Allocated task %pK\n", task);



	return task;

}
@@ -335,7 +335,7 @@ static int exynos_drm_ipp_task_set(struct exynos_drm_ipp_task *task, 
		size -= map[i].size;

	}



	DRM_DEV_DEBUG_DRIVER(task->dev->dev,

	DRM_DEV_DEBUG_DRIVER(task->dev,

			     "Got task %pK configuration from userspace\n",

			     task);

	return 0;
@@ -391,12 +391,12 @@ static void exynos_drm_ipp_task_release_buf(struct exynos_drm_ipp_buffer *buf) 
static void exynos_drm_ipp_task_free(struct exynos_drm_ipp *ipp,

				 struct exynos_drm_ipp_task *task)

{

	DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "Freeing task %pK\n", task);

	DRM_DEV_DEBUG_DRIVER(task->dev, "Freeing task %pK\n", task);



	exynos_drm_ipp_task_release_buf(&task->src);

	exynos_drm_ipp_task_release_buf(&task->dst);

	if (task->event)

		drm_event_cancel_free(ipp->dev, &task->event->base);

		drm_event_cancel_free(ipp->drm_dev, &task->event->base);

	kfree(task);

}
@@ -555,7 +555,7 @@ static int exynos_drm_ipp_check_format(struct exynos_drm_ipp_task *task, 
			       buf == src ? DRM_EXYNOS_IPP_FORMAT_SOURCE :

					    DRM_EXYNOS_IPP_FORMAT_DESTINATION);

	if (!fmt) {

		DRM_DEV_DEBUG_DRIVER(task->dev->dev,

		DRM_DEV_DEBUG_DRIVER(task->dev,

				     "Task %pK: %s format not supported\n",

				     task, buf == src ? "src" : "dst");

		return -EINVAL;
@@ -606,7 +606,7 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task) 
	bool rotate = (rotation != DRM_MODE_ROTATE_0);

	bool scale = false;



	DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "Checking task %pK\n", task);

	DRM_DEV_DEBUG_DRIVER(task->dev, "Checking task %pK\n", task);



	if (src->rect.w == UINT_MAX)

		src->rect.w = src->buf.width;
@@ -621,7 +621,7 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task) 
	    src->rect.y + src->rect.h > (src->buf.height) ||

	    dst->rect.x + dst->rect.w > (dst->buf.width) ||

	    dst->rect.y + dst->rect.h > (dst->buf.height)) {

		DRM_DEV_DEBUG_DRIVER(ipp->dev->dev,

		DRM_DEV_DEBUG_DRIVER(task->dev,

				     "Task %pK: defined area is outside provided buffers\n",

				     task);

		return -EINVAL;
@@ -639,7 +639,7 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task) 
	    (!(ipp->capabilities & DRM_EXYNOS_IPP_CAP_SCALE) && scale) ||

	    (!(ipp->capabilities & DRM_EXYNOS_IPP_CAP_CONVERT) &&

	     src->buf.fourcc != dst->buf.fourcc)) {

		DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "Task %pK: hw capabilities exceeded\n",

		DRM_DEV_DEBUG_DRIVER(task->dev, "Task %pK: hw capabilities exceeded\n",

				     task);

		return -EINVAL;

	}
@@ -652,7 +652,7 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task) 
	if (ret)

		return ret;



	DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "Task %pK: all checks done.\n",

	DRM_DEV_DEBUG_DRIVER(ipp->dev, "Task %pK: all checks done.\n",

			     task);



	return ret;
@@ -664,25 +664,25 @@ static int exynos_drm_ipp_task_setup_buffers(struct exynos_drm_ipp_task *task, 
	struct exynos_drm_ipp_buffer *src = &task->src, *dst = &task->dst;

	int ret = 0;



	DRM_DEV_DEBUG_DRIVER(task->dev->dev, "Setting buffer for task %pK\n",

	DRM_DEV_DEBUG_DRIVER(task->dev, "Setting buffer for task %pK\n",

			     task);



	ret = exynos_drm_ipp_task_setup_buffer(src, filp);

	if (ret) {

		DRM_DEV_DEBUG_DRIVER(task->dev->dev,

		DRM_DEV_DEBUG_DRIVER(task->dev,

				     "Task %pK: src buffer setup failed\n",

				     task);

		return ret;

	}

	ret = exynos_drm_ipp_task_setup_buffer(dst, filp);

	if (ret) {

		DRM_DEV_DEBUG_DRIVER(task->dev->dev,

		DRM_DEV_DEBUG_DRIVER(task->dev,

				     "Task %pK: dst buffer setup failed\n",

				     task);

		return ret;

	}



	DRM_DEV_DEBUG_DRIVER(task->dev->dev, "Task %pK: buffers prepared.\n",

	DRM_DEV_DEBUG_DRIVER(task->dev, "Task %pK: buffers prepared.\n",

			     task);



	return ret;
@@ -703,7 +703,7 @@ static int exynos_drm_ipp_event_create(struct exynos_drm_ipp_task *task, 
	e->event.base.length = sizeof(e->event);

	e->event.user_data = user_data;



	ret = drm_event_reserve_init(task->dev, file_priv, &e->base,

	ret = drm_event_reserve_init(task->ipp->drm_dev, file_priv, &e->base,

				     &e->event.base);

	if (ret)

		goto free;
@@ -724,7 +724,7 @@ static void exynos_drm_ipp_event_send(struct exynos_drm_ipp_task *task) 
	task->event->event.tv_usec = now.tv_nsec / NSEC_PER_USEC;

	task->event->event.sequence = atomic_inc_return(&task->ipp->sequence);



	drm_send_event(task->dev, &task->event->base);

	drm_send_event(task->ipp->drm_dev, &task->event->base);

}



static int exynos_drm_ipp_task_cleanup(struct exynos_drm_ipp_task *task)
@@ -761,7 +761,7 @@ void exynos_drm_ipp_task_done(struct exynos_drm_ipp_task *task, int ret) 
	struct exynos_drm_ipp *ipp = task->ipp;

	unsigned long flags;



	DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "ipp: %d, task %pK done: %d\n",

	DRM_DEV_DEBUG_DRIVER(task->dev, "ipp: %d, task %pK done: %d\n",

			     ipp->id, task, ret);



	spin_lock_irqsave(&ipp->lock, flags);
@@ -786,7 +786,7 @@ static void exynos_drm_ipp_next_task(struct exynos_drm_ipp *ipp) 
	unsigned long flags;

	int ret;



	DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "ipp: %d, try to run new task\n",

	DRM_DEV_DEBUG_DRIVER(ipp->dev, "ipp: %d, try to run new task\n",

			     ipp->id);



	spin_lock_irqsave(&ipp->lock, flags);
@@ -803,7 +803,7 @@ static void exynos_drm_ipp_next_task(struct exynos_drm_ipp *ipp) 


	spin_unlock_irqrestore(&ipp->lock, flags);



	DRM_DEV_DEBUG_DRIVER(ipp->dev->dev,

	DRM_DEV_DEBUG_DRIVER(ipp->dev,

			     "ipp: %d, selected task %pK to run\n", ipp->id,

			     task);
@@ -913,7 +913,7 @@ int exynos_drm_ipp_commit_ioctl(struct drm_device *dev, void *data, 
	 * then freed after exynos_drm_ipp_task_done()

	 */

	if (arg->flags & DRM_EXYNOS_IPP_FLAG_NONBLOCK) {

		DRM_DEV_DEBUG_DRIVER(dev->dev,

		DRM_DEV_DEBUG_DRIVER(ipp->dev,

				     "ipp: %d, nonblocking processing task %pK\n",

				     ipp->id, task);
@@ -921,7 +921,7 @@ int exynos_drm_ipp_commit_ioctl(struct drm_device *dev, void *data, 
		exynos_drm_ipp_schedule_task(task->ipp, task);

		ret = 0;

	} else {

		DRM_DEV_DEBUG_DRIVER(dev->dev, "ipp: %d, processing task %pK\n",

		DRM_DEV_DEBUG_DRIVER(ipp->dev, "ipp: %d, processing task %pK\n",

				     ipp->id, task);

		exynos_drm_ipp_schedule_task(ipp, task);

		ret = wait_event_interruptible(ipp->done_wq,

drivers/gpu/drm/exynos/exynos_drm_ipp.h

+5 −4
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ struct exynos_drm_ipp_funcs { 
 * struct exynos_drm_ipp - central picture processor module structure

 */

struct exynos_drm_ipp {

	struct drm_device *dev;

	struct drm_device *drm_dev;

	struct device *dev;

	struct list_head head;

	unsigned int id;
@@ -85,7 +86,7 @@ struct exynos_drm_ipp_buffer { 
 * has to be performed by the picture processor hardware module

 */

struct exynos_drm_ipp_task {

	struct drm_device *dev;

	struct device *dev;

	struct exynos_drm_ipp *ipp;

	struct list_head head;
@@ -129,11 +130,11 @@ struct exynos_drm_ipp_formats { 
#define IPP_SCALE_LIMIT(val...)		\

	.type = (DRM_EXYNOS_IPP_LIMIT_TYPE_SCALE), val



int exynos_drm_ipp_register(struct drm_device *dev, struct exynos_drm_ipp *ipp,

int exynos_drm_ipp_register(struct device *dev, struct exynos_drm_ipp *ipp,

		const struct exynos_drm_ipp_funcs *funcs, unsigned int caps,

		const struct exynos_drm_ipp_formats *formats,

		unsigned int num_formats, const char *name);

void exynos_drm_ipp_unregister(struct drm_device *dev,

void exynos_drm_ipp_unregister(struct device *dev,

			       struct exynos_drm_ipp *ipp);



void exynos_drm_ipp_task_done(struct exynos_drm_ipp_task *task, int ret);

drivers/gpu/drm/exynos/exynos_drm_rotator.c

+3 −3
Original line number Diff line number Diff line
@@ -243,9 +243,10 @@ static int rotator_bind(struct device *dev, struct device *master, void *data) 
	struct exynos_drm_ipp *ipp = &rot->ipp;



	rot->drm_dev = drm_dev;

	ipp->drm_dev = drm_dev;

	exynos_drm_register_dma(drm_dev, dev);



	exynos_drm_ipp_register(drm_dev, ipp, &ipp_funcs,

	exynos_drm_ipp_register(dev, ipp, &ipp_funcs,

			   DRM_EXYNOS_IPP_CAP_CROP | DRM_EXYNOS_IPP_CAP_ROTATE,

			   rot->formats, rot->num_formats, "rotator");
@@ -258,10 +259,9 @@ static void rotator_unbind(struct device *dev, struct device *master, 
			void *data)

{

	struct rot_context *rot = dev_get_drvdata(dev);

	struct drm_device *drm_dev = data;

	struct exynos_drm_ipp *ipp = &rot->ipp;



	exynos_drm_ipp_unregister(drm_dev, ipp);

	exynos_drm_ipp_unregister(dev, ipp);

	exynos_drm_unregister_dma(rot->drm_dev, rot->dev);

}