Commit 7259c3d6 authored by Eunchul Kim's avatar Eunchul Kim Committed by Inki Dae

drm/exynos: change member variable name.

This patch change current command name from cmd to c_node.
because we are using the member name, 'cmd', for command control ioctl in another structure.
so, this patch changes it to c_node to avoid such confusing.
Signed-off-by: default avatarEunchul Kim <chulspro.kim@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 694be458
...@@ -695,7 +695,7 @@ static int fimc_src_set_addr(struct device *dev, ...@@ -695,7 +695,7 @@ static int fimc_src_set_addr(struct device *dev,
{ {
struct fimc_context *ctx = get_fimc_context(dev); struct fimc_context *ctx = get_fimc_context(dev);
struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv;
struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node;
struct drm_exynos_ipp_property *property; struct drm_exynos_ipp_property *property;
struct drm_exynos_ipp_config *config; struct drm_exynos_ipp_config *config;
...@@ -1231,7 +1231,7 @@ static int fimc_dst_set_addr(struct device *dev, ...@@ -1231,7 +1231,7 @@ static int fimc_dst_set_addr(struct device *dev,
{ {
struct fimc_context *ctx = get_fimc_context(dev); struct fimc_context *ctx = get_fimc_context(dev);
struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv;
struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node;
struct drm_exynos_ipp_property *property; struct drm_exynos_ipp_property *property;
struct drm_exynos_ipp_config *config; struct drm_exynos_ipp_config *config;
...@@ -1317,7 +1317,7 @@ static irqreturn_t fimc_irq_handler(int irq, void *dev_id) ...@@ -1317,7 +1317,7 @@ static irqreturn_t fimc_irq_handler(int irq, void *dev_id)
{ {
struct fimc_context *ctx = dev_id; struct fimc_context *ctx = dev_id;
struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv;
struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node;
struct drm_exynos_ipp_event_work *event_work = struct drm_exynos_ipp_event_work *event_work =
c_node->event_work; c_node->event_work;
int buf_id; int buf_id;
...@@ -1557,7 +1557,7 @@ static int fimc_ippdrv_start(struct device *dev, enum drm_exynos_ipp_cmd cmd) ...@@ -1557,7 +1557,7 @@ static int fimc_ippdrv_start(struct device *dev, enum drm_exynos_ipp_cmd cmd)
{ {
struct fimc_context *ctx = get_fimc_context(dev); struct fimc_context *ctx = get_fimc_context(dev);
struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv;
struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node;
struct drm_exynos_ipp_property *property; struct drm_exynos_ipp_property *property;
struct drm_exynos_ipp_config *config; struct drm_exynos_ipp_config *config;
struct drm_exynos_pos img_pos[EXYNOS_DRM_OPS_MAX]; struct drm_exynos_pos img_pos[EXYNOS_DRM_OPS_MAX];
......
...@@ -711,7 +711,7 @@ static int gsc_src_set_addr(struct device *dev, ...@@ -711,7 +711,7 @@ static int gsc_src_set_addr(struct device *dev,
{ {
struct gsc_context *ctx = get_gsc_context(dev); struct gsc_context *ctx = get_gsc_context(dev);
struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv;
struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node;
struct drm_exynos_ipp_property *property; struct drm_exynos_ipp_property *property;
if (!c_node) { if (!c_node) {
...@@ -1171,7 +1171,7 @@ static int gsc_dst_set_addr(struct device *dev, ...@@ -1171,7 +1171,7 @@ static int gsc_dst_set_addr(struct device *dev,
{ {
struct gsc_context *ctx = get_gsc_context(dev); struct gsc_context *ctx = get_gsc_context(dev);
struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv;
struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node;
struct drm_exynos_ipp_property *property; struct drm_exynos_ipp_property *property;
if (!c_node) { if (!c_node) {
...@@ -1312,7 +1312,7 @@ static irqreturn_t gsc_irq_handler(int irq, void *dev_id) ...@@ -1312,7 +1312,7 @@ static irqreturn_t gsc_irq_handler(int irq, void *dev_id)
{ {
struct gsc_context *ctx = dev_id; struct gsc_context *ctx = dev_id;
struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv;
struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node;
struct drm_exynos_ipp_event_work *event_work = struct drm_exynos_ipp_event_work *event_work =
c_node->event_work; c_node->event_work;
u32 status; u32 status;
...@@ -1549,7 +1549,7 @@ static int gsc_ippdrv_start(struct device *dev, enum drm_exynos_ipp_cmd cmd) ...@@ -1549,7 +1549,7 @@ static int gsc_ippdrv_start(struct device *dev, enum drm_exynos_ipp_cmd cmd)
{ {
struct gsc_context *ctx = get_gsc_context(dev); struct gsc_context *ctx = get_gsc_context(dev);
struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv;
struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node;
struct drm_exynos_ipp_property *property; struct drm_exynos_ipp_property *property;
struct drm_exynos_ipp_config *config; struct drm_exynos_ipp_config *config;
struct drm_exynos_pos img_pos[EXYNOS_DRM_OPS_MAX]; struct drm_exynos_pos img_pos[EXYNOS_DRM_OPS_MAX];
......
...@@ -1292,7 +1292,7 @@ static int ipp_start_property(struct exynos_drm_ippdrv *ippdrv, ...@@ -1292,7 +1292,7 @@ static int ipp_start_property(struct exynos_drm_ippdrv *ippdrv,
DRM_DEBUG_KMS("%s:prop_id[%d]\n", __func__, property->prop_id); DRM_DEBUG_KMS("%s:prop_id[%d]\n", __func__, property->prop_id);
/* store command info in ippdrv */ /* store command info in ippdrv */
ippdrv->cmd = c_node; ippdrv->c_node = c_node;
if (!ipp_check_mem_list(c_node)) { if (!ipp_check_mem_list(c_node)) {
DRM_DEBUG_KMS("%s:empty memory.\n", __func__); DRM_DEBUG_KMS("%s:empty memory.\n", __func__);
...@@ -1303,7 +1303,7 @@ static int ipp_start_property(struct exynos_drm_ippdrv *ippdrv, ...@@ -1303,7 +1303,7 @@ static int ipp_start_property(struct exynos_drm_ippdrv *ippdrv,
ret = ipp_set_property(ippdrv, property); ret = ipp_set_property(ippdrv, property);
if (ret) { if (ret) {
DRM_ERROR("failed to set property.\n"); DRM_ERROR("failed to set property.\n");
ippdrv->cmd = NULL; ippdrv->c_node = NULL;
return ret; return ret;
} }
...@@ -1704,7 +1704,7 @@ void ipp_sched_event(struct work_struct *work) ...@@ -1704,7 +1704,7 @@ void ipp_sched_event(struct work_struct *work)
return; return;
} }
c_node = ippdrv->cmd; c_node = ippdrv->c_node;
if (!c_node) { if (!c_node) {
DRM_ERROR("failed to get command node.\n"); DRM_ERROR("failed to get command node.\n");
return; return;
......
...@@ -146,7 +146,7 @@ struct exynos_drm_ipp_ops { ...@@ -146,7 +146,7 @@ struct exynos_drm_ipp_ops {
* @dedicated: dedicated ipp device. * @dedicated: dedicated ipp device.
* @ops: source, destination operations. * @ops: source, destination operations.
* @event_workq: event work queue. * @event_workq: event work queue.
* @cmd: current command information. * @c_node: current command information.
* @cmd_list: list head for command information. * @cmd_list: list head for command information.
* @prop_list: property informations of current ipp driver. * @prop_list: property informations of current ipp driver.
* @check_property: check property about format, size, buffer. * @check_property: check property about format, size, buffer.
...@@ -164,7 +164,7 @@ struct exynos_drm_ippdrv { ...@@ -164,7 +164,7 @@ struct exynos_drm_ippdrv {
bool dedicated; bool dedicated;
struct exynos_drm_ipp_ops *ops[EXYNOS_DRM_OPS_MAX]; struct exynos_drm_ipp_ops *ops[EXYNOS_DRM_OPS_MAX];
struct workqueue_struct *event_workq; struct workqueue_struct *event_workq;
struct drm_exynos_ipp_cmd_node *cmd; struct drm_exynos_ipp_cmd_node *c_node;
struct list_head cmd_list; struct list_head cmd_list;
struct drm_exynos_ipp_prop_list *prop_list; struct drm_exynos_ipp_prop_list *prop_list;
......
...@@ -139,7 +139,7 @@ static irqreturn_t rotator_irq_handler(int irq, void *arg) ...@@ -139,7 +139,7 @@ static irqreturn_t rotator_irq_handler(int irq, void *arg)
{ {
struct rot_context *rot = arg; struct rot_context *rot = arg;
struct exynos_drm_ippdrv *ippdrv = &rot->ippdrv; struct exynos_drm_ippdrv *ippdrv = &rot->ippdrv;
struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node;
struct drm_exynos_ipp_event_work *event_work = c_node->event_work; struct drm_exynos_ipp_event_work *event_work = c_node->event_work;
enum rot_irq_status irq_status; enum rot_irq_status irq_status;
u32 val; u32 val;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment