Skip to contentSkip to conversation

amdgpu: Fix failing boot after support for third vce ring

PATCH In review Ernst Sjöstrand 3 participants 17 messages Oct 14, 2016 15 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 amdgpu: Fix failing boot after support for third vce ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -1
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
 	    (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
 		return -ENOENT;
 
-	adev->vce.num_rings = 3;
+	adev->vce.num_rings = 2;
 
 	vce_v3_0_set_ring_funcs(adev);
 	vce_v3_0_set_irq_funcs(adev);
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1476449341-2673-1-git-send-email-ernstp-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#2 lore raw

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Ernst Sjöstrand <[email protected]>
Sent: Friday, October 14, 2016 08:49
To: [email protected]
Cc: Ernst Sjöstrand
Subject: [PATCH] amdgpu: Fix failing boot after support for third vce ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -1
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);

--
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CY4PR12MB1768CDAC43129C814D75DCE0F7DF0-rpdhrqHFk06yjjPBNVDk/[email protected]

#4 lore raw

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as
780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging). So the last of those two commits is the one that causes my problem.

Regards
//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]>:

Quoted 51 lines

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

------------------------------
*From:* amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Ernst Sjöstrand <[email protected]>
*Sent:* Friday, October 14, 2016 08:49
*To:* [email protected]
*Cc:* Ernst Sjöstrand
*Subject:* [PATCH] amdgpu: Fix failing boot after support for third vce
ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -2
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);
--

2.7.4

Quoted 13 lines

_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org
<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CAD=4a=XdwL5AaZ=kJKQXWgcYPUYrCJd4SMXT9FH470Ei5_dqOA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#6 lore raw

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

________________________________
From: Ernst Sjöstrand <[email protected]>
Sent: Friday, October 14, 2016 09:05
To: StDenis, Tom
Cc: [email protected]
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as 780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging). So the last of those two commits is the one that causes my problem.

Regards
//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org<mailto:[email protected]>> on behalf of Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 08:49
To: [email protected]<mailto:[email protected]>
Cc: Ernst Sjöstrand
Subject: [PATCH] amdgpu: Fix failing boot after support for third vce ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -1
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);

--
2.7.4

_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx> lists.freedesktop.org<http://lists.freedesktop.org>
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CY4PR12MB1768287E6AD0257F6330C5CFF7DF0-rpdhrqHFk06yjjPBNVDk/[email protected]

#8 lore raw

I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f. I think the problem is in drm-next now also.
They all have
6f0359f drm/amdgpu/vce3: add support for third vce ring 75c6548 drm/amdgpu: track the number of vce rings

But not
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode which only exists in amd-staging-4.7
(What does 4.7 mean in this context... ?)

Regards
//Ernst

2016-10-14 15:07 GMT+02:00 StDenis, Tom <[email protected]>:

Quoted 80 lines

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=
drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

------------------------------
*From:* Ernst Sjöstrand <[email protected]> *Sent:* Friday, October 14, 2016 09:05
*To:* StDenis, Tom
*Cc:* [email protected] *Subject:* Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as
780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging). So the last of those two commits is the one that causes my problem.

Regards
//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]>:

Quoted 51 lines

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

------------------------------
*From:* amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Ernst Sjöstrand <[email protected]>
*Sent:* Friday, October 14, 2016 08:49
*To:* [email protected]
*Cc:* Ernst Sjöstrand
*Subject:* [PATCH] amdgpu: Fix failing boot after support for third vce
ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -2
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);
--

2.7.4

Quoted 14 lines
Quoted 13 lines

_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org
<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CAD=4a=VjQmmZtLb9h87jzm_Oha+NOLZ83JeYRreQzwsK7aCZTw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#10 lore raw

You definitely need the patch from staging-4.7.

The "amd-staging-4.x" branches are what we (amd folk) normally develop against on a daily basis and then alex cherry picks them to drm-next-*. Sometimes patches are missed.

Hopefully Alex can cherry pick it to drm-next branches shortly [😊]

Tom

________________________________
From: Ernst Sjöstrand <[email protected]>
Sent: Friday, October 14, 2016 09:15
To: StDenis, Tom
Cc: [email protected]
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f. I think the problem is in drm-next now also.
They all have
6f0359f drm/amdgpu/vce3: add support for third vce ring 75c6548 drm/amdgpu: track the number of vce rings

But not
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode which only exists in amd-staging-4.7
(What does 4.7 mean in this context... ?)

Regards
//Ernst

2016-10-14 15:07 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

________________________________
From: Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 09:05
To: StDenis, Tom
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as 780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging). So the last of those two commits is the one that causes my problem.

Regards
//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

________________________________
From: amd-gfx <[email protected]<mailto:[email protected]>> on behalf of Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 08:49
To: [email protected]<mailto:[email protected]>
Cc: Ernst Sjöstrand
Subject: [PATCH] amdgpu: Fix failing boot after support for third vce ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -1
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);

--
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx> lists.freedesktop.org<http://lists.freedesktop.org>
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CY4PR12MB17686E7D2D814A6B94CA861AF7DF0-rpdhrqHFk06yjjPBNVDk/[email protected]

#12 lore raw

I squashed the phys mode fixes into the original patch patch for upstream:
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=d7ca7ab8259f43473bc387dda2a5b84aeb049961

