Skip to contentSkip to conversation

dri2: reply to client for WaitMSC request in any case

PATCH In review Cui, Flora 5 participants 6 messages May 29, 2019 – Jun 3, 2019 3 messages not in the archive

lore
Share & tools
lore

Cui, Flora

author
#0 lore raw

PATCH 1/1 dri2: reply to client for WaitMSC request in any case

otherwise client would wait for reply forever and desktop appears hang.

---
 src/amdgpu_dri2.c | 3 +++
 1 file changed, 3 insertions(+)
src/amdgpu_dri2.c +3 -0
index 44316ac..34353a7 100644
@@ -1062,6 +1062,9 @@ static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw,
 out_complete:
 	if (wait_info)
 		amdgpu_dri2_deferred_event(NULL, 0, wait_info);
+
+	DRI2WaitMSCComplete(client, draw, target_msc, 0, 0);
+
 	return TRUE;
 }
 
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): 1559111780-32513-1-git-send-email-flora.cui-5C7GfCeVMHo@public.gmane.org

#2 lore raw

PATCH v2 1/1 dri2: reply to client for WaitMSC request in any case

ping...

commit 47613e8e8f4a5e3b25830e3c015a4a217fcbe469
Author: Flora Cui <[email protected]>
Date:   Wed May 29 14:18:50 2019 +0800

    dri2: reply to client for WaitMSC request in any case

    otherwise client would wait for reply forever and desktop appears hang.

src/amdgpu_dri2.c +0 -0
index 44316ac..bb3d9d0 100644
@@ -1062,6 +1062,9 @@ static int amdgpu_dri2_schedule_wait_msc(ClientPtr 

client, DrawablePtr draw,
 out_complete:
        if (wait_info)
                amdgpu_dri2_deferred_event(NULL, 0, wait_info);
+       else
+               DRI2WaitMSCComplete(client, draw, target_msc, 0, 0); +
        return TRUE;
 }

Quoted 12 lines · Flora

otherwise client would wait for reply forever and desktop appears hang.

---
  src/amdgpu_dri2.c | 3 +++
  1 file changed, 3 insertions(+)
src/amdgpu_dri2.c +0 -0
index 44316ac..34353a7 100644

src/amdgpu_dri2.c static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw, · line 1070

Quoted 9 lines
src/amdgpu_dri2.c +3 -0
@@ -1062,6 +1062,9 @@ static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw,
  out_complete:
  	if (wait_info)
  		amdgpu_dri2_deferred_event(NULL, 0, wait_info);
+
+	DRI2WaitMSCComplete(client, draw, target_msc, 0, 0);
+
  	return TRUE;
  }
 

_______________________________________________
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): bc4571fc-6521-74d7-2d5c-1665396b50fc-5C7GfCeVMHo@public.gmane.org

Acked-by Feifei Xu
#4 lore raw

Regards,
Feifei

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Cui, Flora
Sent: 2019年6月3日 15:26
To: Cui, Flora <[email protected]>; Daenzer, Michel <[email protected]>; [email protected]
Subject: [PATCH v2] dri2: reply to client for WaitMSC request in any case

ping...

commit 47613e8e8f4a5e3b25830e3c015a4a217fcbe469
Author: Flora Cui <[email protected]>
Date:   Wed May 29 14:18:50 2019 +0800

    dri2: reply to client for WaitMSC request in any case

    otherwise client would wait for reply forever and desktop appears hang.

src/amdgpu_dri2.c +0 -0
@@ -1062,6 +1062,9 @@ static int amdgpu_dri2_schedule_wait_msc(ClientPtr

client, DrawablePtr draw,
 out_complete:
        if (wait_info)
                amdgpu_dri2_deferred_event(NULL, 0, wait_info);
+       else
+               DRI2WaitMSCComplete(client, draw, target_msc, 0, 0); +
        return TRUE;
 }

Quoted 12 lines · Flora

otherwise client would wait for reply forever and desktop appears hang.

---
  src/amdgpu_dri2.c | 3 +++
  1 file changed, 3 insertions(+)
src/amdgpu_dri2.c index renamed from src/amdgpu_dri2.c +0 -0

44316ac..34353a7 100644

src/amdgpu_dri2.c static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw, · line 1070

Quoted 9 lines
src/amdgpu_dri2.c +3 -0
@@ -1062,6 +1062,9 @@ static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw,
  out_complete:
  	if (wait_info)
  		amdgpu_dri2_deferred_event(NULL, 0, wait_info);
+
+	DRI2WaitMSCComplete(client, draw, target_msc, 0, 0);
+
  	return TRUE;
  }
 

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

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

