diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0248-drm-amdkfd-avoid-CONFIG_-prefix-for-non-Kconfig-symb.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0248-drm-amdkfd-avoid-CONFIG_-prefix-for-non-Kconfig-symb.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0248-drm-amdkfd-avoid-CONFIG_-prefix-for-non-Kconfig-symb.patch b/common/recipes-kernel/linux/files/0248-drm-amdkfd-avoid-CONFIG_-prefix-for-non-Kconfig-symb.patch new file mode 100644 index 00000000..c8879ea7 --- /dev/null +++ b/common/recipes-kernel/linux/files/0248-drm-amdkfd-avoid-CONFIG_-prefix-for-non-Kconfig-symb.patch @@ -0,0 +1,88 @@ +From f4e04022edaec32af39db16e08ea316a6bb136f2 Mon Sep 17 00:00:00 2001 +From: Valentin Rothberg <valentinrothberg@gmail.com> +Date: Fri, 5 Jun 2015 10:27:43 +0200 +Subject: [PATCH 0248/1050] drm/amdkfd: avoid CONFIG_ prefix for non-Kconfig + symbols + +The CONFIG_ prefix is reserved for Kconfig options in Make and CPP +syntax. Various static analysis tools rely on this naming convention +and check if CONFIG_ prefixed symbols are defined Kconfig. Hence add +yet another prefix AMD_ to CONFIG_REG_{BASE,END,SISE} to apply to this +convention and make static analysis tools happy. + +Signed-off-by: Valentin Rothberg <valentinrothberg@gmail.com> +Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com> +--- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 10 +++++----- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c +index 96153f2..c34c393 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c +@@ -445,7 +445,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, + aw_reg_add_dword /= sizeof(uint32_t); + + packets_vec[0].bitfields2.reg_offset = +- aw_reg_add_dword - CONFIG_REG_BASE; ++ aw_reg_add_dword - AMD_CONFIG_REG_BASE; + + packets_vec[0].reg_data[0] = cntl.u32All; + +@@ -458,7 +458,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, + aw_reg_add_dword /= sizeof(uint32_t); + + packets_vec[1].bitfields2.reg_offset = +- aw_reg_add_dword - CONFIG_REG_BASE; ++ aw_reg_add_dword - AMD_CONFIG_REG_BASE; + packets_vec[1].reg_data[0] = addrHi.u32All; + + aw_reg_add_dword = +@@ -470,7 +470,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, + aw_reg_add_dword /= sizeof(uint32_t); + + packets_vec[2].bitfields2.reg_offset = +- aw_reg_add_dword - CONFIG_REG_BASE; ++ aw_reg_add_dword - AMD_CONFIG_REG_BASE; + packets_vec[2].reg_data[0] = addrLo.u32All; + + /* enable watch flag if address is not zero*/ +@@ -488,7 +488,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, + aw_reg_add_dword /= sizeof(uint32_t); + + packets_vec[3].bitfields2.reg_offset = +- aw_reg_add_dword - CONFIG_REG_BASE; ++ aw_reg_add_dword - AMD_CONFIG_REG_BASE; + packets_vec[3].reg_data[0] = cntl.u32All; + + status = dbgdev_diq_submit_ib( +@@ -690,7 +690,7 @@ static int dbgdev_wave_control_diq(struct kfd_dbgdev *dbgdev, + packets_vec[1].header.opcode = IT_SET_CONFIG_REG; + packets_vec[1].header.type = PM4_TYPE_3; + packets_vec[1].bitfields2.reg_offset = SQ_CMD / (sizeof(uint32_t)) - +- CONFIG_REG_BASE; ++ AMD_CONFIG_REG_BASE; + + packets_vec[1].bitfields2.vmid_shift = SQ_CMD_VMID_OFFSET; + packets_vec[1].bitfields2.insert_vmid = 1; +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h +index 4b0dd5a..03424c2 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h +@@ -48,9 +48,9 @@ enum { + + /* CONFIG reg space definition */ + enum { +- CONFIG_REG_BASE = 0x2000, /* in dwords */ +- CONFIG_REG_END = 0x2B00, +- CONFIG_REG_SIZE = CONFIG_REG_END - CONFIG_REG_BASE ++ AMD_CONFIG_REG_BASE = 0x2000, /* in dwords */ ++ AMD_CONFIG_REG_END = 0x2B00, ++ AMD_CONFIG_REG_SIZE = AMD_CONFIG_REG_END - AMD_CONFIG_REG_BASE + }; + + /* SH reg space definition */ +-- +1.9.1 + |