| Message ID | 20220210031724.440943-1-andrey.grodzovsky@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amdgpu: Fix compile error. | expand |
On Wed, Feb 9, 2022 at 10:17 PM Andrey Grodzovsky <andrey.grodzovsky@amd.com> wrote: > > Seems I forgot to add this to the relevant commit > when submitting. > > Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> > Reported-by: kernel test robot <lkp@intel.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h > index 92de3b7965a1..1949dbe28a86 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h > @@ -118,8 +118,7 @@ static inline bool amdgpu_reset_domain_schedule(struct amdgpu_reset_domain *doma > return queue_work(domain->wq, work); > } > > -void amdgpu_device_lock_reset_domain(struct amdgpu_reset_domain *reset_domain, > - struct amdgpu_hive_info *hive); > +void amdgpu_device_lock_reset_domain(struct amdgpu_reset_domain *reset_domain); > > void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain *reset_domain); > > -- > 2.25.1 >
Am 10.02.22 um 04:17 schrieb Andrey Grodzovsky: > Seems I forgot to add this to the relevant commit > when submitting. Rebase/merge issue? Looks like it. > > Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> > Reported-by: kernel test robot <lkp@intel.com> Reviewed-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h > index 92de3b7965a1..1949dbe28a86 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h > @@ -118,8 +118,7 @@ static inline bool amdgpu_reset_domain_schedule(struct amdgpu_reset_domain *doma > return queue_work(domain->wq, work); > } > > -void amdgpu_device_lock_reset_domain(struct amdgpu_reset_domain *reset_domain, > - struct amdgpu_hive_info *hive); > +void amdgpu_device_lock_reset_domain(struct amdgpu_reset_domain *reset_domain); > > void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain *reset_domain); >
Am 10.02.22 um 08:06 schrieb Christian König: > Am 10.02.22 um 04:17 schrieb Andrey Grodzovsky: >> Seems I forgot to add this to the relevant commit >> when submitting. > > Rebase/merge issue? Looks like it. > >> >> Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> >> Reported-by: kernel test robot <lkp@intel.com> > > Reviewed-by: Christian König <christian.koenig@amd.com> BTW: I've gone ahead and pushed this to drm-misc-next because I just broke basically every build :) Christian. > >> --- >> drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h >> index 92de3b7965a1..1949dbe28a86 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h >> @@ -118,8 +118,7 @@ static inline bool >> amdgpu_reset_domain_schedule(struct amdgpu_reset_domain *doma >> return queue_work(domain->wq, work); >> } >> -void amdgpu_device_lock_reset_domain(struct amdgpu_reset_domain >> *reset_domain, >> - struct amdgpu_hive_info *hive); >> +void amdgpu_device_lock_reset_domain(struct amdgpu_reset_domain >> *reset_domain); >> void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain >> *reset_domain); >
On 2022-02-10 02:06, Christian König wrote: > Am 10.02.22 um 04:17 schrieb Andrey Grodzovsky: >> Seems I forgot to add this to the relevant commit >> when submitting. > > Rebase/merge issue? Looks like it. It looks more like I forgot to add the header file change to the commit after updating with your comments. Thanks for pushing it. Andrey > >> >> Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> >> Reported-by: kernel test robot <lkp@intel.com> > > Reviewed-by: Christian König <christian.koenig@amd.com> > >> --- >> drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h >> index 92de3b7965a1..1949dbe28a86 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h >> @@ -118,8 +118,7 @@ static inline bool >> amdgpu_reset_domain_schedule(struct amdgpu_reset_domain *doma >> return queue_work(domain->wq, work); >> } >> -void amdgpu_device_lock_reset_domain(struct amdgpu_reset_domain >> *reset_domain, >> - struct amdgpu_hive_info *hive); >> +void amdgpu_device_lock_reset_domain(struct amdgpu_reset_domain >> *reset_domain); >> void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain >> *reset_domain); >
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h index 92de3b7965a1..1949dbe28a86 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h @@ -118,8 +118,7 @@ static inline bool amdgpu_reset_domain_schedule(struct amdgpu_reset_domain *doma return queue_work(domain->wq, work); } -void amdgpu_device_lock_reset_domain(struct amdgpu_reset_domain *reset_domain, - struct amdgpu_hive_info *hive); +void amdgpu_device_lock_reset_domain(struct amdgpu_reset_domain *reset_domain); void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain *reset_domain);
Seems I forgot to add this to the relevant commit when submitting. Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> Reported-by: kernel test robot <lkp@intel.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)