This looks like a v2 with silightly different semantics?

Den mån 3 juni 2019 kl 09:26 skrev Cui, Flora <[email protected]>:

Quoted 46 lines

ping...

commit 47613e8e8f4a5e3b25830e3c015a4a217fcbe469

Author: Flora Cui <[email protected]>
Date:   Wed May 29 14:18:50 2019 +0800

dri2: reply to client for WaitMSC request in any case

otherwise client would wait for reply forever and desktop appears hang.

src/amdgpu_dri2.c +3 -0
index 44316ac..bb3d9d0 100644
@@ -1062,6 +1062,9 @@ static int amdgpu_dri2_schedule_wait_msc(ClientPtr
 client, DrawablePtr draw,
  out_complete:
         if (wait_info)
                 amdgpu_dri2_deferred_event(NULL, 0, wait_info);
+       else
+               DRI2WaitMSCComplete(client, draw, target_msc, 0, 0);
+
         return TRUE;
  }
Quoted 17 lines · Flora

otherwise client would wait for reply forever and desktop appears hang.

---
  src/amdgpu_dri2.c | 3 +++
  1 file changed, 3 insertions(+)
src/amdgpu_dri2.c +2 -0
index 44316ac..34353a7 100644
@@ -1062,6 +1062,9 @@ static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw,
  out_complete:
      if (wait_info)
              amdgpu_dri2_deferred_event(NULL, 0, wait_info);
+
+     DRI2WaitMSCComplete(client, draw, target_msc, 0, 0);
Quoted 8 lines

src/amdgpu_dri2.c static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw, · line 1070

Quoted 4 lines
src/amdgpu_dri2.c +1 -0
+
      return TRUE;
  }
 

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

_______________________________________________
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=VXK_2yt1S-FFMucFGxjG7M3-cE6rxi7qP=2qe8p1WSkw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#7 lore raw

Yes. It's v2 and change the behavior slightly.

It send reply to client with no wait_info for

amdgpu_dri2_deferred_event() would handle the reply differently.

Quoted 56 lines · Ernst Sjöstrand

This looks like a v2 with silightly different semantics?

Den mån 3 juni 2019 kl 09:26 skrev Cui, Flora <[email protected]>:

Quoted 53 lines

ping...

commit 47613e8e8f4a5e3b25830e3c015a4a217fcbe469

Author: Flora Cui <[email protected]>
Date:   Wed May 29 14:18:50 2019 +0800

dri2: reply to client for WaitMSC request in any case

otherwise client would wait for reply forever and desktop appears hang.

src/amdgpu_dri2.c +3 -0
index 44316ac..bb3d9d0 100644
@@ -1062,6 +1062,9 @@ static int amdgpu_dri2_schedule_wait_msc(ClientPtr
 client, DrawablePtr draw,
   out_complete:
          if (wait_info)
                  amdgpu_dri2_deferred_event(NULL, 0, wait_info);
+       else
+               DRI2WaitMSCComplete(client, draw, target_msc, 0, 0);
+
          return TRUE;
   }
Quoted 12 lines · Flora

otherwise client would wait for reply forever and desktop appears hang.

---
   src/amdgpu_dri2.c | 3 +++
   1 file changed, 3 insertions(+)
src/amdgpu_dri2.c +0 -0
index 44316ac..34353a7 100644

src/amdgpu_dri2.c static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw, · line 1070

Quoted 9 lines
src/amdgpu_dri2.c +3 -0
@@ -1062,6 +1062,9 @@ static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw,
   out_complete:
       if (wait_info)
               amdgpu_dri2_deferred_event(NULL, 0, wait_info);
+
+     DRI2WaitMSCComplete(client, draw, target_msc, 0, 0);
+
       return TRUE;
   }
 

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

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

#8 lore raw
In reply to a message not in the archive
Quoted 13 lines · Flora

otherwise client would wait for reply forever and desktop appears hang.

---
 src/amdgpu_dri2.c | 3 +++
 1 file changed, 3 insertions(+)
src/amdgpu_dri2.c +0 -0
index 44316ac..34353a7 100644

src/amdgpu_dri2.c static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw, · line 1070

Quoted 9 lines
src/amdgpu_dri2.c +3 -0
@@ -1062,6 +1062,9 @@ static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw,
 out_complete:
 	if (wait_info)
 		amdgpu_dri2_deferred_event(NULL, 0, wait_info);
+
+	DRI2WaitMSCComplete(client, draw, target_msc, 0, 0);
+
 	return TRUE;
 }
 

Please create a merge request:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/merge_requests/new

Signature · 6 lines
Earthling Michel Dänzer               |              https://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx