Skip to contentSkip to conversation

update drm.h

PATCH In review Chunming Zhou 4 participants 10 messages May 22, 2019 – Jun 6, 2019

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

PATCH 1/2 update drm.h

a) delta: only DRM_CAP_SYNCOBJ_TIMELINE
b) Generated using make headers_install.
c) Generated from origin/drm-misc-next commit 982c0500fd1a8012c31d3c9dd8de285129904656"

---
 include/drm/drm.h | 2 ++
 1 file changed, 2 insertions(+)
include/drm/drm.h +2 -0
index c893f3b4..438abde3 100644
@@ -44,6 +44,7 @@ typedef unsigned int drm_handle_t;
 
 #else /* One of the BSDs */
 
+#include <stdint.h>
 #include <sys/ioccom.h>
 #include <sys/types.h>
 typedef int8_t   __s8;
@@ -643,6 +644,7 @@ struct drm_gem_open {
 #define DRM_CAP_PAGE_FLIP_TARGET	0x11
 #define DRM_CAP_CRTC_IN_VBLANK_EVENT	0x12
 #define DRM_CAP_SYNCOBJ		0x13
+#define DRM_CAP_SYNCOBJ_TIMELINE	0x14
 
 /** DRM_IOCTL_GET_CAP ioctl argument type */
 struct drm_get_cap {
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

PATCH 2/2 enable syncobj test depending on capability

Feature is controlled by DRM_CAP_SYNCOBJ_TIMELINE drm capability.

---
 tests/amdgpu/syncobj_tests.c | 8 ++++++++
 1 file changed, 8 insertions(+)
tests/amdgpu/syncobj_tests.c +8 -0
index a0c627d7..869ed88e 100644
@@ -22,6 +22,7 @@
 */
 
 #include "CUnit/Basic.h"
+#include "xf86drm.h"
 
 #include "amdgpu_test.h"
 #include "amdgpu_drm.h"
@@ -36,6 +37,13 @@ static void amdgpu_syncobj_timeline_test(void);
 
 CU_BOOL suite_syncobj_timeline_tests_enable(void)
 {
+	int r;
+	uint64_t cap = 0;
+
+	r = drmGetCap(drm_amdgpu[0], DRM_CAP_SYNCOBJ_TIMELINE, &cap);
+	if (r || cap == 0)
+		return CU_FALSE;
+
 	return CU_TRUE;
 }
 
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 1/2
#2 lore raw
In reply to Chunming Zhou

Am 22.05.19 um 11:07 schrieb Chunming Zhou:

Quoted 6 lines

a) delta: only DRM_CAP_SYNCOBJ_TIMELINE
b) Generated using make headers_install.
c) Generated from origin/drm-misc-next commit 982c0500fd1a8012c31d3c9dd8de285129904656"

Quoted 17 lines
---
  include/drm/drm.h | 2 ++
  1 file changed, 2 insertions(+)
include/drm/drm.h +1 -0
index c893f3b4..438abde3 100644
@@ -44,6 +44,7 @@ typedef unsigned int drm_handle_t;
 
  #else /* One of the BSDs */
 
+#include <stdint.h>
  #include <sys/ioccom.h>
  #include <sys/types.h>
  typedef int8_t   __s8;

include/drm/drm.h struct drm_gem_open { · line 650

Quoted 7 lines
include/drm/drm.h +1 -0
@@ -643,6 +644,7 @@ struct drm_gem_open {
  #define DRM_CAP_PAGE_FLIP_TARGET	0x11
  #define DRM_CAP_CRTC_IN_VBLANK_EVENT	0x12
  #define DRM_CAP_SYNCOBJ		0x13
+#define DRM_CAP_SYNCOBJ_TIMELINE	0x14
 
  /** DRM_IOCTL_GET_CAP ioctl argument type */
  struct drm_get_cap {

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

#3 lore raw

anyone can pick up to gitlab for libdrm?

Thanks,

-David

Quoted 31 lines · Christian

Am 22.05.19 um 11:07 schrieb Chunming Zhou:

Quoted 6 lines

a) delta: only DRM_CAP_SYNCOBJ_TIMELINE
b) Generated using make headers_install.
c) Generated from origin/drm-misc-next commit 982c0500fd1a8012c31d3c9dd8de285129904656"

