diff options
author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2021-06-02 10:18:45 +0300 |
---|---|---|
committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2021-06-02 10:18:45 +0300 |
commit | 942baad211336efefb93a8369478888ab845c450 (patch) | |
tree | d959f4b4c0680e6b589cc9684bd489f09ee65fd8 /drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | |
parent | 35cbd91eb541e001f6e2648c56abb5361e3d6774 (diff) | |
parent | ccd1950c2f7e38ae45aeefb99a08b39407cd6c63 (diff) | |
download | linux-942baad211336efefb93a8369478888ab845c450.tar.bz2 |
Merge drm/drm-next into drm-intel-gt-next
Pulling in -rc2 fixes and TTM changes that next upcoming patches depend
on.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/ta_ras_if.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h index 745ed0fba1ed..0f214a398dd8 100644 --- a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h +++ b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h @@ -105,6 +105,12 @@ struct ta_ras_trigger_error_input { uint64_t value; // method if error injection. i.e persistent, coherent etc. }; +struct ta_ras_init_flags +{ + uint8_t poison_mode_en; + uint8_t dgpu_mode; +}; + struct ta_ras_output_flags { uint8_t ras_init_success_flag; @@ -115,6 +121,7 @@ struct ta_ras_output_flags /* Common input structure for RAS callbacks */ /**********************************************************/ union ta_ras_cmd_input { + struct ta_ras_init_flags init_flags; struct ta_ras_enable_features_input enable_features; struct ta_ras_disable_features_input disable_features; struct ta_ras_trigger_error_input trigger_error; |