diff options
author | Eunchul Kim <chulspro.kim@samsung.com> | 2012-12-22 03:49:22 -0500 |
---|---|---|
committer | Inki Dae <inki.dae@samsung.com> | 2013-01-04 01:54:33 -0500 |
commit | 7259c3d6aaf2f0925c034c11a3aca7e9dad52550 (patch) | |
tree | 29e607baf1f2028b2b9096ee0659001a24fc9a32 /drivers/gpu/drm | |
parent | 694be458794da6415288978c7b5f8288ae2dc5c3 (diff) |
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: Eunchul Kim <chulspro.kim@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_fimc.c | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_gsc.c | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_ipp.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_ipp.h | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c index 61ea24296b52..7a3e460afe9e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c | |||
@@ -695,7 +695,7 @@ static int fimc_src_set_addr(struct device *dev, | |||
695 | { | 695 | { |
696 | struct fimc_context *ctx = get_fimc_context(dev); | 696 | struct fimc_context *ctx = get_fimc_context(dev); |
697 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; | 697 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; |
698 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; | 698 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node; |
699 | struct drm_exynos_ipp_property *property; | 699 | struct drm_exynos_ipp_property *property; |
700 | struct drm_exynos_ipp_config *config; | 700 | struct drm_exynos_ipp_config *config; |
701 | 701 | ||
@@ -1231,7 +1231,7 @@ static int fimc_dst_set_addr(struct device *dev, | |||
1231 | { | 1231 | { |
1232 | struct fimc_context *ctx = get_fimc_context(dev); | 1232 | struct fimc_context *ctx = get_fimc_context(dev); |
1233 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; | 1233 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; |
1234 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; | 1234 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node; |
1235 | struct drm_exynos_ipp_property *property; | 1235 | struct drm_exynos_ipp_property *property; |
1236 | struct drm_exynos_ipp_config *config; | 1236 | struct drm_exynos_ipp_config *config; |
1237 | 1237 | ||
@@ -1317,7 +1317,7 @@ static irqreturn_t fimc_irq_handler(int irq, void *dev_id) | |||
1317 | { | 1317 | { |
1318 | struct fimc_context *ctx = dev_id; | 1318 | struct fimc_context *ctx = dev_id; |
1319 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; | 1319 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; |
1320 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; | 1320 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node; |
1321 | struct drm_exynos_ipp_event_work *event_work = | 1321 | struct drm_exynos_ipp_event_work *event_work = |
1322 | c_node->event_work; | 1322 | c_node->event_work; |
1323 | int buf_id; | 1323 | int buf_id; |
@@ -1557,7 +1557,7 @@ static int fimc_ippdrv_start(struct device *dev, enum drm_exynos_ipp_cmd cmd) | |||
1557 | { | 1557 | { |
1558 | struct fimc_context *ctx = get_fimc_context(dev); | 1558 | struct fimc_context *ctx = get_fimc_context(dev); |
1559 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; | 1559 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; |
1560 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; | 1560 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node; |
1561 | struct drm_exynos_ipp_property *property; | 1561 | struct drm_exynos_ipp_property *property; |
1562 | struct drm_exynos_ipp_config *config; | 1562 | struct drm_exynos_ipp_config *config; |
1563 | struct drm_exynos_pos img_pos[EXYNOS_DRM_OPS_MAX]; | 1563 | struct drm_exynos_pos img_pos[EXYNOS_DRM_OPS_MAX]; |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c index 5639353d47b9..c443c3bdb328 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c | |||
@@ -711,7 +711,7 @@ static int gsc_src_set_addr(struct device *dev, | |||
711 | { | 711 | { |
712 | struct gsc_context *ctx = get_gsc_context(dev); | 712 | struct gsc_context *ctx = get_gsc_context(dev); |
713 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; | 713 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; |
714 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; | 714 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node; |
715 | struct drm_exynos_ipp_property *property; | 715 | struct drm_exynos_ipp_property *property; |
716 | 716 | ||
717 | if (!c_node) { | 717 | if (!c_node) { |
@@ -1171,7 +1171,7 @@ static int gsc_dst_set_addr(struct device *dev, | |||
1171 | { | 1171 | { |
1172 | struct gsc_context *ctx = get_gsc_context(dev); | 1172 | struct gsc_context *ctx = get_gsc_context(dev); |
1173 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; | 1173 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; |
1174 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; | 1174 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node; |
1175 | struct drm_exynos_ipp_property *property; | 1175 | struct drm_exynos_ipp_property *property; |
1176 | 1176 | ||
1177 | if (!c_node) { | 1177 | if (!c_node) { |
@@ -1312,7 +1312,7 @@ static irqreturn_t gsc_irq_handler(int irq, void *dev_id) | |||
1312 | { | 1312 | { |
1313 | struct gsc_context *ctx = dev_id; | 1313 | struct gsc_context *ctx = dev_id; |
1314 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; | 1314 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; |
1315 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; | 1315 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node; |
1316 | struct drm_exynos_ipp_event_work *event_work = | 1316 | struct drm_exynos_ipp_event_work *event_work = |
1317 | c_node->event_work; | 1317 | c_node->event_work; |
1318 | u32 status; | 1318 | u32 status; |
@@ -1549,7 +1549,7 @@ static int gsc_ippdrv_start(struct device *dev, enum drm_exynos_ipp_cmd cmd) | |||
1549 | { | 1549 | { |
1550 | struct gsc_context *ctx = get_gsc_context(dev); | 1550 | struct gsc_context *ctx = get_gsc_context(dev); |
1551 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; | 1551 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; |
1552 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; | 1552 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node; |
1553 | struct drm_exynos_ipp_property *property; | 1553 | struct drm_exynos_ipp_property *property; |
1554 | struct drm_exynos_ipp_config *config; | 1554 | struct drm_exynos_ipp_config *config; |
1555 | struct drm_exynos_pos img_pos[EXYNOS_DRM_OPS_MAX]; | 1555 | struct drm_exynos_pos img_pos[EXYNOS_DRM_OPS_MAX]; |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c index 49eebe948ed2..ba45f9a7a740 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c | |||
@@ -1292,7 +1292,7 @@ static int ipp_start_property(struct exynos_drm_ippdrv *ippdrv, | |||
1292 | DRM_DEBUG_KMS("%s:prop_id[%d]\n", __func__, property->prop_id); | 1292 | DRM_DEBUG_KMS("%s:prop_id[%d]\n", __func__, property->prop_id); |
1293 | 1293 | ||
1294 | /* store command info in ippdrv */ | 1294 | /* store command info in ippdrv */ |
1295 | ippdrv->cmd = c_node; | 1295 | ippdrv->c_node = c_node; |
1296 | 1296 | ||
1297 | if (!ipp_check_mem_list(c_node)) { | 1297 | if (!ipp_check_mem_list(c_node)) { |
1298 | DRM_DEBUG_KMS("%s:empty memory.\n", __func__); | 1298 | DRM_DEBUG_KMS("%s:empty memory.\n", __func__); |
@@ -1303,7 +1303,7 @@ static int ipp_start_property(struct exynos_drm_ippdrv *ippdrv, | |||
1303 | ret = ipp_set_property(ippdrv, property); | 1303 | ret = ipp_set_property(ippdrv, property); |
1304 | if (ret) { | 1304 | if (ret) { |
1305 | DRM_ERROR("failed to set property.\n"); | 1305 | DRM_ERROR("failed to set property.\n"); |
1306 | ippdrv->cmd = NULL; | 1306 | ippdrv->c_node = NULL; |
1307 | return ret; | 1307 | return ret; |
1308 | } | 1308 | } |
1309 | 1309 | ||
@@ -1704,7 +1704,7 @@ void ipp_sched_event(struct work_struct *work) | |||
1704 | return; | 1704 | return; |
1705 | } | 1705 | } |
1706 | 1706 | ||
1707 | c_node = ippdrv->cmd; | 1707 | c_node = ippdrv->c_node; |
1708 | if (!c_node) { | 1708 | if (!c_node) { |
1709 | DRM_ERROR("failed to get command node.\n"); | 1709 | DRM_ERROR("failed to get command node.\n"); |
1710 | return; | 1710 | return; |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.h b/drivers/gpu/drm/exynos/exynos_drm_ipp.h index 034f8f3cf88c..4cadbea7dbde 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.h +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.h | |||
@@ -146,7 +146,7 @@ struct exynos_drm_ipp_ops { | |||
146 | * @dedicated: dedicated ipp device. | 146 | * @dedicated: dedicated ipp device. |
147 | * @ops: source, destination operations. | 147 | * @ops: source, destination operations. |
148 | * @event_workq: event work queue. | 148 | * @event_workq: event work queue. |
149 | * @cmd: current command information. | 149 | * @c_node: current command information. |
150 | * @cmd_list: list head for command information. | 150 | * @cmd_list: list head for command information. |
151 | * @prop_list: property informations of current ipp driver. | 151 | * @prop_list: property informations of current ipp driver. |
152 | * @check_property: check property about format, size, buffer. | 152 | * @check_property: check property about format, size, buffer. |
@@ -164,7 +164,7 @@ struct exynos_drm_ippdrv { | |||
164 | bool dedicated; | 164 | bool dedicated; |
165 | struct exynos_drm_ipp_ops *ops[EXYNOS_DRM_OPS_MAX]; | 165 | struct exynos_drm_ipp_ops *ops[EXYNOS_DRM_OPS_MAX]; |
166 | struct workqueue_struct *event_workq; | 166 | struct workqueue_struct *event_workq; |
167 | struct drm_exynos_ipp_cmd_node *cmd; | 167 | struct drm_exynos_ipp_cmd_node *c_node; |
168 | struct list_head cmd_list; | 168 | struct list_head cmd_list; |
169 | struct drm_exynos_ipp_prop_list *prop_list; | 169 | struct drm_exynos_ipp_prop_list *prop_list; |
170 | 170 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c index 1c2366083c70..17e4474ae899 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c +++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c | |||
@@ -139,7 +139,7 @@ static irqreturn_t rotator_irq_handler(int irq, void *arg) | |||
139 | { | 139 | { |
140 | struct rot_context *rot = arg; | 140 | struct rot_context *rot = arg; |
141 | struct exynos_drm_ippdrv *ippdrv = &rot->ippdrv; | 141 | struct exynos_drm_ippdrv *ippdrv = &rot->ippdrv; |
142 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->cmd; | 142 | struct drm_exynos_ipp_cmd_node *c_node = ippdrv->c_node; |
143 | struct drm_exynos_ipp_event_work *event_work = c_node->event_work; | 143 | struct drm_exynos_ipp_event_work *event_work = c_node->event_work; |
144 | enum rot_irq_status irq_status; | 144 | enum rot_irq_status irq_status; |
145 | u32 val; | 145 | u32 val; |