Quoted 22 lines
---
   include/drm/drm.h | 2 ++
   1 file changed, 2 insertions(+)
include/drm/drm.h +2 -0
index c893f3b4..438abde3 100644
@@ -44,6 +44,7 @@ typedef unsigned int drm_handle_t;
 
   #else /* One of the BSDs */
 
+#include <stdint.h>
   #include <sys/ioccom.h>
   #include <sys/types.h>
   typedef int8_t   __s8;
@@ -643,6 +644,7 @@ struct drm_gem_open {
   #define DRM_CAP_PAGE_FLIP_TARGET	0x11
   #define DRM_CAP_CRTC_IN_VBLANK_EVENT	0x12
   #define DRM_CAP_SYNCOBJ		0x13
+#define DRM_CAP_SYNCOBJ_TIMELINE	0x14
 
Quoted 2 lines

include/drm/drm.h struct drm_gem_open { · line 650

Quoted 2 lines
include/drm/drm.h +0 -0
   /** DRM_IOCTL_GET_CAP ioctl argument type */
   struct drm_get_cap {

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

#4 lore raw
Quoted 1 line · On 2019-05-24 7:15 a.m., zhoucm1 wrote:

anyone can pick up to gitlab for libdrm?

Can you create a merge request?

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

Seconded, I'm always totally confused about the web interface as well.

Christian.

Am 06.06.19 um 12:26 schrieb zhoucm1:

Quoted 12 lines

https://gitlab.freedesktop.org/mesa/drm, Where the merge request button?

-David

Quoted 5 lines · Michel Dänzer
Quoted 1 line · On 2019-05-24 7:15 a.m., zhoucm1 wrote:

anyone can pick up to gitlab for libdrm?

Can you create a merge request?

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

#7 lore raw
In reply to zhoucm1
Quoted 1 line · On 2019-06-06 12:26 p.m., zhoucm1 wrote:

https://gitlab.freedesktop.org/mesa/drm, Where the merge request button?

If you push to a branch in your personal repository, the output of git push contains an URL for creating a merge request.

Signature · 6 lines
Earthling Michel Dänzer               |              https://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#8 lore raw
Quoted 5 lines · Michel Dänzer
Quoted 1 line · On 2019-06-06 12:26 p.m., zhoucm1 wrote:

https://gitlab.freedesktop.org/mesa/drm, Where the merge request button?

If you push to a branch in your personal repository, the output of git push contains an URL for creating a merge request.

Daniel Vetter pointed out on IRC that currently merge requests aren't enabled yet for libdrm, which probably explains why you couldn't find a way to create one. Sorry, I didn't realize this.

Meanwhile, can you just push to a branch in your personal repo, and make sure the CI pipeline passes?

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

-----Original Message-----
From: Michel Dänzer <[email protected]>
Sent: Thursday, June 06, 2019 10:09 PM
To: Zhou, David(ChunMing) <[email protected]>; Koenig, Christian <[email protected]>; Zhou, David(ChunMing) <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH 1/2] update drm.h

Quoted 2 lines · Michel Dänzer
Quoted 1 line · On 2019-06-06 12:26 p.m., zhoucm1 wrote:

https://gitlab.freedesktop.org/mesa/drm, Where the merge request

button?

Quoted 3 lines

If you push to a branch in your personal repository, the output of git push contains an URL for creating a merge request.

Quoted 6 lines

Daniel Vetter pointed out on IRC that currently merge requests aren't enabled yet for libdrm, which probably explains why you couldn't find a way to create one. Sorry, I didn't realize this.

Meanwhile, can you just push to a branch in your personal repo, and make sure the CI pipeline passes?

Sorry, which personal repo? My problem to connect to gitlab.freedesktop isn't solved yet by our IT, I'm pushing them, but no response yet.

-David

Quoted 5 lines

--
Earthling Michel Dänzer | https://www.amd.com
Libre software enthusiast | Mesa and X developer

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