Alex

From: amd-gfx [mailto:[email protected]] On Behalf Of StDenis, Tom
Sent: Friday, October 14, 2016 9:17 AM
To: Ernst Sjöstrand
Cc: [email protected]
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

You definitely need the patch from staging-4.7.

The "amd-staging-4.x" branches are what we (amd folk) normally develop against on a daily basis and then alex cherry picks them to drm-next-*. Sometimes patches are missed.

Hopefully Alex can cherry pick it to drm-next branches shortly [😊]

Tom

________________________________
From: Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 09:15
To: StDenis, Tom
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f. I think the problem is in drm-next now also.
They all have
6f0359f drm/amdgpu/vce3: add support for third vce ring 75c6548 drm/amdgpu: track the number of vce rings
But not
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode which only exists in amd-staging-4.7
(What does 4.7 mean in this context... ?)
Regards
//Ernst

2016-10-14 15:07 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

________________________________
From: Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 09:05
To: StDenis, Tom
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as 780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging). So the last of those two commits is the one that causes my problem.

Regards
//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

________________________________
From: amd-gfx <[email protected]<mailto:[email protected]>> on behalf of Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 08:49
To: [email protected]<mailto:[email protected]>
Cc: Ernst Sjöstrand
Subject: [PATCH] amdgpu: Fix failing boot after support for third vce ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -1
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);

--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx> lists.freedesktop.org<http://lists.freedesktop.org>
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#13 lore raw
In reply to a message not in the archive

9d24b304abbe5380da1bc782b4460596e7cb1109
cherry-picks cleanly on drm-next-4.9-wip but then fails to build:

CC [M] drivers/gpu/drm/amd/amdgpu/vce_v3_0.o
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:2: error: unknown field ‘type’ specified in initializer
.type = AMDGPU_RING_TYPE_VCE,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.type = AMDGPU_RING_TYPE_VCE,

          ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_rptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:2: error: unknown field ‘align_mask’ specified in initializer
.align_mask = 0xf,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.align_mask = 0xf,

                ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_wptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:856:2: error: unknown field ‘nop’ specified in initializer
.nop = VCE_CMD_NO_OP,
^

2016-10-14 15:15 GMT+02:00 Ernst Sjöstrand <[email protected]>:

Quoted 11 lines

I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f. I think the problem is in drm-next now also.
They all have
6f0359f drm/amdgpu/vce3: add support for third vce ring 75c6548 drm/amdgpu: track the number of vce rings

But not
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode which only exists in amd-staging-4.7
(What does 4.7 mean in this context... ?)

Quoted 101 lines

Regards
//Ernst

2016-10-14 15:07 GMT+02:00 StDenis, Tom <[email protected]>:

Quoted 94 lines

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm
-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

------------------------------
*From:* Ernst Sjöstrand <[email protected]> *Sent:* Friday, October 14, 2016 09:05
*To:* StDenis, Tom
*Cc:* [email protected] *Subject:* Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as
780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging). So the last of those two commits is the one that causes my problem.

Regards
//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]>:

Quoted 64 lines

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

------------------------------
*From:* amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Ernst Sjöstrand <[email protected]>
*Sent:* Friday, October 14, 2016 08:49
*To:* [email protected]
*Cc:* Ernst Sjöstrand
*Subject:* [PATCH] amdgpu: Fix failing boot after support for third vce
ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -2
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);
--

2.7.4

_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org
<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CAD=4a=VHdJ1WKE3XQmiSK+-M2NLfZq5N6kgU_J7tcjVmmz8vpg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#15 lore raw

Means the drm pull request for 4.9 is broken then also, FYI.

2016-10-14 15:17 GMT+02:00 Ernst Sjöstrand <[email protected]>:

Quoted 30 lines

9d24b304abbe5380da1bc782b4460596e7cb1109
cherry-picks cleanly on drm-next-4.9-wip but then fails to build:

CC [M] drivers/gpu/drm/amd/amdgpu/vce_v3_0.o
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:2: error: unknown field ‘type’ specified in initializer
.type = AMDGPU_RING_TYPE_VCE,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.type = AMDGPU_RING_TYPE_VCE,

          ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_rptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:2: error: unknown field ‘align_mask’ specified in initializer
.align_mask = 0xf,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.align_mask = 0xf,

                ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_wptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:856:2: error: unknown field ‘nop’ specified in initializer
.nop = VCE_CMD_NO_OP,
^

Quoted 115 lines

2016-10-14 15:15 GMT+02:00 Ernst Sjöstrand <[email protected]>:

Quoted 112 lines

I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f. I think the problem is in drm-next now also.
They all have
6f0359f drm/amdgpu/vce3: add support for third vce ring 75c6548 drm/amdgpu: track the number of vce rings

But not
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode which only exists in amd-staging-4.7
(What does 4.7 mean in this context... ?)

Regards
//Ernst

2016-10-14 15:07 GMT+02:00 StDenis, Tom <[email protected]>:

Quoted 94 lines

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm
-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

------------------------------
*From:* Ernst Sjöstrand <[email protected]> *Sent:* Friday, October 14, 2016 09:05
*To:* StDenis, Tom
*Cc:* [email protected] *Subject:* Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as
780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging). So the last of those two commits is the one that causes my problem.

