Skip to contentSkip to conversation

drm/amdgpu: rename gfxhub_v1_0 to gfxhub_v9_0

PATCH New Hawking Zhang 1 participant 1 message Jul 21, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: rename gfxhub_v1_0 to gfxhub_v9_0

Change-Id Ib721fdefede870ff7ada1efbd57d4f744790f31e
---
 drivers/gpu/drm/amd/amdgpu/Makefile      |   2 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 343 -------------------------------
 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h |  36 ----
 drivers/gpu/drm/amd/amdgpu/gfxhub_v9_0.c | 343 +++++++++++++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/gfxhub_v9_0.h |  36 ++++
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c    |  12 +-
 drivers/gpu/drm/amd/amdgpu/soc15.c       |   2 +-
 7 files changed, 387 insertions(+), 387 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
 delete mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v9_0.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v9_0.h
drivers/gpu/drm/amd/amdgpu/Makefile +1 -1
index 1143f1a..320edc5 100644
@@ -48,7 +48,7 @@ amdgpu-y += \
 amdgpu-y += \
 	gmc_v7_0.o \
 	gmc_v8_0.o \
-	gfxhub_v1_0.o mmhub_v1_0.o gmc_v9_0.o
+	gfxhub_v9_0.o mmhub_v1_0.o gmc_v9_0.o
 
 # add IH block
 amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c deleted +0 -343

343 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h deleted +0 -36
deleted file mode 100644
index d2dbb08..0000000
@@ -1,36 +0,0 @@
-/*
- * Copyright 2016 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef __GFXHUB_V1_0_H__
-#define __GFXHUB_V1_0_H__
-
-int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev);
-void gfxhub_v1_0_gart_disable(struct amdgpu_device *adev);
-void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev,
-					  bool value);
-void gfxhub_v1_0_init(struct amdgpu_device *adev);
-u64 gfxhub_v1_0_get_mc_fb_offset(struct amdgpu_device *adev);
-extern const struct amd_ip_funcs gfxhub_v1_0_ip_funcs;
-extern const struct amdgpu_ip_block_version gfxhub_v1_0_ip_block;
-
-#endif
drivers/gpu/drm/amd/amdgpu/gfxhub_v9_0.c new file +343 -0

343 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/gfxhub_v9_0.h new file +36 -0
new file mode 100644
index 0000000..d1f1e6a
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2016 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef __GFXHUB_V9_0_H__
+#define __GFXHUB_V9_0_H__
+
+int gfxhub_v9_0_gart_enable(struct amdgpu_device *adev);
+void gfxhub_v9_0_gart_disable(struct amdgpu_device *adev);
+void gfxhub_v9_0_set_fault_enable_default(struct amdgpu_device *adev,
+					  bool value);
+void gfxhub_v9_0_init(struct amdgpu_device *adev);
+u64 gfxhub_v9_0_get_mc_fb_offset(struct amdgpu_device *adev);
+extern const struct amd_ip_funcs gfxhub_v9_0_ip_funcs;
+extern const struct amdgpu_ip_block_version gfxhub_v9_0_ip_block;
+
+#endif
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +6 -6
index e9a5209..650e525 100644
@@ -35,7 +35,7 @@
 
 #include "nbio_v6_1.h"
 #include "nbio_v7_0.h"
-#include "gfxhub_v1_0.h"
+#include "gfxhub_v9_0.h"
 #include "mmhub_v1_0.h"
 
 #define mmDF_CS_AON0_DramBaseAddress0                                                                  0x0044
@@ -423,7 +423,7 @@ static void gmc_v9_0_vram_gtt_location(struct amdgpu_device *adev,
 	amdgpu_gart_location(adev, mc);
 	/* base offset of vram pages */
 	if (adev->flags & AMD_IS_APU)
-		adev->vm_manager.vram_base_offset = gfxhub_v1_0_get_mc_fb_offset(adev);
+		adev->vm_manager.vram_base_offset = gfxhub_v9_0_get_mc_fb_offset(adev);
 	else
 		adev->vm_manager.vram_base_offset = 0;
 }
@@ -527,7 +527,7 @@ static int gmc_v9_0_sw_init(void *handle)
 	int dma_bits;
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-	gfxhub_v1_0_init(adev);
+	gfxhub_v9_0_init(adev);
 	mmhub_v1_0_init(adev);
 
 	spin_lock_init(&adev->mc.invalidate_lock);
@@ -709,7 +709,7 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev)
 		break;
 	}
 
-	r = gfxhub_v1_0_gart_enable(adev);
+	r = gfxhub_v9_0_gart_enable(adev);
 	if (r)
 		return r;
 
@@ -730,7 +730,7 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev)
 	else
 		value = true;
 
-	gfxhub_v1_0_set_fault_enable_default(adev, value);
+	gfxhub_v9_0_set_fault_enable_default(adev, value);
 	mmhub_v1_0_set_fault_enable_default(adev, value);
 
 	gmc_v9_0_gart_flush_gpu_tlb(adev, 0);
@@ -764,7 +764,7 @@ static int gmc_v9_0_hw_init(void *handle)
  */
 static void gmc_v9_0_gart_disable(struct amdgpu_device *adev)
 {
-	gfxhub_v1_0_gart_disable(adev);
+	gfxhub_v9_0_gart_disable(adev);
 	mmhub_v1_0_gart_disable(adev);
 	amdgpu_gart_table_vram_unpin(adev);
 }
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -1
index c184fe8..d0315b3 100644
@@ -51,7 +51,7 @@
 #include "soc15_common.h"
 #include "gfx_v9_0.h"
 #include "gmc_v9_0.h"
-#include "gfxhub_v1_0.h"
+#include "gfxhub_v9_0.h"
 #include "mmhub_v1_0.h"
 #include "vega10_ih.h"
 #include "sdma_v4_0.h"
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx