nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 18:16:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: rename nvhost_dev to nvhost

Browse Source 
A couple of structure member variables were named "nvhost_dev". This
causes a name conflict with a structure name. MISRA frowns upon name
conflicts. Therefore, rename the member variables to "nvhost".

JIRA NVGPU-3873

Change-Id: I4d35eb2d121b3c17499055d8781a61641594811e
Signed-off-by: Adeel Raza <araza@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2262190
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Adeel Raza
2019-12-13 15:10:01 -08:00
committed by Alex Waterman
parent 26af1c2270
commit fd870b300e
10 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
userspace/units/sync/nvgpu-sync.c
View File

@@ -135,7 +135,7 @@ int test_sync_init(struct unit_module *m, struct gk20a *g, void *args)
}
/*
* Init g->nvhost_dev containing sync metadata
* Init g->nvhost containing sync metadata
*/
ret = nvgpu_get_nvhost_dev(g);
if (ret != 0) {
@@ -201,13 +201,13 @@ int test_sync_create_destroy_sync(struct unit_module *m, struct gk20a *g, void *
unit_return_fail(m, "unexpected failure in creating sync points");
}
syncpt_value = g->nvhost_dev->syncpt_value;
syncpt_value = g->nvhost->syncpt_value;
unit_info(m, "Syncpt ID: %u, Syncpt Value: %u\n",
g->nvhost_dev->syncpt_id, syncpt_value);
g->nvhost->syncpt_id, syncpt_value);
assert((g->nvhost_dev->syncpt_id > 0U) &&
(g->nvhost_dev->syncpt_id <= NUM_HW_PTS));
assert((g->nvhost->syncpt_id > 0U) &&
(g->nvhost->syncpt_id <= NUM_HW_PTS));
assert(syncpt_value < (UINT_MAX - SYNCPT_SAFE_STATE_INCR));
@@ -252,8 +252,8 @@ int test_sync_set_safe_state(struct unit_module *m, struct gk20a *g, void *args)
unit_return_fail(m, "unexpected failure in creating sync points");
}
syncpt_id = g->nvhost_dev->syncpt_id;
syncpt_value = g->nvhost_dev->syncpt_value;
syncpt_id = g->nvhost->syncpt_id;
syncpt_value = g->nvhost->syncpt_value;
unit_info(m, "Syncpt ID: %u, Syncpt Value: %u\n",
syncpt_id, syncpt_value);
@@ -264,7 +264,7 @@ int test_sync_set_safe_state(struct unit_module *m, struct gk20a *g, void *args)
nvgpu_channel_sync_set_safe_state(sync);
syncpt_safe_state_val = g->nvhost_dev->syncpt_value;
syncpt_safe_state_val = g->nvhost->syncpt_value;
if ((syncpt_safe_state_val - syncpt_value) != SYNCPT_SAFE_STATE_INCR) {
unit_return_fail(m, "unexpected increment value for safe state");
@@ -366,7 +366,7 @@ static void clear_test_params(struct gk20a *g, bool *user_managed,
}
if (branch == F_SYNC_NVHOST_CLIENT_MANAGED_FAIL) {
g->nvhost_dev->syncpt_id = 1U;
g->nvhost->syncpt_id = 1U;
}
if (ch->vm->syncpt_ro_map_gpu_va) {
@@ -395,7 +395,7 @@ int test_sync_create_fail(struct unit_module *m, struct gk20a *g, void *args)
* This is normally not cleared when a syncpt's last ref
* is removed. Hence, explicitely zero it after every failure
*/
g->nvhost_dev->syncpt_id = 0U;
g->nvhost->syncpt_id = 0U;
if (branches == F_SYNC_GLOBAL_DISABLE_SYNCPT) {
g->disable_syncpoints = true;
@@ -406,7 +406,7 @@ int test_sync_create_fail(struct unit_module *m, struct gk20a *g, void *args)
} else if (branches == F_SYNC_USER_MANAGED) {
user_managed = false;
} else if (branches == F_SYNC_NVHOST_CLIENT_MANAGED_FAIL) {
g->nvhost_dev->syncpt_id = 20U; /* arbitary id */
g->nvhost->syncpt_id = 20U; /* arbitary id */
} else if (branches == F_SYNC_RO_MAP_GPU_VA_MAP_FAIL) {
/* fail Read-Only nvgpu_gmmu_map of g->syncpt_mem */
ch->vm->guest_managed = true;
@@ -439,8 +439,8 @@ int test_sync_create_fail(struct unit_module *m, struct gk20a *g, void *args)
unit_return_fail(m, "expected failure in creating sync points");
}
syncpt_id = g->nvhost_dev->syncpt_id;
syncpt_value = g->nvhost_dev->syncpt_value;
syncpt_id = g->nvhost->syncpt_id;
syncpt_value = g->nvhost->syncpt_value;
assert(syncpt_id == 0U);
assert(syncpt_value == 0U);
@@ -470,7 +470,7 @@ int test_sync_deinit(struct unit_module *m, struct gk20a *g, void *args)
de_init_syncpt_mem(m, g);
if (g->nvhost_dev == NULL) {
if (g->nvhost == NULL) {
unit_return_fail(m ,"no valid nvhost device exists\n");
}

4
userspace/units/sync/nvgpu-sync.h
View File

@@ -46,7 +46,7 @@ struct unit_module;
* - init FIFO register space.
* - init HAL parameters for gv11b.
* - init required for getting the sync ops initialized.
* - init g->nvhost_dev containing sync metadata.
* - init g->nvhost containing sync metadata.
* - alloc memory for g->syncpt_mem.
* - alloc memory for channel.
* - alloc and init a VM for the channel.
@@ -68,7 +68,7 @@ int test_sync_init(struct unit_module *m, struct gk20a *g, void *args);
* - put reference to VM put.
* - free channel memory.
* - free memory for g->syncpt_mem.
* - free g->nvhost_dev.
* - free g->nvhost.
* - clear FIFO register space.
*
* Output: Returns PASS if all the above steps are successful. FAIL otherwise.