On 07/15/2016 03:20 PM, Huang Rui wrote:
> Rename smumgr.h to smum.h, because smum.h is to align with the dpm of
> other chips and we will use "iceland_smumgr" at powerplay in following
> patches.
>
> Signed-off-by: Huang Rui <ray.huang at amd.com>
> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/iceland_dpm.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/iceland_smum.h | 41 +++++++++++++++++++++++++++++
> drivers/gpu/drm/amd/amdgpu/iceland_smumgr.h | 41 -----------------------------
> 4 files changed, 43 insertions(+), 43 deletions(-)
> create mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_smum.h
> delete mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_smumgr.h
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c b/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c
> index 460bc8a..77fd16b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c
> @@ -24,7 +24,7 @@
> #include <linux/firmware.h>
> #include "drmP.h"
> #include "amdgpu.h"
> -#include "iceland_smumgr.h"
> +#include "iceland_smum.h"
>
> MODULE_FIRMWARE("amdgpu/topaz_smc.bin");
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_smc.c b/drivers/gpu/drm/amd/amdgpu/iceland_smc.c
> index 52ee081..5285712 100644
> --- a/drivers/gpu/drm/amd/amdgpu/iceland_smc.c
> +++ b/drivers/gpu/drm/amd/amdgpu/iceland_smc.c
> @@ -25,7 +25,7 @@
> #include "drmP.h"
> #include "amdgpu.h"
> #include "ppsmc.h"
> -#include "iceland_smumgr.h"
> +#include "iceland_smum.h"
> #include "smu_ucode_xfer_vi.h"
> #include "amdgpu_ucode.h"
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_smum.h b/drivers/gpu/drm/amd/amdgpu/iceland_smum.h
> new file mode 100644
> index 0000000..1e0769e
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/iceland_smum.h
> @@ -0,0 +1,41 @@
> +/*
> + * Copyright 2014 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 ICELAND_SMUMGR_H
> +#define ICELAND_SMUMGR_H
I suppose the header guards should be renamed also, so 'ICELAND_SMUM_H'
else another header with the same guard names could introduce weird
build issues down the track..
with that minor fix, this patch is:
Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>
> +
> +#include "ppsmc.h"
> +
> +extern int iceland_smu_init(struct amdgpu_device *adev);
> +extern int iceland_smu_fini(struct amdgpu_device *adev);
> +extern int iceland_smu_start(struct amdgpu_device *adev);
> +
> +struct iceland_smu_private_data
> +{
> + uint8_t *header;
> + uint8_t *mec_image;
> + uint32_t header_addr_high;
> + uint32_t header_addr_low;
> +};
> +
> +#endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_smumgr.h b/drivers/gpu/drm/amd/amdgpu/iceland_smumgr.h
> deleted file mode 100644
> index 1e0769e..0000000
> --- a/drivers/gpu/drm/amd/amdgpu/iceland_smumgr.h
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -/*
> - * Copyright 2014 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 ICELAND_SMUMGR_H
> -#define ICELAND_SMUMGR_H
> -
> -#include "ppsmc.h"
> -
> -extern int iceland_smu_init(struct amdgpu_device *adev);
> -extern int iceland_smu_fini(struct amdgpu_device *adev);
> -extern int iceland_smu_start(struct amdgpu_device *adev);
> -
> -struct iceland_smu_private_data
> -{
> - uint8_t *header;
> - uint8_t *mec_image;
> - uint32_t header_addr_high;
> - uint32_t header_addr_low;
> -};
> -
> -#endif
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20160716/1d26a3cc/attachment-0001.sig>
