* [PATCH] drm/amdgpu: Fix oops when pp_funcs->switch_power_profile is unset @ 2018-11-15 21:56 Kuehling, Felix [not found] ` <1542318992-12464-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: Kuehling, Felix @ 2018-11-15 21:56 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Kuehling, Felix, Joerg Roedel On Vega20 and other pre-production GPUs, powerplay is not enabled yet. Check for NULL pointers before calling pp_funcs function pointers. Also affects Kaveri. CC: Joerg Roedel <jroedel@suse.de> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c index a9c7597..1c1fed6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c @@ -503,8 +503,11 @@ void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle) { struct amdgpu_device *adev = (struct amdgpu_device *)kgd; - amdgpu_dpm_switch_power_profile(adev, - PP_SMC_POWER_PROFILE_COMPUTE, !idle); + if (adev->powerplay.pp_funcs && + adev->powerplay.pp_funcs->switch_power_profile) + amdgpu_dpm_switch_power_profile(adev, + PP_SMC_POWER_PROFILE_COMPUTE, + !idle); } bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid) -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 6+ messages in thread
[parent not found: <1542318992-12464-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org>]
* Re: [PATCH] drm/amdgpu: Fix oops when pp_funcs->switch_power_profile is unset [not found] ` <1542318992-12464-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org> @ 2018-11-15 21:59 ` Deucher, Alexander [not found] ` <BN6PR12MB180900E62C3F2EB8C61C1FAFF7DC0-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 2018-11-16 17:06 ` Joerg Roedel 2018-11-19 8:48 ` Christian König 2 siblings, 1 reply; 6+ messages in thread From: Deucher, Alexander @ 2018-11-15 21:59 UTC (permalink / raw) To: Kuehling, Felix, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Joerg Roedel [-- Attachment #1.1: Type: text/plain, Size: 2006 bytes --] Reviewed-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org> ________________________________ From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Kuehling, Felix <Felix.Kuehling-5C7GfCeVMHo@public.gmane.org> Sent: Thursday, November 15, 2018 4:56:51 PM To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Kuehling, Felix; Joerg Roedel Subject: [PATCH] drm/amdgpu: Fix oops when pp_funcs->switch_power_profile is unset On Vega20 and other pre-production GPUs, powerplay is not enabled yet. Check for NULL pointers before calling pp_funcs function pointers. Also affects Kaveri. CC: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org> Signed-off-by: Felix Kuehling <Felix.Kuehling-5C7GfCeVMHo@public.gmane.org> --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c index a9c7597..1c1fed6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c @@ -503,8 +503,11 @@ void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle) { struct amdgpu_device *adev = (struct amdgpu_device *)kgd; - amdgpu_dpm_switch_power_profile(adev, - PP_SMC_POWER_PROFILE_COMPUTE, !idle); + if (adev->powerplay.pp_funcs && + adev->powerplay.pp_funcs->switch_power_profile) + amdgpu_dpm_switch_power_profile(adev, + PP_SMC_POWER_PROFILE_COMPUTE, + !idle); } bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid) -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx [-- Attachment #1.2: Type: text/html, Size: 3985 bytes --] [-- Attachment #2: Type: text/plain, Size: 154 bytes --] _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 6+ messages in thread
[parent not found: <BN6PR12MB180900E62C3F2EB8C61C1FAFF7DC0-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>]
* Re: [PATCH] drm/amdgpu: Fix oops when pp_funcs->switch_power_profile is unset [not found] ` <BN6PR12MB180900E62C3F2EB8C61C1FAFF7DC0-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> @ 2018-11-19 20:02 ` Kuehling, Felix [not found] ` <f1108e8c-d330-bff3-b04b-4e79aaeabb9a-5C7GfCeVMHo@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: Kuehling, Felix @ 2018-11-19 20:02 UTC (permalink / raw) To: Deucher, Alexander, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Joerg Roedel I pushed the change to amd-staging-drm-next. I'd also like to get it into drm-fixes. Should I cherry-pick it to your drm-fixes-4.20 branch on fd.o? Thanks, Felix On 2018-11-15 4:59 p.m., Deucher, Alexander wrote: > > Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > > ------------------------------------------------------------------------ > *From:* amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of > Kuehling, Felix <Felix.Kuehling@amd.com> > *Sent:* Thursday, November 15, 2018 4:56:51 PM > *To:* amd-gfx@lists.freedesktop.org > *Cc:* Kuehling, Felix; Joerg Roedel > *Subject:* [PATCH] drm/amdgpu: Fix oops when > pp_funcs->switch_power_profile is unset > > On Vega20 and other pre-production GPUs, powerplay is not enabled yet. > Check for NULL pointers before calling pp_funcs function pointers. > > Also affects Kaveri. > > CC: Joerg Roedel <jroedel@suse.de> > Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c > index a9c7597..1c1fed6 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c > @@ -503,8 +503,11 @@ void amdgpu_amdkfd_set_compute_idle(struct > kgd_dev *kgd, bool idle) > { > struct amdgpu_device *adev = (struct amdgpu_device *)kgd; > > - amdgpu_dpm_switch_power_profile(adev, > - PP_SMC_POWER_PROFILE_COMPUTE, > !idle); > + if (adev->powerplay.pp_funcs && > + adev->powerplay.pp_funcs->switch_power_profile) > + amdgpu_dpm_switch_power_profile(adev, > + > PP_SMC_POWER_PROFILE_COMPUTE, > + !idle); > } > > bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid) > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <f1108e8c-d330-bff3-b04b-4e79aaeabb9a-5C7GfCeVMHo@public.gmane.org>]
* Re: [PATCH] drm/amdgpu: Fix oops when pp_funcs->switch_power_profile is unset [not found] ` <f1108e8c-d330-bff3-b04b-4e79aaeabb9a-5C7GfCeVMHo@public.gmane.org> @ 2018-11-19 20:26 ` Deucher, Alexander 0 siblings, 0 replies; 6+ messages in thread From: Deucher, Alexander @ 2018-11-19 20:26 UTC (permalink / raw) To: Kuehling, Felix, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Joerg Roedel [-- Attachment #1.1: Type: text/plain, Size: 2690 bytes --] I'll grab it for my -fixes pull this week. Alex ________________________________ From: Kuehling, Felix Sent: Monday, November 19, 2018 3:02:27 PM To: Deucher, Alexander; amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Joerg Roedel Subject: Re: [PATCH] drm/amdgpu: Fix oops when pp_funcs->switch_power_profile is unset I pushed the change to amd-staging-drm-next. I'd also like to get it into drm-fixes. Should I cherry-pick it to your drm-fixes-4.20 branch on fd.o? Thanks, Felix On 2018-11-15 4:59 p.m., Deucher, Alexander wrote: > > Reviewed-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org> > > ------------------------------------------------------------------------ > *From:* amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of > Kuehling, Felix <Felix.Kuehling-5C7GfCeVMHo@public.gmane.org> > *Sent:* Thursday, November 15, 2018 4:56:51 PM > *To:* amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > *Cc:* Kuehling, Felix; Joerg Roedel > *Subject:* [PATCH] drm/amdgpu: Fix oops when > pp_funcs->switch_power_profile is unset > > On Vega20 and other pre-production GPUs, powerplay is not enabled yet. > Check for NULL pointers before calling pp_funcs function pointers. > > Also affects Kaveri. > > CC: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org> > Signed-off-by: Felix Kuehling <Felix.Kuehling-5C7GfCeVMHo@public.gmane.org> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c > index a9c7597..1c1fed6 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c > @@ -503,8 +503,11 @@ void amdgpu_amdkfd_set_compute_idle(struct > kgd_dev *kgd, bool idle) > { > struct amdgpu_device *adev = (struct amdgpu_device *)kgd; > > - amdgpu_dpm_switch_power_profile(adev, > - PP_SMC_POWER_PROFILE_COMPUTE, > !idle); > + if (adev->powerplay.pp_funcs && > + adev->powerplay.pp_funcs->switch_power_profile) > + amdgpu_dpm_switch_power_profile(adev, > + > PP_SMC_POWER_PROFILE_COMPUTE, > + !idle); > } > > bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid) > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx [-- Attachment #1.2: Type: text/html, Size: 5084 bytes --] [-- Attachment #2: Type: text/plain, Size: 154 bytes --] _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/amdgpu: Fix oops when pp_funcs->switch_power_profile is unset [not found] ` <1542318992-12464-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org> 2018-11-15 21:59 ` Deucher, Alexander @ 2018-11-16 17:06 ` Joerg Roedel 2018-11-19 8:48 ` Christian König 2 siblings, 0 replies; 6+ messages in thread From: Joerg Roedel @ 2018-11-16 17:06 UTC (permalink / raw) To: Kuehling, Felix; +Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW On Thu, Nov 15, 2018 at 09:56:51PM +0000, Kuehling, Felix wrote: > On Vega20 and other pre-production GPUs, powerplay is not enabled yet. > Check for NULL pointers before calling pp_funcs function pointers. > > Also affects Kaveri. > > CC: Joerg Roedel <jroedel@suse.de> > Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) Tested on my Kaveri box and the issue is fixed, thanks! Tested-by: Joerg Roedel <jroedel@suse.de> _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/amdgpu: Fix oops when pp_funcs->switch_power_profile is unset [not found] ` <1542318992-12464-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org> 2018-11-15 21:59 ` Deucher, Alexander 2018-11-16 17:06 ` Joerg Roedel @ 2018-11-19 8:48 ` Christian König 2 siblings, 0 replies; 6+ messages in thread From: Christian König @ 2018-11-19 8:48 UTC (permalink / raw) To: Kuehling, Felix, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Joerg Roedel Am 15.11.18 um 22:56 schrieb Kuehling, Felix: > On Vega20 and other pre-production GPUs, powerplay is not enabled yet. > Check for NULL pointers before calling pp_funcs function pointers. > > Also affects Kaveri. > > CC: Joerg Roedel <jroedel@suse.de> > Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> Acked-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c > index a9c7597..1c1fed6 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c > @@ -503,8 +503,11 @@ void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle) > { > struct amdgpu_device *adev = (struct amdgpu_device *)kgd; > > - amdgpu_dpm_switch_power_profile(adev, > - PP_SMC_POWER_PROFILE_COMPUTE, !idle); > + if (adev->powerplay.pp_funcs && > + adev->powerplay.pp_funcs->switch_power_profile) > + amdgpu_dpm_switch_power_profile(adev, > + PP_SMC_POWER_PROFILE_COMPUTE, > + !idle); > } > > bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid) _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-11-19 20:26 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-11-15 21:56 [PATCH] drm/amdgpu: Fix oops when pp_funcs->switch_power_profile is unset Kuehling, Felix [not found] ` <1542318992-12464-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org> 2018-11-15 21:59 ` Deucher, Alexander [not found] ` <BN6PR12MB180900E62C3F2EB8C61C1FAFF7DC0-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 2018-11-19 20:02 ` Kuehling, Felix [not found] ` <f1108e8c-d330-bff3-b04b-4e79aaeabb9a-5C7GfCeVMHo@public.gmane.org> 2018-11-19 20:26 ` Deucher, Alexander 2018-11-16 17:06 ` Joerg Roedel 2018-11-19 8:48 ` Christian König
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.