Regards
//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]>:

Quoted 64 lines

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

------------------------------
*From:* amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Ernst Sjöstrand <[email protected]>
*Sent:* Friday, October 14, 2016 08:49
*To:* [email protected]
*Cc:* Ernst Sjöstrand
*Subject:* [PATCH] amdgpu: Fix failing boot after support for third
vce ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -2
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);
--

2.7.4

_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org
<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CAD=4a=XVD6dq7KWFtY9r5qS4saARoXvpqLcshX1L=Vibri7cLA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#17 lore raw

You'd need

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9ab4662c313d25731e53cc4f044bddb9c506ca13

and

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=da00756f75422b04befae381e7e48d0cacf299f3

I'll let Alex speak for the drm-next branches since he manages them.

Tom

________________________________
From: Ernst Sjöstrand <[email protected]>
Sent: Friday, October 14, 2016 09:20
To: StDenis, Tom
Cc: [email protected]
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Means the drm pull request for 4.9 is broken then also, FYI.

2016-10-14 15:17 GMT+02:00 Ernst Sjöstrand <[email protected]<mailto:[email protected]>>:
9d24b304abbe5380da1bc782b4460596e7cb1109
cherry-picks cleanly on drm-next-4.9-wip but then fails to build:

CC [M] drivers/gpu/drm/amd/amdgpu/vce_v3_0.o
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:2: error: unknown field ‘type’ specified in initializer
.type = AMDGPU_RING_TYPE_VCE,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.type = AMDGPU_RING_TYPE_VCE,

          ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_rptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:2: error: unknown field ‘align_mask’ specified in initializer
.align_mask = 0xf,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.align_mask = 0xf,

                ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_wptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:856:2: error: unknown field ‘nop’ specified in initializer
.nop = VCE_CMD_NO_OP,
^

2016-10-14 15:15 GMT+02:00 Ernst Sjöstrand <[email protected]<mailto:[email protected]>>:
I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f.
I think the problem is in drm-next now also.
They all have
6f0359f drm/amdgpu/vce3: add support for third vce ring
75c6548 drm/amdgpu: track the number of vce rings

But not
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode which only exists in amd-staging-4.7
(What does 4.7 mean in this context... ?)

Regards
//Ernst

2016-10-14 15:07 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

________________________________
From: Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 09:05
To: StDenis, Tom
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as 780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging). So the last of those two commits is the one that causes my problem.

Regards
//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org<mailto:[email protected]>> on behalf of Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 08:49
To: [email protected]<mailto:[email protected]>
Cc: Ernst Sjöstrand
Subject: [PATCH] amdgpu: Fix failing boot after support for third vce ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -1
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);

--
2.7.4

_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx> lists.freedesktop.org<http://lists.freedesktop.org>
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CY4PR12MB1768FB1C0830FC368B671BC5F7DF0-rpdhrqHFk06yjjPBNVDk/[email protected]

#19 lore raw

All of those patches are integrated:
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=57da26e4c4c1c7cc042aba1925813fea7413dbeb
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=d7ca7ab8259f43473bc387dda2a5b84aeb049961

From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf Of StDenis, Tom
Sent: Friday, October 14, 2016 9:21 AM
To: Ernst Sjöstrand
Cc: [email protected]
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

You'd need

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9ab4662c313d25731e53cc4f044bddb9c506ca13

and

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=da00756f75422b04befae381e7e48d0cacf299f3

I'll let Alex speak for the drm-next branches since he manages them.

Tom

________________________________
From: Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 09:20
To: StDenis, Tom
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Means the drm pull request for 4.9 is broken then also, FYI.

2016-10-14 15:17 GMT+02:00 Ernst Sjöstrand <[email protected]<mailto:[email protected]>>:
9d24b304abbe5380da1bc782b4460596e7cb1109
cherry-picks cleanly on drm-next-4.9-wip but then fails to build:

CC [M] drivers/gpu/drm/amd/amdgpu/vce_v3_0.o
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:2: error: unknown field 'type' specified in initializer
.type = AMDGPU_RING_TYPE_VCE,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.type = AMDGPU_RING_TYPE_VCE,

          ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: note: (near initialization for 'vce_v3_0_ring_phys_funcs.get_rptr') drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:2: error: unknown field 'align_mask' specified in initializer
.align_mask = 0xf,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.align_mask = 0xf,

                ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: note: (near initialization for 'vce_v3_0_ring_phys_funcs.get_wptr') drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:856:2: error: unknown field 'nop' specified in initializer
.nop = VCE_CMD_NO_OP,
^

2016-10-14 15:15 GMT+02:00 Ernst Sjöstrand <[email protected]<mailto:[email protected]>>:
I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f.
I think the problem is in drm-next now also.
They all have
6f0359f drm/amdgpu/vce3: add support for third vce ring
75c6548 drm/amdgpu: track the number of vce rings
But not
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode
which only exists in amd-staging-4.7
(What does 4.7 mean in this context... ?)
Regards
//Ernst

2016-10-14 15:07 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

________________________________
From: Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 09:05
To: StDenis, Tom
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as 780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging). So the last of those two commits is the one that causes my problem.

Regards
//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org<mailto:[email protected]>> on behalf of Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 08:49
To: [email protected]<mailto:[email protected]>
Cc: Ernst Sjöstrand
Subject: [PATCH] amdgpu: Fix failing boot after support for third vce ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -1
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);

