* [PATCH 1/3] drm/amdgpu/smu11: fix firmware version check for vangogh @ 2021-10-12 15:53 Alex Deucher 2021-10-12 15:53 ` [PATCH 2/3] drm/amdgpu/swsmu: fix is_support_sw_smu() for VEGA20 Alex Deucher ` (2 more replies) 0 siblings, 3 replies; 10+ messages in thread From: Alex Deucher @ 2021-10-12 15:53 UTC (permalink / raw) To: amd-gfx; +Cc: Alex Deucher Was missed in the conversion to IP version checking. Fixes: af3b89d3a639d5 ("drm/amdgpu/smu11.0: convert to IP version checking") Signed-off-by: Alex Deucher <alexander.deucher@amd.com> --- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c index 3470c33ee09d..6d008e9c2f65 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c @@ -255,7 +255,7 @@ int smu_v11_0_check_fw_version(struct smu_context *smu) case IP_VERSION(11, 0, 11): smu->smc_driver_if_version = SMU11_DRIVER_IF_VERSION_Navy_Flounder; break; - case CHIP_VANGOGH: + case IP_VERSION(11, 5, 0): smu->smc_driver_if_version = SMU11_DRIVER_IF_VERSION_VANGOGH; break; case IP_VERSION(11, 0, 12): -- 2.31.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] drm/amdgpu/swsmu: fix is_support_sw_smu() for VEGA20 2021-10-12 15:53 [PATCH 1/3] drm/amdgpu/smu11: fix firmware version check for vangogh Alex Deucher @ 2021-10-12 15:53 ` Alex Deucher 2021-10-13 18:20 ` Alex Deucher 2021-10-12 15:53 ` [PATCH 3/3] drm/amdgpu/psp: add some missing cases to psp_check_pmfw_centralized_cstate_management Alex Deucher 2021-10-13 7:11 ` [PATCH 1/3] drm/amdgpu/smu11: fix firmware version check for vangogh Quan, Evan 2 siblings, 1 reply; 10+ messages in thread From: Alex Deucher @ 2021-10-12 15:53 UTC (permalink / raw) To: amd-gfx; +Cc: Alex Deucher VEGA20 is 11.0.2, but it's handled by powerplay, not swsmu. Fixes: a8967967f6a554 ("drm/amdgpu/amdgpu_smu: convert to IP version checking") Signed-off-by: Alex Deucher <alexander.deucher@amd.com> --- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c index 4ea7e90ef60d..f5bf3ab0ebad 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c @@ -455,6 +455,10 @@ static int smu_get_power_num_states(void *handle, bool is_support_sw_smu(struct amdgpu_device *adev) { + /* vega20 is 11.0.2, but it's supported via the powerplay code */ + if (adev->asic_type == CHIP_VEGA20) + return false; + if (adev->ip_versions[MP1_HWIP][0] >= IP_VERSION(11, 0, 0)) return true; -- 2.31.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] drm/amdgpu/swsmu: fix is_support_sw_smu() for VEGA20 2021-10-12 15:53 ` [PATCH 2/3] drm/amdgpu/swsmu: fix is_support_sw_smu() for VEGA20 Alex Deucher @ 2021-10-13 18:20 ` Alex Deucher 0 siblings, 0 replies; 10+ messages in thread From: Alex Deucher @ 2021-10-13 18:20 UTC (permalink / raw) To: Alex Deucher; +Cc: amd-gfx list Ping on this series. On Tue, Oct 12, 2021 at 11:53 AM Alex Deucher <alexander.deucher@amd.com> wrote: > > VEGA20 is 11.0.2, but it's handled by powerplay, not > swsmu. > > Fixes: a8967967f6a554 ("drm/amdgpu/amdgpu_smu: convert to IP version checking") > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > index 4ea7e90ef60d..f5bf3ab0ebad 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > @@ -455,6 +455,10 @@ static int smu_get_power_num_states(void *handle, > > bool is_support_sw_smu(struct amdgpu_device *adev) > { > + /* vega20 is 11.0.2, but it's supported via the powerplay code */ > + if (adev->asic_type == CHIP_VEGA20) > + return false; > + > if (adev->ip_versions[MP1_HWIP][0] >= IP_VERSION(11, 0, 0)) > return true; > > -- > 2.31.1 > ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] drm/amdgpu/psp: add some missing cases to psp_check_pmfw_centralized_cstate_management 2021-10-12 15:53 [PATCH 1/3] drm/amdgpu/smu11: fix firmware version check for vangogh Alex Deucher 2021-10-12 15:53 ` [PATCH 2/3] drm/amdgpu/swsmu: fix is_support_sw_smu() for VEGA20 Alex Deucher @ 2021-10-12 15:53 ` Alex Deucher 2021-10-14 1:41 ` Quan, Evan 2021-10-13 7:11 ` [PATCH 1/3] drm/amdgpu/smu11: fix firmware version check for vangogh Quan, Evan 2 siblings, 1 reply; 10+ messages in thread From: Alex Deucher @ 2021-10-12 15:53 UTC (permalink / raw) To: amd-gfx; +Cc: Alex Deucher Missed a few asics. Fixes: 82d05736c47b19 ("drm/amdgpu/amdgpu_psp: convert to IP version checking") Signed-off-by: Alex Deucher <alexander.deucher@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index 6b39e6c02dd8..51620f2fc43a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -77,7 +77,9 @@ static void psp_check_pmfw_centralized_cstate_management(struct psp_context *psp } switch (adev->ip_versions[MP0_HWIP][0]) { + case IP_VERSION(11, 0, 0): case IP_VERSION(11, 0, 4): + case IP_VERSION(11, 0, 5): case IP_VERSION(11, 0, 7): case IP_VERSION(11, 0, 9): case IP_VERSION(11, 0, 11): -- 2.31.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* RE: [PATCH 3/3] drm/amdgpu/psp: add some missing cases to psp_check_pmfw_centralized_cstate_management 2021-10-12 15:53 ` [PATCH 3/3] drm/amdgpu/psp: add some missing cases to psp_check_pmfw_centralized_cstate_management Alex Deucher @ 2021-10-14 1:41 ` Quan, Evan 2021-10-14 2:00 ` Alex Deucher 0 siblings, 1 reply; 10+ messages in thread From: Quan, Evan @ 2021-10-14 1:41 UTC (permalink / raw) To: Deucher, Alexander, amd-gfx; +Cc: Deucher, Alexander [AMD Official Use Only] I assume IP_VERSION(11, 0, 0) and IP_VERSION(11, 0, 5) are for Navi10 and Navi14 respectively. Then according to the code comment that " pmfw_centralized_cstate_management support is available for Navi12 and onwards only", I think they should be handled by "default" branch. That means this patch seems unnecessary. Patch1 and 2 are reviewed-by: Evan Quan <evan.quan@amd.com> > -----Original Message----- > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex > Deucher > Sent: Tuesday, October 12, 2021 11:53 PM > To: amd-gfx@lists.freedesktop.org > Cc: Deucher, Alexander <Alexander.Deucher@amd.com> > Subject: [PATCH 3/3] drm/amdgpu/psp: add some missing cases to > psp_check_pmfw_centralized_cstate_management > > Missed a few asics. > > Fixes: 82d05736c47b19 ("drm/amdgpu/amdgpu_psp: convert to IP version > checking") > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > index 6b39e6c02dd8..51620f2fc43a 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > @@ -77,7 +77,9 @@ static void > psp_check_pmfw_centralized_cstate_management(struct psp_context > *psp > } > > switch (adev->ip_versions[MP0_HWIP][0]) { > + case IP_VERSION(11, 0, 0): > case IP_VERSION(11, 0, 4): > + case IP_VERSION(11, 0, 5): > case IP_VERSION(11, 0, 7): > case IP_VERSION(11, 0, 9): > case IP_VERSION(11, 0, 11): > -- > 2.31.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] drm/amdgpu/psp: add some missing cases to psp_check_pmfw_centralized_cstate_management 2021-10-14 1:41 ` Quan, Evan @ 2021-10-14 2:00 ` Alex Deucher 2021-10-14 2:29 ` Quan, Evan 0 siblings, 1 reply; 10+ messages in thread From: Alex Deucher @ 2021-10-14 2:00 UTC (permalink / raw) To: Quan, Evan; +Cc: Deucher, Alexander, amd-gfx On Wed, Oct 13, 2021 at 9:41 PM Quan, Evan <Evan.Quan@amd.com> wrote: > > [AMD Official Use Only] > > I assume IP_VERSION(11, 0, 0) and IP_VERSION(11, 0, 5) are for Navi10 and Navi14 respectively. > Then according to the code comment that " pmfw_centralized_cstate_management support is available for Navi12 and onwards only", I think they should be handled by "default" branch. That means this patch seems unnecessary. > The original code was this: if ((adev->asic_type >= CHIP_ARCTURUS) || (adev->asic_type >= CHIP_NAVI12)) psp->pmfw_centralized_cstate_management = true; So navi10 and 14 were included. Not sure whether they should have been or not. Alex > Patch1 and 2 are reviewed-by: Evan Quan <evan.quan@amd.com> > > > -----Original Message----- > > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex > > Deucher > > Sent: Tuesday, October 12, 2021 11:53 PM > > To: amd-gfx@lists.freedesktop.org > > Cc: Deucher, Alexander <Alexander.Deucher@amd.com> > > Subject: [PATCH 3/3] drm/amdgpu/psp: add some missing cases to > > psp_check_pmfw_centralized_cstate_management > > > > Missed a few asics. > > > > Fixes: 82d05736c47b19 ("drm/amdgpu/amdgpu_psp: convert to IP version > > checking") > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > > --- > > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > index 6b39e6c02dd8..51620f2fc43a 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > @@ -77,7 +77,9 @@ static void > > psp_check_pmfw_centralized_cstate_management(struct psp_context > > *psp > > } > > > > switch (adev->ip_versions[MP0_HWIP][0]) { > > + case IP_VERSION(11, 0, 0): > > case IP_VERSION(11, 0, 4): > > + case IP_VERSION(11, 0, 5): > > case IP_VERSION(11, 0, 7): > > case IP_VERSION(11, 0, 9): > > case IP_VERSION(11, 0, 11): > > -- > > 2.31.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: [PATCH 3/3] drm/amdgpu/psp: add some missing cases to psp_check_pmfw_centralized_cstate_management 2021-10-14 2:00 ` Alex Deucher @ 2021-10-14 2:29 ` Quan, Evan 2021-10-14 2:34 ` Alex Deucher 0 siblings, 1 reply; 10+ messages in thread From: Quan, Evan @ 2021-10-14 2:29 UTC (permalink / raw) To: Alex Deucher; +Cc: Deucher, Alexander, amd-gfx [AMD Official Use Only] > -----Original Message----- > From: Alex Deucher <alexdeucher@gmail.com> > Sent: Thursday, October 14, 2021 10:00 AM > To: Quan, Evan <Evan.Quan@amd.com> > Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; amd- > gfx@lists.freedesktop.org > Subject: Re: [PATCH 3/3] drm/amdgpu/psp: add some missing cases to > psp_check_pmfw_centralized_cstate_management > > On Wed, Oct 13, 2021 at 9:41 PM Quan, Evan <Evan.Quan@amd.com> wrote: > > > > [AMD Official Use Only] > > > > I assume IP_VERSION(11, 0, 0) and IP_VERSION(11, 0, 5) are for Navi10 and > Navi14 respectively. > > Then according to the code comment that " > pmfw_centralized_cstate_management support is available for Navi12 and > onwards only", I think they should be handled by "default" branch. That > means this patch seems unnecessary. > > > > The original code was this: > if ((adev->asic_type >= CHIP_ARCTURUS) || > (adev->asic_type >= CHIP_NAVI12)) > psp->pmfw_centralized_cstate_management = true; So navi10 and > 14 were included. Not sure whether they should have been or not. [Quan, Evan] OK. That will make sense. Series is reviewed-by: Evan Quan <evan.quan@amd.com> Dig a little more about the history. It seems at first the centralized_cstate_management was limited to ARCTURUS or >= CHIP_NAIV12. Then it was expanded to all ASICs >= CHIP_ ARCTURUS. But the code comment was left outdated. Can you get that updated on code submit? @@ -65,7 +65,6 @@ static int psp_securedisplay_terminate(struct psp_context *psp); * * This new sequence is required for * - Arcturus and onwards - * - Navi12 and onwards */ BR Evan > > Alex > > > > Patch1 and 2 are reviewed-by: Evan Quan <evan.quan@amd.com> > > > > > -----Original Message----- > > > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of > > > Alex Deucher > > > Sent: Tuesday, October 12, 2021 11:53 PM > > > To: amd-gfx@lists.freedesktop.org > > > Cc: Deucher, Alexander <Alexander.Deucher@amd.com> > > > Subject: [PATCH 3/3] drm/amdgpu/psp: add some missing cases to > > > psp_check_pmfw_centralized_cstate_management > > > > > > Missed a few asics. > > > > > > Fixes: 82d05736c47b19 ("drm/amdgpu/amdgpu_psp: convert to IP > version > > > checking") > > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > > > --- > > > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > > index 6b39e6c02dd8..51620f2fc43a 100644 > > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > > @@ -77,7 +77,9 @@ static void > > > psp_check_pmfw_centralized_cstate_management(struct psp_context > *psp > > > } > > > > > > switch (adev->ip_versions[MP0_HWIP][0]) { > > > + case IP_VERSION(11, 0, 0): > > > case IP_VERSION(11, 0, 4): > > > + case IP_VERSION(11, 0, 5): > > > case IP_VERSION(11, 0, 7): > > > case IP_VERSION(11, 0, 9): > > > case IP_VERSION(11, 0, 11): > > > -- > > > 2.31.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] drm/amdgpu/psp: add some missing cases to psp_check_pmfw_centralized_cstate_management 2021-10-14 2:29 ` Quan, Evan @ 2021-10-14 2:34 ` Alex Deucher 0 siblings, 0 replies; 10+ messages in thread From: Alex Deucher @ 2021-10-14 2:34 UTC (permalink / raw) To: Quan, Evan; +Cc: Deucher, Alexander, amd-gfx On Wed, Oct 13, 2021 at 10:29 PM Quan, Evan <Evan.Quan@amd.com> wrote: > > [AMD Official Use Only] > > > > > -----Original Message----- > > From: Alex Deucher <alexdeucher@gmail.com> > > Sent: Thursday, October 14, 2021 10:00 AM > > To: Quan, Evan <Evan.Quan@amd.com> > > Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; amd- > > gfx@lists.freedesktop.org > > Subject: Re: [PATCH 3/3] drm/amdgpu/psp: add some missing cases to > > psp_check_pmfw_centralized_cstate_management > > > > On Wed, Oct 13, 2021 at 9:41 PM Quan, Evan <Evan.Quan@amd.com> wrote: > > > > > > [AMD Official Use Only] > > > > > > I assume IP_VERSION(11, 0, 0) and IP_VERSION(11, 0, 5) are for Navi10 and > > Navi14 respectively. > > > Then according to the code comment that " > > pmfw_centralized_cstate_management support is available for Navi12 and > > onwards only", I think they should be handled by "default" branch. That > > means this patch seems unnecessary. > > > > > > > The original code was this: > > if ((adev->asic_type >= CHIP_ARCTURUS) || > > (adev->asic_type >= CHIP_NAVI12)) > > psp->pmfw_centralized_cstate_management = true; So navi10 and > > 14 were included. Not sure whether they should have been or not. > [Quan, Evan] OK. That will make sense. Series is reviewed-by: Evan Quan <evan.quan@amd.com> > Dig a little more about the history. > It seems at first the centralized_cstate_management was limited to ARCTURUS or >= CHIP_NAIV12. Then it was expanded to all ASICs >= CHIP_ ARCTURUS. > But the code comment was left outdated. Can you get that updated on code submit? > @@ -65,7 +65,6 @@ static int psp_securedisplay_terminate(struct psp_context *psp); > * > * This new sequence is required for > * - Arcturus and onwards > - * - Navi12 and onwards > */ Will do. Thanks! Alex > > BR > Evan > > > > Alex > > > > > > > Patch1 and 2 are reviewed-by: Evan Quan <evan.quan@amd.com> > > > > > > > -----Original Message----- > > > > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of > > > > Alex Deucher > > > > Sent: Tuesday, October 12, 2021 11:53 PM > > > > To: amd-gfx@lists.freedesktop.org > > > > Cc: Deucher, Alexander <Alexander.Deucher@amd.com> > > > > Subject: [PATCH 3/3] drm/amdgpu/psp: add some missing cases to > > > > psp_check_pmfw_centralized_cstate_management > > > > > > > > Missed a few asics. > > > > > > > > Fixes: 82d05736c47b19 ("drm/amdgpu/amdgpu_psp: convert to IP > > version > > > > checking") > > > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > > > > --- > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 ++ > > > > 1 file changed, 2 insertions(+) > > > > > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > > > index 6b39e6c02dd8..51620f2fc43a 100644 > > > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > > > @@ -77,7 +77,9 @@ static void > > > > psp_check_pmfw_centralized_cstate_management(struct psp_context > > *psp > > > > } > > > > > > > > switch (adev->ip_versions[MP0_HWIP][0]) { > > > > + case IP_VERSION(11, 0, 0): > > > > case IP_VERSION(11, 0, 4): > > > > + case IP_VERSION(11, 0, 5): > > > > case IP_VERSION(11, 0, 7): > > > > case IP_VERSION(11, 0, 9): > > > > case IP_VERSION(11, 0, 11): > > > > -- > > > > 2.31.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: [PATCH 1/3] drm/amdgpu/smu11: fix firmware version check for vangogh 2021-10-12 15:53 [PATCH 1/3] drm/amdgpu/smu11: fix firmware version check for vangogh Alex Deucher 2021-10-12 15:53 ` [PATCH 2/3] drm/amdgpu/swsmu: fix is_support_sw_smu() for VEGA20 Alex Deucher 2021-10-12 15:53 ` [PATCH 3/3] drm/amdgpu/psp: add some missing cases to psp_check_pmfw_centralized_cstate_management Alex Deucher @ 2021-10-13 7:11 ` Quan, Evan 2021-10-13 17:08 ` Alex Deucher 2 siblings, 1 reply; 10+ messages in thread From: Quan, Evan @ 2021-10-13 7:11 UTC (permalink / raw) To: Deucher, Alexander, amd-gfx; +Cc: Deucher, Alexander [AMD Official Use Only] Reviewed-by: Evan Quan <evan.quan@amd.com> > -----Original Message----- > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex > Deucher > Sent: Tuesday, October 12, 2021 11:53 PM > To: amd-gfx@lists.freedesktop.org > Cc: Deucher, Alexander <Alexander.Deucher@amd.com> > Subject: [PATCH 1/3] drm/amdgpu/smu11: fix firmware version check for > vangogh > > Was missed in the conversion to IP version checking. > > Fixes: af3b89d3a639d5 ("drm/amdgpu/smu11.0: convert to IP version > checking") > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c > b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c > index 3470c33ee09d..6d008e9c2f65 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c > @@ -255,7 +255,7 @@ int smu_v11_0_check_fw_version(struct > smu_context *smu) > case IP_VERSION(11, 0, 11): > smu->smc_driver_if_version = > SMU11_DRIVER_IF_VERSION_Navy_Flounder; > break; > - case CHIP_VANGOGH: > + case IP_VERSION(11, 5, 0): > smu->smc_driver_if_version = > SMU11_DRIVER_IF_VERSION_VANGOGH; > break; > case IP_VERSION(11, 0, 12): > -- > 2.31.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] drm/amdgpu/smu11: fix firmware version check for vangogh 2021-10-13 7:11 ` [PATCH 1/3] drm/amdgpu/smu11: fix firmware version check for vangogh Quan, Evan @ 2021-10-13 17:08 ` Alex Deucher 0 siblings, 0 replies; 10+ messages in thread From: Alex Deucher @ 2021-10-13 17:08 UTC (permalink / raw) To: Quan, Evan; +Cc: Deucher, Alexander, amd-gfx On Wed, Oct 13, 2021 at 3:12 AM Quan, Evan <Evan.Quan@amd.com> wrote: > > [AMD Official Use Only] > > Reviewed-by: Evan Quan <evan.quan@amd.com> Is this for just this patch or the series? Alex > > > -----Original Message----- > > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex > > Deucher > > Sent: Tuesday, October 12, 2021 11:53 PM > > To: amd-gfx@lists.freedesktop.org > > Cc: Deucher, Alexander <Alexander.Deucher@amd.com> > > Subject: [PATCH 1/3] drm/amdgpu/smu11: fix firmware version check for > > vangogh > > > > Was missed in the conversion to IP version checking. > > > > Fixes: af3b89d3a639d5 ("drm/amdgpu/smu11.0: convert to IP version > > checking") > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > > --- > > drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c > > b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c > > index 3470c33ee09d..6d008e9c2f65 100644 > > --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c > > +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c > > @@ -255,7 +255,7 @@ int smu_v11_0_check_fw_version(struct > > smu_context *smu) > > case IP_VERSION(11, 0, 11): > > smu->smc_driver_if_version = > > SMU11_DRIVER_IF_VERSION_Navy_Flounder; > > break; > > - case CHIP_VANGOGH: > > + case IP_VERSION(11, 5, 0): > > smu->smc_driver_if_version = > > SMU11_DRIVER_IF_VERSION_VANGOGH; > > break; > > case IP_VERSION(11, 0, 12): > > -- > > 2.31.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-10-14 2:34 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-10-12 15:53 [PATCH 1/3] drm/amdgpu/smu11: fix firmware version check for vangogh Alex Deucher 2021-10-12 15:53 ` [PATCH 2/3] drm/amdgpu/swsmu: fix is_support_sw_smu() for VEGA20 Alex Deucher 2021-10-13 18:20 ` Alex Deucher 2021-10-12 15:53 ` [PATCH 3/3] drm/amdgpu/psp: add some missing cases to psp_check_pmfw_centralized_cstate_management Alex Deucher 2021-10-14 1:41 ` Quan, Evan 2021-10-14 2:00 ` Alex Deucher 2021-10-14 2:29 ` Quan, Evan 2021-10-14 2:34 ` Alex Deucher 2021-10-13 7:11 ` [PATCH 1/3] drm/amdgpu/smu11: fix firmware version check for vangogh Quan, Evan 2021-10-13 17:08 ` Alex Deucher
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.