diff options
author | Tejal Kudav <tkudav@nvidia.com> | 2018-01-25 21:48:35 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-02-02 02:23:54 -0500 |
commit | ac5b3d9640790b99798070fbb011c4b0c100d33e (patch) | |
tree | e363fcf4c20b2a516459ec9972694e86a505aae7 | |
parent | 9f7ef3d53f36c7c9cf7f6b0002d831dfa9f57a7d (diff) |
gpu: nvgpu: Remove init_state initialization code
nvlink core library no longer exposes the set_init_state()
interface as it wishes to block init_state changes from
endpoint drivers.
Now, the core driver is responsible for initializing init_state
variables using set_init_state() interface. Hence, we remove
this redundant code.
Change-Id: I81c4922cf48f7918e69795579b39b7fa0c299644
Signed-off-by: Tejal Kudav <tkudav@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1646437
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Adeel Raza <araza@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/nvlink.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/nvlink.c b/drivers/gpu/nvgpu/common/linux/nvlink.c index eea6eda7..6cf74048 100644 --- a/drivers/gpu/nvgpu/common/linux/nvlink.c +++ b/drivers/gpu/nvgpu/common/linux/nvlink.c | |||
@@ -468,8 +468,6 @@ u32 nvgpu_nvlink_probe(struct gk20a *g) | |||
468 | 468 | ||
469 | g->nvlink.topology_connected_links = BIT(phys_link_id); | 469 | g->nvlink.topology_connected_links = BIT(phys_link_id); |
470 | 470 | ||
471 | mutex_init(&ndev->init_state_mutex); | ||
472 | |||
473 | /* Check that we are in dGPU mode */ | 471 | /* Check that we are in dGPU mode */ |
474 | if (ndev->device_id != NVLINK_ENDPT_GV100) { | 472 | if (ndev->device_id != NVLINK_ENDPT_GV100) { |
475 | nvgpu_err(g, "Local nvlink device is not dGPU"); | 473 | nvgpu_err(g, "Local nvlink device is not dGPU"); |
@@ -477,12 +475,6 @@ u32 nvgpu_nvlink_probe(struct gk20a *g) | |||
477 | goto free_nvlink; | 475 | goto free_nvlink; |
478 | } | 476 | } |
479 | 477 | ||
480 | err = nvlink_set_init_state(ndev, NVLINK_DEV_OFF); | ||
481 | if (err) { | ||
482 | nvgpu_err(g, "Error initalizing device state to OFF"); | ||
483 | goto free_nvlink; | ||
484 | } | ||
485 | |||
486 | /* Fill in device struct */ | 478 | /* Fill in device struct */ |
487 | ndev->dev_ops.dev_early_init = nvgpu_nvlink_early_init; | 479 | ndev->dev_ops.dev_early_init = nvgpu_nvlink_early_init; |
488 | ndev->dev_ops.dev_interface_init = nvgpu_nvlink_interface_init; | 480 | ndev->dev_ops.dev_interface_init = nvgpu_nvlink_interface_init; |