--
2.7.4
_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx> lists.freedesktop.org<http://lists.freedesktop.org>
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): MWHPR12MB169476FBE38ABF8A3A991604F7DF0-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#21 lore raw

next-4.9 and wip are the broken branches for me so something is wrong. I could cherry pick the patch Tom mentioned and got a delta so I don't think you have it.

Den 14 okt. 2016 3:49 em skrev "Deucher, Alexander" < [email protected]>:

Quoted 221 lines

All of those patches are integrated:

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=
57da26e4c4c1c7cc042aba1925813fea7413dbeb

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=
d7ca7ab8259f43473bc387dda2a5b84aeb049961

*From:* amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] *On Behalf Of *StDenis, Tom
*Sent:* Friday, October 14, 2016 9:21 AM
*To:* Ernst Sjöstrand
*Cc:* [email protected]
*Subject:* Re: [PATCH] amdgpu: Fix failing boot after support for third
vce ring

You'd need

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=
9ab4662c313d25731e53cc4f044bddb9c506ca13

and

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=
da00756f75422b04befae381e7e48d0cacf299f3

I'll let Alex speak for the drm-next branches since he manages them.

Tom

------------------------------

*From:* Ernst Sjöstrand <[email protected]> *Sent:* Friday, October 14, 2016 09:20
*To:* StDenis, Tom
*Cc:* [email protected] *Subject:* Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Means the drm pull request for 4.9 is broken then also, FYI.

2016-10-14 15:17 GMT+02:00 Ernst Sjöstrand <[email protected]>:

9d24b304abbe5380da1bc782b4460596e7cb1109

cherry-picks cleanly on drm-next-4.9-wip but then fails to build:

CC [M] drivers/gpu/drm/amd/amdgpu/vce_v3_0.o
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:2: error: unknown field ‘type’ specified in initializer
.type = AMDGPU_RING_TYPE_VCE,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.type = AMDGPU_RING_TYPE_VCE,

          ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_rptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:2: error: unknown field ‘align_mask’ specified in initializer
.align_mask = 0xf,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.align_mask = 0xf,

                ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_wptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:856:2: error: unknown field ‘nop’ specified in initializer
.nop = VCE_CMD_NO_OP,
^

2016-10-14 15:15 GMT+02:00 Ernst Sjöstrand <[email protected]>:

I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f.

I think the problem is in drm-next now also.

They all have
6f0359f drm/amdgpu/vce3: add support for third vce ring 75c6548 drm/amdgpu: track the number of vce rings

But not
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode

which only exists in amd-staging-4.7

(What does 4.7 mean in this context... ?)

Regards

//Ernst

2016-10-14 15:07 GMT+02:00 StDenis, Tom <[email protected]>:

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=
drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

------------------------------

*From:* Ernst Sjöstrand <[email protected]> *Sent:* Friday, October 14, 2016 09:05
*To:* StDenis, Tom
*Cc:* [email protected] *Subject:* Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as
780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging).

So the last of those two commits is the one that causes my problem.

Regards

//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]>:

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

------------------------------

*From:* amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Ernst Sjöstrand <[email protected]>
*Sent:* Friday, October 14, 2016 08:49
*To:* [email protected]
*Cc:* Ernst Sjöstrand
*Subject:* [PATCH] amdgpu: Fix failing boot after support for third vce
ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -2
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);
--

2.7.4

_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Quoted 19 lines

amd-gfx Info Page - lists.freedesktop.org
<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>

lists.freedesktop.org

To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CAD=4a=U=FmHfSSv=TbhKusb+_DzPRQWNdh8orrtoXqac0tBVZQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#23 lore raw

What patch are you referring to?

Alex

From: Ernst Sjöstrand [mailto:[email protected]]
Sent: Friday, October 14, 2016 10:06 AM
To: Deucher, Alexander
Cc: amd-gfx mailing list; StDenis, Tom
Subject: RE: [PATCH] amdgpu: Fix failing boot after support for third vce ring

next-4.9 and wip are the broken branches for me so something is wrong. I could cherry pick the patch Tom mentioned and got a delta so I don't think you have it.

Den 14 okt. 2016 3:49 em skrev "Deucher, Alexander" <[email protected]<mailto:[email protected]>>:
All of those patches are integrated:
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=57da26e4c4c1c7cc042aba1925813fea7413dbeb
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=d7ca7ab8259f43473bc387dda2a5b84aeb049961

From: amd-gfx [mailto:[email protected]<mailto:[email protected]>] On Behalf Of StDenis, Tom
Sent: Friday, October 14, 2016 9:21 AM
To: Ernst Sjöstrand
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

You'd need

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9ab4662c313d25731e53cc4f044bddb9c506ca13

and

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=da00756f75422b04befae381e7e48d0cacf299f3

I'll let Alex speak for the drm-next branches since he manages them.

Tom

________________________________
From: Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 09:20
To: StDenis, Tom
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Means the drm pull request for 4.9 is broken then also, FYI.

2016-10-14 15:17 GMT+02:00 Ernst Sjöstrand <[email protected]<mailto:[email protected]>>:
9d24b304abbe5380da1bc782b4460596e7cb1109
cherry-picks cleanly on drm-next-4.9-wip but then fails to build:

