aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrzej Hajda <a.hajda@samsung.com>2014-09-02 08:55:06 -0400
committerInki Dae <daeinki@gmail.com>2014-09-19 11:56:13 -0400
commitd9b9734c5d2e856d59c074d272a68db91a812857 (patch)
tree68f32e3af4e01ab2d010620cc6fac42ae2775e69
parent20ed715ebb71eba110b08754412bd0bd5b062cbd (diff)
drm/exynos/ipp: remove file argument from node related functions
Since file pointer is preserved in c_node passing it as argument in node functions is redundant. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Reviewed-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_ipp.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index 05f0f4eae7bc..9e9714afca1d 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -529,7 +529,6 @@ static int ipp_put_mem_node(struct drm_device *drm_dev,
529 529
530static struct drm_exynos_ipp_mem_node 530static struct drm_exynos_ipp_mem_node
531 *ipp_get_mem_node(struct drm_device *drm_dev, 531 *ipp_get_mem_node(struct drm_device *drm_dev,
532 struct drm_file *file,
533 struct drm_exynos_ipp_cmd_node *c_node, 532 struct drm_exynos_ipp_cmd_node *c_node,
534 struct drm_exynos_ipp_queue_buf *qbuf) 533 struct drm_exynos_ipp_queue_buf *qbuf)
535{ 534{
@@ -560,7 +559,7 @@ static struct drm_exynos_ipp_mem_node
560 dma_addr_t *addr; 559 dma_addr_t *addr;
561 560
562 addr = exynos_drm_gem_get_dma_addr(drm_dev, 561 addr = exynos_drm_gem_get_dma_addr(drm_dev,
563 qbuf->handle[i], file); 562 qbuf->handle[i], c_node->filp);
564 if (IS_ERR(addr)) { 563 if (IS_ERR(addr)) {
565 DRM_ERROR("failed to get addr.\n"); 564 DRM_ERROR("failed to get addr.\n");
566 ipp_put_mem_node(drm_dev, c_node, m_node); 565 ipp_put_mem_node(drm_dev, c_node, m_node);
@@ -606,7 +605,6 @@ static void ipp_free_event(struct drm_pending_event *event)
606} 605}
607 606
608static int ipp_get_event(struct drm_device *drm_dev, 607static int ipp_get_event(struct drm_device *drm_dev,
609 struct drm_file *file,
610 struct drm_exynos_ipp_cmd_node *c_node, 608 struct drm_exynos_ipp_cmd_node *c_node,
611 struct drm_exynos_ipp_queue_buf *qbuf) 609 struct drm_exynos_ipp_queue_buf *qbuf)
612{ 610{
@@ -618,7 +616,7 @@ static int ipp_get_event(struct drm_device *drm_dev,
618 e = kzalloc(sizeof(*e), GFP_KERNEL); 616 e = kzalloc(sizeof(*e), GFP_KERNEL);
619 if (!e) { 617 if (!e) {
620 spin_lock_irqsave(&drm_dev->event_lock, flags); 618 spin_lock_irqsave(&drm_dev->event_lock, flags);
621 file->event_space += sizeof(e->event); 619 c_node->filp->event_space += sizeof(e->event);
622 spin_unlock_irqrestore(&drm_dev->event_lock, flags); 620 spin_unlock_irqrestore(&drm_dev->event_lock, flags);
623 return -ENOMEM; 621 return -ENOMEM;
624 } 622 }
@@ -630,7 +628,7 @@ static int ipp_get_event(struct drm_device *drm_dev,
630 e->event.prop_id = qbuf->prop_id; 628 e->event.prop_id = qbuf->prop_id;
631 e->event.buf_id[EXYNOS_DRM_OPS_DST] = qbuf->buf_id; 629 e->event.buf_id[EXYNOS_DRM_OPS_DST] = qbuf->buf_id;
632 e->base.event = &e->event.base; 630 e->base.event = &e->event.base;
633 e->base.file_priv = file; 631 e->base.file_priv = c_node->filp;
634 e->base.destroy = ipp_free_event; 632 e->base.destroy = ipp_free_event;
635 mutex_lock(&c_node->event_lock); 633 mutex_lock(&c_node->event_lock);
636 list_add_tail(&e->base.link, &c_node->event_list); 634 list_add_tail(&e->base.link, &c_node->event_list);
@@ -908,7 +906,7 @@ int exynos_drm_ipp_queue_buf(struct drm_device *drm_dev, void *data,
908 switch (qbuf->buf_type) { 906 switch (qbuf->buf_type) {
909 case IPP_BUF_ENQUEUE: 907 case IPP_BUF_ENQUEUE:
910 /* get memory node */ 908 /* get memory node */
911 m_node = ipp_get_mem_node(drm_dev, file, c_node, qbuf); 909 m_node = ipp_get_mem_node(drm_dev, c_node, qbuf);
912 if (IS_ERR(m_node)) { 910 if (IS_ERR(m_node)) {
913 DRM_ERROR("failed to get m_node.\n"); 911 DRM_ERROR("failed to get m_node.\n");
914 return PTR_ERR(m_node); 912 return PTR_ERR(m_node);
@@ -921,7 +919,7 @@ int exynos_drm_ipp_queue_buf(struct drm_device *drm_dev, void *data,
921 */ 919 */
922 if (qbuf->ops_id == EXYNOS_DRM_OPS_DST) { 920 if (qbuf->ops_id == EXYNOS_DRM_OPS_DST) {
923 /* get event for destination buffer */ 921 /* get event for destination buffer */
924 ret = ipp_get_event(drm_dev, file, c_node, qbuf); 922 ret = ipp_get_event(drm_dev, c_node, qbuf);
925 if (ret) { 923 if (ret) {
926 DRM_ERROR("failed to get event.\n"); 924 DRM_ERROR("failed to get event.\n");
927 goto err_clean_node; 925 goto err_clean_node;