[PATCH 1/5] drm/amdgpu/psp: Add mode 0 reset function.

Alex Deucher alexdeucher at gmail.com
Wed Nov 21 19:22:16 UTC 2018


On Wed, Nov 21, 2018 at 1:10 PM Andrey Grodzovsky
<andrey.grodzovsky at amd.com> wrote:
>
> Currently just a place holder until support from PSP in place.
>
> Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>

I think we can drop this patch for now until we figure out what the
proper reset method will be for this.  We may end up using baco.

Alex

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 +++
>  drivers/gpu/drm/amd/amdgpu/psp_v11_0.c  | 8 ++++++++
>  2 files changed, 11 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
> index 9ec5d1a..2bdb394 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
> @@ -83,6 +83,7 @@ struct psp_funcs
>                                   enum AMDGPU_UCODE_ID ucode_type);
>         bool (*smu_reload_quirk)(struct psp_context *psp);
>         int (*mode1_reset)(struct psp_context *psp);
> +       int (*mode0_reset)(struct psp_context *psp);
>         uint64_t (*xgmi_get_node_id)(struct psp_context *psp);
>         uint64_t (*xgmi_get_hive_id)(struct psp_context *psp);
>         int (*xgmi_get_topology_info)(struct psp_context *psp, int number_devices,
> @@ -194,6 +195,8 @@ struct psp_xgmi_topology_info {
>                 ((psp)->funcs->smu_reload_quirk ? (psp)->funcs->smu_reload_quirk((psp)) : false)
>  #define psp_mode1_reset(psp) \
>                 ((psp)->funcs->mode1_reset ? (psp)->funcs->mode1_reset((psp)) : false)
> +#define psp_mode0_reset(psp) \
> +               ((psp)->funcs->mode0_reset ? (psp)->funcs->mode1_reset((psp)) : false)
>  #define psp_xgmi_get_node_id(psp) \
>                 ((psp)->funcs->xgmi_get_node_id ? (psp)->funcs->xgmi_get_node_id((psp)) : 0)
>  #define psp_xgmi_get_hive_id(psp) \
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> index 082093a..8feb580 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> @@ -573,6 +573,13 @@ static int psp_v11_0_mode1_reset(struct psp_context *psp)
>         return 0;
>  }
>
> +static int psp_v11_0_mode0_reset(struct psp_context *psp)
> +{
> +       /* TBD Once support from PSP in place */
> +
> +       return 0;
> +}
> +
>  /* TODO: Fill in follow functions once PSP firmware interface for XGMI is ready.
>   * For now, return success and hack the hive_id so high level code can
>   * start testing
> @@ -698,6 +705,7 @@ static const struct psp_funcs psp_v11_0_funcs = {
>         .cmd_submit = psp_v11_0_cmd_submit,
>         .compare_sram_data = psp_v11_0_compare_sram_data,
>         .mode1_reset = psp_v11_0_mode1_reset,
> +       .mode0_reset = psp_v11_0_mode0_reset,
>         .xgmi_get_topology_info = psp_v11_0_xgmi_get_topology_info,
>         .xgmi_set_topology_info = psp_v11_0_xgmi_set_topology_info,
>         .xgmi_get_hive_id = psp_v11_0_xgmi_get_hive_id,
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx


More information about the amd-gfx mailing list