CC [M] drivers/gpu/drm/amd/amdgpu/vce_v3_0.o
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:2: error: unknown field ‘type’ specified in initializer
.type = AMDGPU_RING_TYPE_VCE,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.type = AMDGPU_RING_TYPE_VCE,

          ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_rptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:2: error: unknown field ‘align_mask’ specified in initializer
.align_mask = 0xf,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.align_mask = 0xf,

                ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_wptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:856:2: error: unknown field ‘nop’ specified in initializer
.nop = VCE_CMD_NO_OP,
^

2016-10-14 15:15 GMT+02:00 Ernst Sjöstrand <[email protected]<mailto:[email protected]>>:
I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f.
I think the problem is in drm-next now also.
They all have
6f0359f drm/amdgpu/vce3: add support for third vce ring
75c6548 drm/amdgpu: track the number of vce rings
But not
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode
which only exists in amd-staging-4.7
(What does 4.7 mean in this context... ?)
Regards
//Ernst

2016-10-14 15:07 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

________________________________
From: Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 09:05
To: StDenis, Tom
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as 780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging). So the last of those two commits is the one that causes my problem.

Regards
//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

________________________________
From: amd-gfx <[email protected]<mailto:[email protected]>> on behalf of Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 08:49
To: [email protected]<mailto:[email protected]>
Cc: Ernst Sjöstrand
Subject: [PATCH] amdgpu: Fix failing boot after support for third vce ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -1
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);

--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx> lists.freedesktop.org<http://lists.freedesktop.org>
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): MWHPR12MB1694DBE440378F972AEA111BF7DF0-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#25 lore raw

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109

2016-10-14 16:12 GMT+02:00 Deucher, Alexander <[email protected]>:

Quoted 247 lines

What patch are you referring to?

Alex

*From:* Ernst Sjöstrand [mailto:[email protected]] *Sent:* Friday, October 14, 2016 10:06 AM
*To:* Deucher, Alexander
*Cc:* amd-gfx mailing list; StDenis, Tom
*Subject:* RE: [PATCH] amdgpu: Fix failing boot after support for third vce ring

next-4.9 and wip are the broken branches for me so something is wrong. I could cherry pick the patch Tom mentioned and got a delta so I don't think you have it.

Den 14 okt. 2016 3:49 em skrev "Deucher, Alexander" < [email protected]>:

All of those patches are integrated:

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=
57da26e4c4c1c7cc042aba1925813fea7413dbeb

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=
d7ca7ab8259f43473bc387dda2a5b84aeb049961

*From:* amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] *On Behalf Of *StDenis, Tom
*Sent:* Friday, October 14, 2016 9:21 AM
*To:* Ernst Sjöstrand
*Cc:* [email protected]
*Subject:* Re: [PATCH] amdgpu: Fix failing boot after support for third
vce ring

You'd need

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=
9ab4662c313d25731e53cc4f044bddb9c506ca13

and

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=
da00756f75422b04befae381e7e48d0cacf299f3

I'll let Alex speak for the drm-next branches since he manages them.

Tom

------------------------------

*From:* Ernst Sjöstrand <[email protected]> *Sent:* Friday, October 14, 2016 09:20
*To:* StDenis, Tom
*Cc:* [email protected] *Subject:* Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Means the drm pull request for 4.9 is broken then also, FYI.

2016-10-14 15:17 GMT+02:00 Ernst Sjöstrand <[email protected]>:

9d24b304abbe5380da1bc782b4460596e7cb1109

cherry-picks cleanly on drm-next-4.9-wip but then fails to build:

CC [M] drivers/gpu/drm/amd/amdgpu/vce_v3_0.o
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:2: error: unknown field ‘type’ specified in initializer
.type = AMDGPU_RING_TYPE_VCE,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.type = AMDGPU_RING_TYPE_VCE,

          ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_rptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:2: error: unknown field ‘align_mask’ specified in initializer
.align_mask = 0xf,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.align_mask = 0xf,

                ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_wptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:856:2: error: unknown field ‘nop’ specified in initializer
.nop = VCE_CMD_NO_OP,
^

2016-10-14 15:15 GMT+02:00 Ernst Sjöstrand <[email protected]>:

I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f.

I think the problem is in drm-next now also.

They all have
6f0359f drm/amdgpu/vce3: add support for third vce ring 75c6548 drm/amdgpu: track the number of vce rings

But not
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode

which only exists in amd-staging-4.7

(What does 4.7 mean in this context... ?)

Regards

//Ernst

2016-10-14 15:07 GMT+02:00 StDenis, Tom <[email protected]>:

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=
drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

------------------------------

*From:* Ernst Sjöstrand <[email protected]> *Sent:* Friday, October 14, 2016 09:05
*To:* StDenis, Tom
*Cc:* [email protected] *Subject:* Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as
780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging).

So the last of those two commits is the one that causes my problem.

Regards

//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]>:

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

------------------------------

*From:* amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Ernst Sjöstrand <[email protected]>
*Sent:* Friday, October 14, 2016 08:49
*To:* [email protected]
*Cc:* Ernst Sjöstrand
*Subject:* [PATCH] amdgpu: Fix failing boot after support for third vce
ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -2
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);
--

2.7.4

