diff options
| author | Andrzej Hajda <a.hajda@samsung.com> | 2014-08-28 11:07:27 +0200 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 12:00:45 +0900 |
| commit | 75a9825a211d179812d43e17be09b5b9e4ddacbf (patch) | |
| tree | 8c6d735dc295d5d52a893192e968bbafb2032a51 /drivers/gpu/drm | |
| parent | c4ddd512d116c53ac7fe2138a2bf0322a2eaa555 (diff) | |
| download | linux-3.10-75a9825a211d179812d43e17be09b5b9e4ddacbf.tar.gz linux-3.10-75a9825a211d179812d43e17be09b5b9e4ddacbf.tar.bz2 linux-3.10-75a9825a211d179812d43e17be09b5b9e4ddacbf.zip | |
drm/exynos/ipp: move file reference from memory to command node
Command node should contain file reference to distinguish commands
created by different processes.
Change-Id: I98938d16d323a5f83614ae87c84485f8fa4efc69
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>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_ipp.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_ipp.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c index 6eec2c9f8da..0915d80277e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c @@ -76,7 +76,6 @@ struct drm_exynos_ipp_mem_node { u32 prop_id; u32 buf_id; struct drm_exynos_ipp_buf_info buf_info; - struct drm_file *filp; }; /* @@ -498,6 +497,7 @@ int exynos_drm_ipp_set_property(struct drm_device *drm_dev, void *data, c_node->priv = priv; c_node->property = *property; c_node->state = IPP_STATE_IDLE; + c_node->filp = file; c_node->start_work = ipp_create_cmd_work(); if (IS_ERR(c_node->start_work)) { @@ -744,7 +744,6 @@ static struct drm_exynos_ipp_mem_node } } - m_node->filp = file; m_node->buf_info = buf_info; list_add_tail(&m_node->list, &c_node->mem_list[qbuf->ops_id]); @@ -785,7 +784,7 @@ static int ipp_put_mem_node(struct drm_device *drm_dev, unsigned long handle = m_node->buf_info.handles[i]; if (handle) exynos_drm_gem_put_dma_addr(drm_dev, handle, - m_node->filp); + c_node->filp); } /* delete list in queue */ diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.h b/drivers/gpu/drm/exynos/exynos_drm_ipp.h index 84e2b3aa634..ad15f287c31 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.h +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.h @@ -58,6 +58,7 @@ struct drm_exynos_ipp_cmd_work { * @stop_work: stop command work structure. * @event_work: event work structure. * @state: state of command node. + * @filp: associated file pointer. */ struct drm_exynos_ipp_cmd_node { struct exynos_drm_ipp_private *priv; @@ -74,6 +75,7 @@ struct drm_exynos_ipp_cmd_node { struct drm_exynos_ipp_cmd_work *stop_work; struct drm_exynos_ipp_event_work *event_work; enum drm_exynos_ipp_state state; + struct drm_file *filp; }; /* |