1 files changed, 22 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
index 0e6b576b..d433c9bb 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
@@ -3,7 +3,7 @@
  *
  * GK20A Graphics
  *
- * Copyright (c) 2011-2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -30,7 +30,6 @@
 #include "fifo_gk20a.h"
 #include "pmu_gk20a.h"
 
-
 #define PTIMER_FP_FACTOR                        1000000
 
 #define ROOTRW (S_IRWXU|S_IRGRP|S_IROTH)
@@ -100,6 +99,9 @@ static ssize_t blcg_enable_store(struct device *device,
 
         if (g->ops.clock_gating.blcg_bus_load_gating_prod)
                 g->ops.clock_gating.blcg_bus_load_gating_prod(g, g->blcg_enabled);
+        if (g->ops.clock_gating.blcg_ce_load_gating_prod)
+                g->ops.clock_gating.blcg_ce_load_gating_prod(g,
+                                        g->blcg_enabled);
         if (g->ops.clock_gating.blcg_ctxsw_firmware_load_gating_prod)
                 g->ops.clock_gating.blcg_ctxsw_firmware_load_gating_prod(g, g->blcg_enabled);
         if (g->ops.clock_gating.blcg_fb_load_gating_prod)
@@ -784,8 +786,15 @@ void gk20a_remove_sysfs(struct device *dev)
         device_remove_file(dev, &dev_attr_allow_all);
         device_remove_file(dev, &dev_attr_tpc_fs_mask);
 
-        if (g->host1x_dev && (dev->parent != &g->host1x_dev->dev))
+        if (g->host1x_dev && (dev->parent != &g->host1x_dev->dev)) {
                 sysfs_remove_link(&g->host1x_dev->dev.kobj, dev_name(dev));
+                if (strcmp(dev_name(dev), "gpu.0")) {
+                        struct kobject *kobj = &dev->kobj;
+                        struct device *parent = container_of((kobj->parent),
+                                        struct device, kobj);
+                        sysfs_remove_link(&parent->kobj, "gpu.0");
+                }
+        }
 }
 
 void gk20a_create_sysfs(struct platform_device *dev)
@@ -817,10 +826,19 @@ void gk20a_create_sysfs(struct platform_device *dev)
         error |= device_create_file(&dev->dev, &dev_attr_allow_all);
         error |= device_create_file(&dev->dev, &dev_attr_tpc_fs_mask);
 
-        if (g->host1x_dev && (dev->dev.parent != &g->host1x_dev->dev))
+        if (g->host1x_dev && (dev->dev.parent != &g->host1x_dev->dev)) {
                 error |= sysfs_create_link(&g->host1x_dev->dev.kobj,
                                            &dev->dev.kobj,
                                            dev_name(&dev->dev));
+                if (strcmp(dev_name(&dev->dev), "gpu.0")) {
+                        struct kobject *kobj = &dev->dev.kobj;
+                        struct device *parent = container_of((kobj->parent),
+                                                struct device, kobj);
+                        error |= sysfs_create_link(&parent->kobj,
+                                           &dev->dev.kobj, "gpu.0");
+                }
+
+        }
 
         if (error)
                 dev_err(&dev->dev, "Failed to create sysfs attributes!\n");