_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Quoted 19 lines

amd-gfx Info Page - lists.freedesktop.org
<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>

lists.freedesktop.org

To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CAD=4a=VhF4J9KHfcME6BVyBaSEmkFfApM_XSi2yewU23iu646A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#27 lore raw

That change was squashed into the following patches along with the fix for UVD as well:
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=d7ca7ab8259f43473bc387dda2a5b84aeb049961
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=57da26e4c4c1c7cc042aba1925813fea7413dbeb

The amd-staging-4.7 branch is a mirror of our internal tree:
https://cgit.freedesktop.org/~agd5f/linux/log/?h=amd-staging-4.7

I don't think I've missed any patches. There are minor changes due to squashing some fixes into the original patches for upstream.

If you are still getting failures with drm-next-4.9(-wip) or amd-staging-4.7, please file a bug and attach your dmesg output.

Alex

From: Ernst Sjöstrand [mailto:[email protected]]
Sent: Friday, October 14, 2016 10:23 AM
To: Deucher, Alexander
Cc: amd-gfx mailing list; StDenis, Tom
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109

2016-10-14 16:12 GMT+02:00 Deucher, Alexander <[email protected]<mailto:[email protected]>>:
What patch are you referring to?

Alex

From: Ernst Sjöstrand [mailto:[email protected]<mailto:[email protected]>]
Sent: Friday, October 14, 2016 10:06 AM
To: Deucher, Alexander
Cc: amd-gfx mailing list; StDenis, Tom
Subject: RE: [PATCH] amdgpu: Fix failing boot after support for third vce ring

next-4.9 and wip are the broken branches for me so something is wrong. I could cherry pick the patch Tom mentioned and got a delta so I don't think you have it.

Den 14 okt. 2016 3:49 em skrev "Deucher, Alexander" <[email protected]<mailto:[email protected]>>:
All of those patches are integrated:
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=57da26e4c4c1c7cc042aba1925813fea7413dbeb
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=d7ca7ab8259f43473bc387dda2a5b84aeb049961

From: amd-gfx [mailto:[email protected]<mailto:[email protected]>] On Behalf Of StDenis, Tom
Sent: Friday, October 14, 2016 9:21 AM
To: Ernst Sjöstrand
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

You'd need

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9ab4662c313d25731e53cc4f044bddb9c506ca13

and

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=da00756f75422b04befae381e7e48d0cacf299f3

I'll let Alex speak for the drm-next branches since he manages them.

Tom

________________________________
From: Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 09:20
To: StDenis, Tom
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Means the drm pull request for 4.9 is broken then also, FYI.

2016-10-14 15:17 GMT+02:00 Ernst Sjöstrand <[email protected]<mailto:[email protected]>>:
9d24b304abbe5380da1bc782b4460596e7cb1109
cherry-picks cleanly on drm-next-4.9-wip but then fails to build:

CC [M] drivers/gpu/drm/amd/amdgpu/vce_v3_0.o
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:2: error: unknown field ‘type’ specified in initializer
.type = AMDGPU_RING_TYPE_VCE,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.type = AMDGPU_RING_TYPE_VCE,

          ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_rptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:2: error: unknown field ‘align_mask’ specified in initializer
.align_mask = 0xf,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.align_mask = 0xf,

                ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_wptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:856:2: error: unknown field ‘nop’ specified in initializer
.nop = VCE_CMD_NO_OP,
^

2016-10-14 15:15 GMT+02:00 Ernst Sjöstrand <[email protected]<mailto:[email protected]>>:
I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f.
I think the problem is in drm-next now also.
They all have
6f0359f drm/amdgpu/vce3: add support for third vce ring
75c6548 drm/amdgpu: track the number of vce rings
But not
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode
which only exists in amd-staging-4.7
(What does 4.7 mean in this context... ?)
Regards
//Ernst

2016-10-14 15:07 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

________________________________
From: Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 09:05
To: StDenis, Tom
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as 780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging). So the last of those two commits is the one that causes my problem.

Regards
//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

________________________________
From: amd-gfx <[email protected]<mailto:[email protected]>> on behalf of Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 08:49
To: [email protected]<mailto:[email protected]>
Cc: Ernst Sjöstrand
Subject: [PATCH] amdgpu: Fix failing boot after support for third vce ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -1
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);

--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx> lists.freedesktop.org<http://lists.freedesktop.org>
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): MWHPR12MB1694C5C9F300A6DAA0D26083F7DF0-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#29 lore raw

But I _am_ getting failures with drm-next-4.9 and drm-next-4.9-wip and drm-next right now, so that's why I sent the patch that started this thread. And as the subject says it fails to boot so there's no dmesg to show. It hangs hard...

I have filed a bug for this also, but I had problems with the bisect:
https://bugs.freedesktop.org/show_bug.cgi?id=98016
My patch fixes this bug. Forgot to add a reference though.

Regards
//Ernst

2016-10-14 16:32 GMT+02:00 Deucher, Alexander <[email protected]>:

Quoted 294 lines

That change was squashed into the following patches along with the fix for UVD as well:

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=
d7ca7ab8259f43473bc387dda2a5b84aeb049961

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=
57da26e4c4c1c7cc042aba1925813fea7413dbeb

The amd-staging-4.7 branch is a mirror of our internal tree:

