Messages in this thread | | | Subject | Re: [PATCH v2 1/2] drm/amdkfd: Move the ignore_crat check before the CRAT table get | From | Hanjun Guo <> | Date | Thu, 27 Aug 2020 14:21:36 +0800 |
| |
On 2020/8/27 12:28, Felix Kuehling wrote: > > Am 2020-08-26 um 4:29 a.m. schrieb Hanjun Guo: >> If the ignore_crat is set to non-zero value, it's no point getting >> the CRAT table, so just move the ignore_crat check before we get the >> CRAT table. >> >> Signed-off-by: Hanjun Guo <guohanjun@huawei.com> >> --- >> drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 10 +++++----- >> 1 file changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c >> index 6a250f8..ed77b109 100644 >> --- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c >> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c >> @@ -764,6 +764,11 @@ int kfd_create_crat_image_acpi(void **crat_image, size_t *size) >> >> *crat_image = NULL; >> >> + if (ignore_crat) { > > A conflicting change in this area was just submitted on Monday to > amd-staging-drm-next. You'll need to rebase your patch. It should be > straight-forward. ignore_crat was replaced with a function call > kfd_ignore_crat(). > > Other than that, your patch series looks good to me. If I don't see an > update from you in a day or two, I'll fix it up myself and add my R-b.
Please fix it up by yourself, thanks a lot for the help!
Regards Hanjun
| |