[1/2] update drm.h

Submitted by Zhou, David(ChunMing) on May 22, 2019, 9:07 a.m.

Details

Message ID 20190522090800.15908-1-david1.zhou@amd.com
State Accepted
Commit f3e6d22baa5b69c8a4f90e1fc27d095cf0eff687
Headers show
Series "Series without cover letter" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Zhou, David(ChunMing) May 22, 2019, 9:07 a.m.
a) delta: only DRM_CAP_SYNCOBJ_TIMELINE
   b) Generated using make headers_install.
   c) Generated from origin/drm-misc-next commit 982c0500fd1a8012c31d3c9dd8de285129904656"

Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Suggested-by: Michel Dänzer <michel@daenzer.net>
---
 include/drm/drm.h | 2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/include/drm/drm.h b/include/drm/drm.h
index c893f3b4..438abde3 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -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 {

Comments

Am 22.05.19 um 11:07 schrieb Chunming Zhou:
>     a) delta: only DRM_CAP_SYNCOBJ_TIMELINE

>     b) Generated using make headers_install.

>     c) Generated from origin/drm-misc-next commit 982c0500fd1a8012c31d3c9dd8de285129904656"

>

> Signed-off-by: Chunming Zhou <david1.zhou@amd.com>

> Suggested-by: Michel Dänzer <michel@daenzer.net>


Reviewed-by: Christian König <christian.koenig@amd.com>


> ---

>   include/drm/drm.h | 2 ++

>   1 file changed, 2 insertions(+)

>

> diff --git a/include/drm/drm.h b/include/drm/drm.h

> index c893f3b4..438abde3 100644

> --- a/include/drm/drm.h

> +++ b/include/drm/drm.h

> @@ -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 {
anyone can pick up to gitlab for libdrm?


Thanks,

-David


On 2019年05月22日 18:46, Koenig, Christian wrote:
> Am 22.05.19 um 11:07 schrieb Chunming Zhou:
>>      a) delta: only DRM_CAP_SYNCOBJ_TIMELINE
>>      b) Generated using make headers_install.
>>      c) Generated from origin/drm-misc-next commit 982c0500fd1a8012c31d3c9dd8de285129904656"
>>
>> Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
>> Suggested-by: Michel Dänzer <michel@daenzer.net>
> Reviewed-by: Christian König <christian.koenig@amd.com>
>
>> ---
>>    include/drm/drm.h | 2 ++
>>    1 file changed, 2 insertions(+)
>>
>> diff --git a/include/drm/drm.h b/include/drm/drm.h
>> index c893f3b4..438abde3 100644
>> --- a/include/drm/drm.h
>> +++ b/include/drm/drm.h
>> @@ -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 {
On 2019-05-24 7:15 a.m., zhoucm1 wrote:
> anyone can pick up to gitlab for libdrm?

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

-David


On 2019年06月06日 18:20, Michel Dänzer wrote:
> On 2019-05-24 7:15 a.m., zhoucm1 wrote:
>> anyone can pick up to gitlab for libdrm?
> Can you create a merge request?
>
>
Seconded, I'm always totally confused about the web interface as well.

Christian.

Am 06.06.19 um 12:26 schrieb zhoucm1:
> https://gitlab.freedesktop.org/mesa/drm, Where the merge request button?

>

> -David

>

>

> On 2019年06月06日 18:20, Michel Dänzer wrote:

>> On 2019-05-24 7:15 a.m., zhoucm1 wrote:

>>> anyone can pick up to gitlab for libdrm?

>> Can you create a merge request?

>>

>>

>
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.
On 2019-06-06 12:31 p.m., Michel Dänzer wrote:
> 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?
> -----Original Message-----

> From: Michel Dänzer <michel@daenzer.net>

> Sent: Thursday, June 06, 2019 10:09 PM

> To: Zhou, David(ChunMing) <David1.Zhou@amd.com>; Koenig, Christian

> <Christian.Koenig@amd.com>; Zhou, David(ChunMing)

> <David1.Zhou@amd.com>

> Cc: dri-devel@lists.freedesktop.org

> Subject: Re: [PATCH 1/2] update drm.h

> 

> On 2019-06-06 12:31 p.m., Michel Dänzer wrote:

> > 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?


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

> 

> 

> --

> Earthling Michel Dänzer               |              https://www.amd.com

> Libre software enthusiast             |             Mesa and X developer