https://cgit.freedesktop.org/~agd5f/linux/log/?h=amd-staging-4.7

I don't think I've missed any patches. There are minor changes due to squashing some fixes into the original patches for upstream.

If you are still getting failures with drm-next-4.9(-wip) or amd-staging-4.7, please file a bug and attach your dmesg output.

Alex

*From:* Ernst Sjöstrand [mailto:[email protected]] *Sent:* Friday, October 14, 2016 10:23 AM
*To:* Deucher, Alexander
*Cc:* amd-gfx mailing list; StDenis, Tom
*Subject:* Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=
9d24b304abbe5380da1bc782b4460596e7cb1109

2016-10-14 16:12 GMT+02:00 Deucher, Alexander <[email protected]>:

What patch are you referring to?

Alex

*From:* Ernst Sjöstrand [mailto:[email protected]] *Sent:* Friday, October 14, 2016 10:06 AM
*To:* Deucher, Alexander
*Cc:* amd-gfx mailing list; StDenis, Tom
*Subject:* RE: [PATCH] amdgpu: Fix failing boot after support for third vce ring

next-4.9 and wip are the broken branches for me so something is wrong. I could cherry pick the patch Tom mentioned and got a delta so I don't think you have it.

Den 14 okt. 2016 3:49 em skrev "Deucher, Alexander" < [email protected]>:

All of those patches are integrated:

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=
57da26e4c4c1c7cc042aba1925813fea7413dbeb

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=
d7ca7ab8259f43473bc387dda2a5b84aeb049961

*From:* amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] *On Behalf Of *StDenis, Tom
*Sent:* Friday, October 14, 2016 9:21 AM
*To:* Ernst Sjöstrand
*Cc:* [email protected]
*Subject:* Re: [PATCH] amdgpu: Fix failing boot after support for third
vce ring

You'd need

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=
9ab4662c313d25731e53cc4f044bddb9c506ca13

and

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=
da00756f75422b04befae381e7e48d0cacf299f3

I'll let Alex speak for the drm-next branches since he manages them.

Tom

------------------------------

*From:* Ernst Sjöstrand <[email protected]> *Sent:* Friday, October 14, 2016 09:20
*To:* StDenis, Tom
*Cc:* [email protected] *Subject:* Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Means the drm pull request for 4.9 is broken then also, FYI.

2016-10-14 15:17 GMT+02:00 Ernst Sjöstrand <[email protected]>:

9d24b304abbe5380da1bc782b4460596e7cb1109

cherry-picks cleanly on drm-next-4.9-wip but then fails to build:

CC [M] drivers/gpu/drm/amd/amdgpu/vce_v3_0.o
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:2: error: unknown field ‘type’ specified in initializer
.type = AMDGPU_RING_TYPE_VCE,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.type = AMDGPU_RING_TYPE_VCE,

          ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_rptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:2: error: unknown field ‘align_mask’ specified in initializer
.align_mask = 0xf,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.align_mask = 0xf,

                ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_wptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:856:2: error: unknown field ‘nop’ specified in initializer
.nop = VCE_CMD_NO_OP,
^

2016-10-14 15:15 GMT+02:00 Ernst Sjöstrand <[email protected]>:

I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f.

I think the problem is in drm-next now also.

They all have
6f0359f drm/amdgpu/vce3: add support for third vce ring 75c6548 drm/amdgpu: track the number of vce rings

But not
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode

which only exists in amd-staging-4.7

(What does 4.7 mean in this context... ?)

Regards

//Ernst

2016-10-14 15:07 GMT+02:00 StDenis, Tom <[email protected]>:

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=
drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

------------------------------

*From:* Ernst Sjöstrand <[email protected]> *Sent:* Friday, October 14, 2016 09:05
*To:* StDenis, Tom
*Cc:* [email protected] *Subject:* Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as
780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging).

So the last of those two commits is the one that causes my problem.

Regards

//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]>:

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

------------------------------

*From:* amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Ernst Sjöstrand <[email protected]>
*Sent:* Friday, October 14, 2016 08:49
*To:* [email protected]
*Cc:* Ernst Sjöstrand
*Subject:* [PATCH] amdgpu: Fix failing boot after support for third vce
ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -2
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);
--

2.7.4

_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Quoted 21 lines

amd-gfx Info Page - lists.freedesktop.org
<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>

lists.freedesktop.org

To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CAD=4a=Ui9WmVVd2TPpAnASz7g1hDKG5f8nN7ycj4x6Ofbb7h+A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#31 lore raw

Odd. We haven't seen any failures internally with Fiji and 3 VCE rings enabled. Can you provide a log of the failure? Try manually loading amdgpu after boot. E.g., append modprobe.blacklist=amdgpu to the kernel command line and boot to a non-X runlevel, then manually modprobe amdgpu and capture the dmesg output. Please attach the dmesg output from a successful boot as well. If you have remote access via ssh, that would make it easier. What VCE firmware are you using? Can you try the latest version from git and see if that helps:
https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git

Thanks,

Alex

From: Ernst Sjöstrand [mailto:[email protected]]
Sent: Friday, October 14, 2016 10:37 AM
To: Deucher, Alexander
Cc: amd-gfx mailing list; StDenis, Tom
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

