[PATCH v2 1/3] drm/amdgpu: add Vangogh APU flag to IP discovery path

[PATCH v2 1/3] drm/amdgpu: add Vangogh APU flag to IP discovery path

[Perry Yuan]

Add the missing apu flag for Vangogh when using IP discovery code path
to initialize IPs

Signed-off-by: Perry Yuan <Perry.Yuan@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 95d34590cad1..c1b1f223f3d0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2153,6 +2153,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
 		break;
 	case IP_VERSION(10, 3, 1):
 		adev->family = AMDGPU_FAMILY_VGH;
+		adev->apu_flags |= AMD_APU_IS_VANGOGH;
 		break;
 	case IP_VERSION(10, 3, 3):
 		adev->family = AMDGPU_FAMILY_YC;
-- 
2.34.1

[PATCH v2 2/3] drm/amd/display: change GPU match with IP version for Vangogh

[Perry Yuan]

Use ip versions (10,3,1) to match the GPU after Vangogh switched to use IP
discovery path.

Signed-off-by: Perry Yuan <Perry.Yuan@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 1efe7fa5bc58..90636b88d6bf 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -10202,8 +10202,8 @@ int amdgpu_dm_process_dmub_aux_transfer_sync(bool is_cmd_aux, struct dc_context
  */
 bool check_seamless_boot_capability(struct amdgpu_device *adev)
 {
-	switch (adev->asic_type) {
-	case CHIP_VANGOGH:
+	switch (adev->ip_versions[GC_HWIP][0]) {
+	case IP_VERSION(10, 3, 1):
 		if (!adev->mman.keep_stolen_vga_memory)
 			return true;
 		break;
-- 
2.34.1

[PATCH v2 3/3] drm/amdgpu: remove the DID of Vangogh from pciidlist

[Perry Yuan]

change the vangogh family to use IP discovery path to initialize IP
list, this needs to remove the DID from the PCI ID list to allow the IP
discovery path to set all the IP versions correctly.

Signed-off-by: Perry Yuan <Perry.Yuan@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 429fcdf28836..9c323405e3bb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -1909,9 +1909,6 @@ static const struct pci_device_id pciidlist[] = {
 	{0x1002, 0x73AF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID},
 	{0x1002, 0x73BF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID},
 
-	/* Van Gogh */
-	{0x1002, 0x163F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VANGOGH|AMD_IS_APU},
-
 	/* Yellow Carp */
 	{0x1002, 0x164D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_YELLOW_CARP|AMD_IS_APU},
 	{0x1002, 0x1681, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_YELLOW_CARP|AMD_IS_APU},
-- 
2.34.1

Re: [PATCH v2 2/3] drm/amd/display: change GPU match with IP version for Vangogh

[Alex Deucher]

On Wed, Nov 2, 2022 at 1:00 PM Perry Yuan <Perry.Yuan@amd.com> wrote:
>
> Use ip versions (10,3,1) to match the GPU after Vangogh switched to use IP
> discovery path.
>
> Signed-off-by: Perry Yuan <Perry.Yuan@amd.com>
> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 1efe7fa5bc58..90636b88d6bf 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -10202,8 +10202,8 @@ int amdgpu_dm_process_dmub_aux_transfer_sync(bool is_cmd_aux, struct dc_context
>   */
>  bool check_seamless_boot_capability(struct amdgpu_device *adev)
>  {
> -       switch (adev->asic_type) {
> -       case CHIP_VANGOGH:
> +       switch (adev->ip_versions[GC_HWIP][0]) {
> +       case IP_VERSION(10, 3, 1):

How about:
switch (adev->ip_versions[DCE_HWIP][0]) {
case IP_VERSION(3, 0, 1):

Since this code is more relevant to the DC IP than the GC IP.  With
that fixed, the series is:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

>                 if (!adev->mman.keep_stolen_vga_memory)
>                         return true;
>                 break;
> --
> 2.34.1
>

RE: [PATCH v2 2/3] drm/amd/display: change GPU match with IP version for Vangogh

[Yuan, Perry]

[AMD Official Use Only - General]

Hi Alex. 

> -----Original Message-----
> From: Alex Deucher <alexdeucher@gmail.com>
> Sent: Thursday, November 3, 2022 1:14 AM
> To: Yuan, Perry <Perry.Yuan@amd.com>
> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Liang, Richard qi
> <Richardqi.Liang@amd.com>; Huang, Shimmer
> <Shimmer.Huang@amd.com>; amd-gfx@lists.freedesktop.org; Liu, Kun
> <Kun.Liu2@amd.com>
> Subject: Re: [PATCH v2 2/3] drm/amd/display: change GPU match with IP
> version for Vangogh
> 
> Caution: This message originated from an External Source. Use proper
> caution when opening attachments, clicking links, or responding.
> 
> 
> On Wed, Nov 2, 2022 at 1:00 PM Perry Yuan <Perry.Yuan@amd.com> wrote:
> >
> > Use ip versions (10,3,1) to match the GPU after Vangogh switched to
> > use IP discovery path.
> >
> > Signed-off-by: Perry Yuan <Perry.Yuan@amd.com>
> > ---
> >  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> > b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> > index 1efe7fa5bc58..90636b88d6bf 100644
> > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> > @@ -10202,8 +10202,8 @@ int
> amdgpu_dm_process_dmub_aux_transfer_sync(bool is_cmd_aux, struct
> dc_context
> >   */
> >  bool check_seamless_boot_capability(struct amdgpu_device *adev)  {
> > -       switch (adev->asic_type) {
> > -       case CHIP_VANGOGH:
> > +       switch (adev->ip_versions[GC_HWIP][0]) {
> > +       case IP_VERSION(10, 3, 1):
> 
> How about:
> switch (adev->ip_versions[DCE_HWIP][0]) { case IP_VERSION(3, 0, 1):
> 
> Since this code is more relevant to the DC IP than the GC IP.  With that fixed,

You are right, The DCE IP is more reasonable to match this. 
V3 sent for the fix.

Perry. 

> the series is:
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> 
> >                 if (!adev->mman.keep_stolen_vga_memory)
> >                         return true;
> >                 break;
> > --
> > 2.34.1
> >