But I _am_ getting failures with drm-next-4.9 and drm-next-4.9-wip and drm-next right now, so that's why I sent the patch that started this thread. And as the subject says it fails to boot so there's no dmesg to show. It hangs hard...
I have filed a bug for this also, but I had problems with the bisect:
https://bugs.freedesktop.org/show_bug.cgi?id=98016
My patch fixes this bug. Forgot to add a reference though.

Regards
//Ernst

2016-10-14 16:32 GMT+02:00 Deucher, Alexander <[email protected]<mailto:[email protected]>>:
That change was squashed into the following patches along with the fix for UVD as well:
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=d7ca7ab8259f43473bc387dda2a5b84aeb049961
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=57da26e4c4c1c7cc042aba1925813fea7413dbeb

The amd-staging-4.7 branch is a mirror of our internal tree:
https://cgit.freedesktop.org/~agd5f/linux/log/?h=amd-staging-4.7

I don't think I've missed any patches. There are minor changes due to squashing some fixes into the original patches for upstream.

If you are still getting failures with drm-next-4.9(-wip) or amd-staging-4.7, please file a bug and attach your dmesg output.

Alex

From: Ernst Sjöstrand [mailto:[email protected]<mailto:[email protected]>]
Sent: Friday, October 14, 2016 10:23 AM
To: Deucher, Alexander
Cc: amd-gfx mailing list; StDenis, Tom
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109

2016-10-14 16:12 GMT+02:00 Deucher, Alexander <[email protected]<mailto:[email protected]>>:
What patch are you referring to?

Alex

From: Ernst Sjöstrand [mailto:[email protected]<mailto:[email protected]>]
Sent: Friday, October 14, 2016 10:06 AM
To: Deucher, Alexander
Cc: amd-gfx mailing list; StDenis, Tom
Subject: RE: [PATCH] amdgpu: Fix failing boot after support for third vce ring

next-4.9 and wip are the broken branches for me so something is wrong. I could cherry pick the patch Tom mentioned and got a delta so I don't think you have it.

Den 14 okt. 2016 3:49 em skrev "Deucher, Alexander" <[email protected]<mailto:[email protected]>>:
All of those patches are integrated:
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=57da26e4c4c1c7cc042aba1925813fea7413dbeb
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=d7ca7ab8259f43473bc387dda2a5b84aeb049961

From: amd-gfx [mailto:[email protected]<mailto:[email protected]>] On Behalf Of StDenis, Tom
Sent: Friday, October 14, 2016 9:21 AM
To: Ernst Sjöstrand
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

You'd need

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9ab4662c313d25731e53cc4f044bddb9c506ca13

and

https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=da00756f75422b04befae381e7e48d0cacf299f3

I'll let Alex speak for the drm-next branches since he manages them.

Tom

________________________________
From: Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 09:20
To: StDenis, Tom
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Means the drm pull request for 4.9 is broken then also, FYI.

2016-10-14 15:17 GMT+02:00 Ernst Sjöstrand <[email protected]<mailto:[email protected]>>:
9d24b304abbe5380da1bc782b4460596e7cb1109
cherry-picks cleanly on drm-next-4.9-wip but then fails to build:

CC [M] drivers/gpu/drm/amd/amdgpu/vce_v3_0.o
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:2: error: unknown field ‘type’ specified in initializer
.type = AMDGPU_RING_TYPE_VCE,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.type = AMDGPU_RING_TYPE_VCE,

          ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_rptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:2: error: unknown field ‘align_mask’ specified in initializer
.align_mask = 0xf,
^
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.align_mask = 0xf,

                ^

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_wptr’) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:856:2: error: unknown field ‘nop’ specified in initializer
.nop = VCE_CMD_NO_OP,
^

2016-10-14 15:15 GMT+02:00 Ernst Sjöstrand <[email protected]<mailto:[email protected]>>:
I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f.
I think the problem is in drm-next now also.
They all have
6f0359f drm/amdgpu/vce3: add support for third vce ring
75c6548 drm/amdgpu: track the number of vce rings
But not
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode
which only exists in amd-staging-4.7
(What does 4.7 mean in this context... ?)
Regards
//Ernst

2016-10-14 15:07 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well?

I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps.

Tom

________________________________
From: Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 09:05
To: StDenis, Tom
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring

Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as 780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging). So the last of those two commits is the one that causes my problem.

Regards
//Ernst

2016-10-14 14:53 GMT+02:00 StDenis, Tom <[email protected]<mailto:[email protected]>>:

Does your tree have

2f3d686d0ee95332d8888169c7b6788bb2d9f5ad

780605db12c52f2c22d4d2cc05ceb7d2a9d55579

in it? Those are fixes for when the third ring were added.

Tom

________________________________
From: amd-gfx <[email protected]<mailto:[email protected]>> on behalf of Ernst Sjöstrand <[email protected]<mailto:[email protected]>>
Sent: Friday, October 14, 2016 08:49
To: [email protected]<mailto:[email protected]>
Cc: Ernst Sjöstrand
Subject: [PATCH] amdgpu: Fix failing boot after support for third vce ring

My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -1
index 3f899e3..6f5eb64 100644
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
-       adev->vce.num_rings = 3;
+       adev->vce.num_rings = 2;
 
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);

--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx> lists.freedesktop.org<http://lists.freedesktop.org>
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx