Skip to contentSkip to conversation

drm: header maintenance

PATCH In review Sam Ravnborg 7 participants 41 messages Jul 18, 2019 – Aug 2, 2019

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

cover drm: header maintenance

First patch from Jani fixes so drm_print.h is self-contained. Next two patches are trivial removal of uapi dependencies.

ati_pcigart is fixed to drop use of drm_os_linux.h

drm_vblank is likewise fixed to drop use of drm_os_linux.h This was a non-trivial conversion, *review requested!*

The remaining patches are preparation for and removal of uapi/drm/drmh from drm_file.h.
There were a few files where we had to push include of drm/drm.h out to to have a clean build.

CK Hu - please let me apply the mediatek patch to drm-misc-next, as it is required for the final patch. Or push it to drm-misc-next yourself.

Sam

Jani Nikula (1):
drm/panel: make drm_panel.h self-contained

Sam Ravnborg (10):
drm: drop uapi dependency from drm_print.h
drm: drop uapi dependency from drm_vblank.h drm/ati_pcigart: drop dependency on drm_os_linux.h drm/vblank: drop use of DRM_WAIT_ON()
drm: direct include of drm.h in drm_gem.c
drm: direct include of drm.h in drm_gem_shmem_helper.c
drm: direct include of drm.h in drm_prime.c
drm: direct include of drm.h in drm_syncobj.c drm/mediatek: direct include of drm.h in mtk_drm_gem.c
drm: drop uapi dependency from drm_file.h

 drivers/gpu/drm/ati_pcigart.c          | 10 ++++++----
 drivers/gpu/drm/drm_gem.c              |  1 +
 drivers/gpu/drm/drm_gem_shmem_helper.c |  1 +
 drivers/gpu/drm/drm_prime.c            |  1 +
 drivers/gpu/drm/drm_syncobj.c          |  1 +
 drivers/gpu/drm/drm_vblank.c           | 29 ++++++++++++++++++++---------
 drivers/gpu/drm/mediatek/mtk_drm_gem.c |  1 +
 include/drm/drm_file.h                 |  4 +---
 include/drm/drm_panel.h                |  1 +
 include/drm/drm_print.h                |  4 +---
 include/drm/drm_vblank.h               |  1 -
 11 files changed, 34 insertions(+), 20 deletions(-)

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

#1 lore raw

PATCH 1/11 drm/panel: make drm_panel.h self-contained

From: Jani Nikula <[email protected]>

Fix build warning if drm_panel.h is built with CONFIG_OF=n or CONFIG_DRM_PANEL=n and included without the prerequisite err.h:

./include/drm/drm_panel.h: In function ‘of_drm_find_panel’:
./include/drm/drm_panel.h:203:9: error: implicit declaration of function ‘ERR_PTR’ [-Werror=implicit-function-declaration]

  return ERR_PTR(-ENODEV);
         ^~~~~~~
./include/drm/drm_panel.h:203:9: error: returning ‘int’ from a function with return type ‘struct drm_panel *’ makes pointer from integer without a cast [-Werror=int-conversion]
  return ERR_PTR(-ENODEV);
         ^~~~~~~~~~~~~~~~
Fixes 5fa8e4a22182 ("drm/panel: Make of_drm_find_panel() return an ERR_PTR() instead of NULL")
Cc Boris Brezillon <[email protected]>
---
 include/drm/drm_panel.h | 1 +
 1 file changed, 1 insertion(+)
include/drm/drm_panel.h +1 -0
index 8c738c0e6e9f..26377836141c 100644
@@ -24,6 +24,7 @@
 #ifndef __DRM_PANEL_H__
 #define __DRM_PANEL_H__
 
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/list.h>
 
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/11
#2 lore raw

Re: [PATCH v1 01/11] drm/panel: make drm_panel.h self-contained

Quoted 13 lines · Sam Ravnborg

From: Jani Nikula <[email protected]>

Fix build warning if drm_panel.h is built with CONFIG_OF=n or CONFIG_DRM_PANEL=n and included without the prerequisite err.h:

./include/drm/drm_panel.h: In function ‘of_drm_find_panel’:
./include/drm/drm_panel.h:203:9: error: implicit declaration of function ‘ERR_PTR’ [-Werror=implicit-function-declaration]

  return ERR_PTR(-ENODEV);
         ^~~~~~~
./include/drm/drm_panel.h:203:9: error: returning ‘int’ from a function with return type ‘struct drm_panel *’ makes pointer from integer without a cast [-Werror=int-conversion]
  return ERR_PTR(-ENODEV);
         ^~~~~~~~~~~~~~~~
Quoted 5 lines
Fixes 5fa8e4a22182 ("drm/panel: Make of_drm_find_panel() return an ERR_PTR() instead of NULL")
Cc Boris Brezillon <[email protected]>
Quoted 19 lines
---
 include/drm/drm_panel.h | 1 +
 1 file changed, 1 insertion(+)
include/drm/drm_panel.h +1 -0
index 8c738c0e6e9f..26377836141c 100644
@@ -24,6 +24,7 @@
 #ifndef __DRM_PANEL_H__
 #define __DRM_PANEL_H__
 
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/list.h>
 
Signature · 1 line
2.20.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#3 lore raw

PATCH 2/11 drm: drop uapi dependency from drm_print.h

In reply to Sam Ravnborg

drm_print.h used DRM_NAME - thus adding a dependency from include/drm/drm_print.h => uapi/drm/drm.h

Hardcode the name "drm" to break this dependency. The idea is that there shall be a minimal dependency between include/drm/* and uapi/*

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Rob Clark <[email protected]>
Cc Sean Paul <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 include/drm/drm_print.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
include/drm/drm_print.h +1 -3
index a5d6f2f3e430..760d1bd0eaf1 100644
@@ -32,8 +32,6 @@
 #include <linux/device.h>
 #include <linux/debugfs.h>
 
-#include <drm/drm.h>
-
 /**
  * DOC: print
  *
@@ -287,7 +285,7 @@ void drm_err(const char *format, ...);
 /* Macros to make printk easier */
 
 #define _DRM_PRINTK(once, level, fmt, ...)				\
-	printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
+	printk##once(KERN_##level "[drm] " fmt, ##__VA_ARGS__)
 
 #define DRM_INFO(fmt, ...)						\
 	_DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__)
Signature · 6 lines
2.20.1

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

Re: [PATCH v1 02/11] drm: drop uapi dependency from drm_print.h

Quoting Sam Ravnborg (2019-07-18 17:14:58)

Quoted 36 lines

drm_print.h used DRM_NAME - thus adding a dependency from include/drm/drm_print.h => uapi/drm/drm.h

Hardcode the name "drm" to break this dependency. The idea is that there shall be a minimal dependency between include/drm/* and uapi/*

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Rob Clark <[email protected]>
Cc Sean Paul <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 include/drm/drm_print.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
include/drm/drm_print.h +0 -2
index a5d6f2f3e430..760d1bd0eaf1 100644
@@ -32,8 +32,6 @@
 #include <linux/device.h>
 #include <linux/debugfs.h>
 
-#include <drm/drm.h>
-
 /**
  * DOC: print
  *

include/drm/drm_print.h void drm_err(const char *format, ...); · line 288

Quoted 5 lines
include/drm/drm_print.h +1 -1
@@ -287,7 +285,7 @@ void drm_err(const char *format, ...);
 /* Macros to make printk easier */
 
 #define _DRM_PRINTK(once, level, fmt, ...)                             \
-       printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
+       printk##once(KERN_##level "[drm] " fmt, ##__VA_ARGS__)

I guess I'm th only one who

#undef DRM_NAME
#define DRM_NAME i915

just so that I didn't have inane logs?

One might suggest that instead of hardcoding it, follow the pr_fmt() pattern and only add "[drm]" for the drm core.

Even then it so useless (which drm driver is this message for???) that I want to remove them all :(
-Chris

#5 lore raw

Re: [PATCH v1 02/11] drm: drop uapi dependency from drm_print.h

Am 18.07.19 um 18:46 schrieb Chris Wilson:

Quoted 47 lines

Quoting Sam Ravnborg (2019-07-18 17:14:58)

Quoted 36 lines

drm_print.h used DRM_NAME - thus adding a dependency from include/drm/drm_print.h => uapi/drm/drm.h

Hardcode the name "drm" to break this dependency. The idea is that there shall be a minimal dependency between include/drm/* and uapi/*

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Rob Clark <[email protected]>
Cc Sean Paul <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[email protected]>
---
  include/drm/drm_print.h | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
include/drm/drm_print.h +0 -2
index a5d6f2f3e430..760d1bd0eaf1 100644
@@ -32,8 +32,6 @@
  #include <linux/device.h>
  #include <linux/debugfs.h>
 
-#include <drm/drm.h>
-
  /**
   * DOC: print
   *

include/drm/drm_print.h void drm_err(const char *format, ...); · line 288

Quoted 5 lines
include/drm/drm_print.h +1 -1
@@ -287,7 +285,7 @@ void drm_err(const char *format, ...);
  /* Macros to make printk easier */
 
  #define _DRM_PRINTK(once, level, fmt, ...)                             \
-       printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
+       printk##once(KERN_##level "[drm] " fmt, ##__VA_ARGS__)

I guess I'm th only one who

#undef DRM_NAME
#define DRM_NAME i915

Quoted 7 lines

just so that I didn't have inane logs?

One might suggest that instead of hardcoding it, follow the pr_fmt() pattern and only add "[drm]" for the drm core.

Even then it so useless (which drm driver is this message for???) that I want to remove them all :(

Yeah, agree. I mean it is nice if the core drm functions use a prefix for debug output.

But I actually don't see the point for individual drivers.

Christian.

Quoted 1 line

-Chris

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

#6 lore raw

Re: [PATCH v1 02/11] drm: drop uapi dependency from drm_print.h

Quoted 53 lines · Christian

Am 18.07.19 um 18:46 schrieb Chris Wilson:

Quoted 52 lines

Quoting Sam Ravnborg (2019-07-18 17:14:58)

Quoted 36 lines

drm_print.h used DRM_NAME - thus adding a dependency from include/drm/drm_print.h => uapi/drm/drm.h

Hardcode the name "drm" to break this dependency. The idea is that there shall be a minimal dependency between include/drm/* and uapi/*

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Rob Clark <[email protected]>
Cc Sean Paul <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[email protected]>
---
  include/drm/drm_print.h | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
include/drm/drm_print.h +0 -2
index a5d6f2f3e430..760d1bd0eaf1 100644
@@ -32,8 +32,6 @@
  #include <linux/device.h>
  #include <linux/debugfs.h>
 
-#include <drm/drm.h>
-
  /**
   * DOC: print
   *

include/drm/drm_print.h void drm_err(const char *format, ...); · line 288

Quoted 5 lines
include/drm/drm_print.h +1 -1
@@ -287,7 +285,7 @@ void drm_err(const char *format, ...);
  /* Macros to make printk easier */
 
  #define _DRM_PRINTK(once, level, fmt, ...)                             \
-       printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
+       printk##once(KERN_##level "[drm] " fmt, ##__VA_ARGS__)

I guess I'm th only one who

#undef DRM_NAME
#define DRM_NAME i915

just so that I didn't have inane logs?

One might suggest that instead of hardcoding it, follow the pr_fmt() pattern and only add "[drm]" for the drm core.

Quoted 7 lines
Quoted 2 lines

Even then it so useless (which drm driver is this message for???) that I want to remove them all :(

Yeah, agree. I mean it is nice if the core drm functions use a prefix for debug output.

But I actually don't see the point for individual drivers.

We should all migrate to the versions with device...

BR,
Jani.

Quoted 9 lines

Christian.

Quoted 1 line

-Chris

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

Signature · 6 lines
Jani Nikula, Intel Open Source Graphics Center

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#7 lore raw

Re: [PATCH v1 02/11] drm: drop uapi dependency from drm_print.h

Quoted 10 lines
Quoted 8 lines
Quoted 3 lines

Even then it so useless (which drm driver is this message for???) that I want to remove them all :(

Yeah, agree. I mean it is nice if the core drm functions use a prefix for debug output.

But I actually don't see the point for individual drivers.

We should all migrate to the versions with device...

Just to do an xkdc.com/927 I have considered:

drm_err(const struct drm_device *drm, ...)
drm_info(const struct drm_device *drm, ...)

drm_kms_err(const struct drm_device *drm, ...)
drm_kms_info(const struct drm_device *drm, ...))

And so on for vbl, primse. lease, state etc.

Then we could fish out relevant info from the drm device and present this nicely.

For the cases where no drm_device is available the fallback is:
drm_dev_err(const struct drm_device *drm, ...) drm_dev_info(const struct drm_device *drm, ...))

We could modify the existing UPPERCASE macros to be placeholders for the more reader friendly lower cases variants and base it all on the established infrastructure.

But this is just idle thinking, as only a serious patch would stir the relevant discussions.

For now this is far from the top of my TODO list.

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

#8 lore raw

Re: [PATCH v1 02/11] drm: drop uapi dependency from drm_print.h

Am 29.07.19 um 16:35 schrieb Sam Ravnborg:

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines

Even then it so useless (which drm driver is this message for???) that I want to remove them all :(

Yeah, agree. I mean it is nice if the core drm functions use a prefix for debug output.

But I actually don't see the point for individual drivers.

Quoted 8 lines
Quoted 1 line

We should all migrate to the versions with device...

Just to do an xkdc.com/927 I have considered:

drm_err(const struct drm_device *drm, ...)
drm_info(const struct drm_device *drm, ...)

drm_kms_err(const struct drm_device *drm, ...)
drm_kms_info(const struct drm_device *drm, ...))

Why not get completely rid of those and just use dev_err, dev_warn, pr_err, pr_warn etc?

I mean is it useful to have this extra printing subsystem in DRM while the standard Linux one actually does a better job?

Christian.

Quoted 14 lines

And so on for vbl, primse. lease, state etc.

Then we could fish out relevant info from the drm device and present this nicely.

For the cases where no drm_device is available the fallback is:
drm_dev_err(const struct drm_device *drm, ...) drm_dev_info(const struct drm_device *drm, ...))

We could modify the existing UPPERCASE macros to be placeholders for the more reader friendly lower cases variants and base it all on the established infrastructure.

Quoted 7 lines

But this is just idle thinking, as only a serious patch would stir the relevant discussions.

For now this is far from the top of my TODO list.

Sam

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

#9 lore raw

Re: [PATCH v1 02/11] drm: drop uapi dependency from drm_print.h

Hi Christian.

Quoted 13 lines · Christian

Am 29.07.19 um 16:35 schrieb Sam Ravnborg:

Quoted 12 lines
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines

Even then it so useless (which drm driver is this message for???) that I want to remove them all :(

Yeah, agree. I mean it is nice if the core drm functions use a prefix for debug output.

But I actually don't see the point for individual drivers.

We should all migrate to the versions with device...

Just to do an xkdc.com/927 I have considered:

drm_err(const struct drm_device *drm, ...)
drm_info(const struct drm_device *drm, ...)

Quoted 8 lines
Quoted 2 lines

drm_kms_err(const struct drm_device *drm, ...)
drm_kms_info(const struct drm_device *drm, ...))

Why not get completely rid of those and just use dev_err, dev_warn, pr_err, pr_warn etc?

I mean is it useful to have this extra printing subsystem in DRM while the standard Linux one actually does a better job?

The added functionality of drm_xxx_err would be to keep the current drm.debug=0x1f filtering on the command-line.
I do not think we can do this with the standard logging.

And then we can prefix every logging with driver name and device name.

The idea is to make a thin layer on top of the existing pr_xxx() functions. So not a full subsystem, only a wrapper on top of what we already have.

Anyway, idle talk only. We need patches and sample output if we should discuss more.

Sam

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

#10 lore raw

Re: [PATCH v1 02/11] drm: drop uapi dependency from drm_print.h

Quoted 19 lines · Sam Ravnborg

Hi Christian.

Quoted 16 lines · Christian

Am 29.07.19 um 16:35 schrieb Sam Ravnborg:

Quoted 14 lines
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines

Even then it so useless (which drm driver is this message for???) that I want to remove them all :(

Yeah, agree. I mean it is nice if the core drm functions use a prefix for debug output.

But I actually don't see the point for individual drivers.

We should all migrate to the versions with device...

Just to do an xkdc.com/927 I have considered:

drm_err(const struct drm_device *drm, ...)
drm_info(const struct drm_device *drm, ...)

drm_kms_err(const struct drm_device *drm, ...)
drm_kms_info(const struct drm_device *drm, ...))

Quoted 8 lines
Quoted 5 lines

Why not get completely rid of those and just use dev_err, dev_warn, pr_err, pr_warn etc?

I mean is it useful to have this extra printing subsystem in DRM while the standard Linux one actually does a better job?

The added functionality of drm_xxx_err would be to keep the current drm.debug=0x1f filtering on the command-line.
I do not think we can do this with the standard logging.

Correct. I'd love the benefits of dynamic debug, but there's no support for the kind of message categories that we do with drm.debug.

I've contemplated switching i915 over to using the variants where you pass the device, but I really really don't like the idea of:

- DRM_DEBUG_KMS("hello\n");
+ DRM_DEV_DEBUG_KMS(i915->drm.dev, "hello\n");

Where i915 is our private wrapper for drm_device. I think it's just too much ugly uppercase boilerplate, and a large portion of the debugs would have to span at least an extra line after that.

I'd also very much prefer passing just struct *drm_device instead of struct *device. In that, I think the needs of the few have prevailed over the needs of the many. I'd definitely prefer drm_err(const struct drm_device *drm, ...) and friends over the current ones.

Frankly, I've actually ended up thinking about adding our own, short i915 wrappers for our needs. :(

BR,
Jani.

Quoted 15 lines

And then we can prefix every logging with driver name and device name.

The idea is to make a thin layer on top of the existing pr_xxx() functions. So not a full subsystem, only a wrapper on top of what we already have.

Anyway, idle talk only. We need patches and sample output if we should discuss more.

Sam

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

Signature · 6 lines
Jani Nikula, Intel Open Source Graphics Center

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#11 lore raw

Re: [PATCH v1 02/11] drm: drop uapi dependency from drm_print.h

Hi Jani.

Quoted 15 lines
Quoted 5 lines
Quoted 2 lines

I mean is it useful to have this extra printing subsystem in DRM while the standard Linux one actually does a better job?

The added functionality of drm_xxx_err would be to keep the current drm.debug=0x1f filtering on the command-line.
I do not think we can do this with the standard logging.

Correct. I'd love the benefits of dynamic debug, but there's no support for the kind of message categories that we do with drm.debug.

I've contemplated switching i915 over to using the variants where you pass the device, but I really really don't like the idea of:

(quoted diff) +1 -1
- 	DRM_DEBUG_KMS("hello\n");
+ 	DRM_DEV_DEBUG_KMS(i915->drm.dev, "hello\n");
Quoted 8 lines

Where i915 is our private wrapper for drm_device. I think it's just too much ugly uppercase boilerplate, and a large portion of the debugs would have to span at least an extra line after that.

I'd also very much prefer passing just struct *drm_device instead of struct *device. In that, I think the needs of the few have prevailed over the needs of the many. I'd definitely prefer drm_err(const struct drm_device *drm, ...) and friends over the current ones.

This is from my notes:

"
drm_err(const struct drm_device *drm, ...)
drm_info(const struct drm_device *drm, ...)

drm_kms_err(const struct drm_device *drm, ...)
drm_kms_info(const struct drm_device *drm, ...))

etc.

Then we could fish out relevant info from the drm device and present this nicely.

For the cases where no drm_device is available the fallback is:
drm_dev_err(const struct drm_device *drm, ...) drm_dev_info(const struct drm_device *drm, ...))

We could modify the existing UPPERCASE macros to be placeholders for the more reader friendly lower cases variants.
"

So we seems to be aligned here.
In other words - if you throw time after this then try to add the new logging variants to drm_print.h for the benefit of all. The we can maybe later do some mass conversion if we want to get rid of some of the older logging systems.

I have not yet found time/energy to throw after this myself.

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

#12 lore raw

Re: [PATCH v1 02/11] drm: drop uapi dependency from drm_print.h

In reply to Sam Ravnborg
Quoted 6 lines · Sam Ravnborg

drm_print.h used DRM_NAME - thus adding a dependency from include/drm/drm_print.h => uapi/drm/drm.h

Hardcode the name "drm" to break this dependency. The idea is that there shall be a minimal dependency between include/drm/* and uapi/*

You might also want to clean up the other uses of DRM_NAME in armada and i915 while you're at it. The easiest way to satisfy Chris' usecase and remove the dependency would be to add #define DRM_PRINT_NAME "drm" in drm_print.h and use that.

Sean

Quoted 41 lines
Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Rob Clark <[email protected]>
Cc Sean Paul <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 include/drm/drm_print.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
include/drm/drm_print.h +1 -3
index a5d6f2f3e430..760d1bd0eaf1 100644
@@ -32,8 +32,6 @@
 #include <linux/device.h>
 #include <linux/debugfs.h>
 
-#include <drm/drm.h>
-
 /**
  * DOC: print
  *
@@ -287,7 +285,7 @@ void drm_err(const char *format, ...);
 /* Macros to make printk easier */
 
 #define _DRM_PRINTK(once, level, fmt, ...)				\
-	printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
+	printk##once(KERN_##level "[drm] " fmt, ##__VA_ARGS__)
 
 #define DRM_INFO(fmt, ...)						\
 	_DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__)
Signature · 1 line
2.20.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#13 lore raw

PATCH 3/11 drm: drop uapi dependency from drm_vblank.h

In reply to Sam Ravnborg

drm_vblank.h included uapi/drm/drm.h.
It turns out this include was not required - delete it.

Note: uapi/drm/drm.h is included indirect via drm_file.h, but there are no dependencies in drm_vblank.h so the removal is legit.

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Stefan Agner <[email protected]>
Cc Thierry Reding <[email protected]>
---
 include/drm/drm_vblank.h | 1 -
 1 file changed, 1 deletion(-)
include/drm/drm_vblank.h +0 -1
index e528bb2f659d..9fe4ba8bc622 100644
@@ -30,7 +30,6 @@
 
 #include <drm/drm_file.h>
 #include <drm/drm_modes.h>
-#include <uapi/drm/drm.h>
 
 struct drm_device;
 struct drm_crtc;
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 3/11
#14 lore raw

Re: [PATCH v1 03/11] drm: drop uapi dependency from drm_vblank.h

Quoted 7 lines · Sam Ravnborg

drm_vblank.h included uapi/drm/drm.h.
It turns out this include was not required - delete it.

Note: uapi/drm/drm.h is included indirect via drm_file.h, but there are no dependencies in drm_vblank.h so the removal is legit.

Quoted 9 lines
Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Stefan Agner <[email protected]>
Cc Thierry Reding <[email protected]>
Quoted 19 lines
---
 include/drm/drm_vblank.h | 1 -
 1 file changed, 1 deletion(-)
include/drm/drm_vblank.h +0 -1
index e528bb2f659d..9fe4ba8bc622 100644
@@ -30,7 +30,6 @@
 
 #include <drm/drm_file.h>
 #include <drm/drm_modes.h>
-#include <uapi/drm/drm.h>
 
 struct drm_device;
 struct drm_crtc;
Signature · 1 line
2.20.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#15 lore raw

PATCH 4/11 drm/ati_pcigart: drop dependency on drm_os_linux.h

In reply to Sam Ravnborg

The drm_os_linux.h header is deprecated.
Just opencode the sole DRM_WRITE32().

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/ati_pcigart.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/ati_pcigart.c +6 -4
index 2a413e291a60..580aa2676358 100644
@@ -35,7 +35,6 @@
 
 #include <drm/ati_pcigart.h>
 #include <drm/drm_device.h>
-#include <drm/drm_os_linux.h>
 #include <drm/drm_pci.h>
 #include <drm/drm_print.h>
 
@@ -169,6 +168,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
 		page_base = (u32) entry->busaddr[i];
 
 		for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) {
+			u32 offset;
 			u32 val;
 
 			switch(gart_info->gart_reg_if) {
@@ -184,10 +184,12 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
 				break;
 			}
 			if (gart_info->gart_table_location ==
-			    DRM_ATI_GART_MAIN)
+			    DRM_ATI_GART_MAIN) {
 				pci_gart[gart_idx] = cpu_to_le32(val);
-			else
-				DRM_WRITE32(map, gart_idx * sizeof(u32), val);
+			} else {
+				offset = gart_idx * sizeof(u32);
+				writel(val, (void __iomem *)map->handle + offset);
+			}
 			gart_idx++;
 			page_base += ATI_PCIGART_PAGE_SIZE;
 		}
Signature · 6 lines
2.20.1

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

Re: [PATCH v1 04/11] drm/ati_pcigart: drop dependency on drm_os_linux.h

Quoted 2 lines · Sam Ravnborg

The drm_os_linux.h header is deprecated.
Just opencode the sole DRM_WRITE32().

Any plans for the other users of DRM_WRITE<N>()? It seems like it'd be trivial to fix it up for via and mga. I don't really have any background on drm_os_linux.h, but it doesn't seem like it'd be that much more effort to just remove the whole thing.

Sean

Quoted 50 lines
Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/ati_pcigart.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/ati_pcigart.c +6 -4
index 2a413e291a60..580aa2676358 100644
@@ -35,7 +35,6 @@
 
 #include <drm/ati_pcigart.h>
 #include <drm/drm_device.h>
-#include <drm/drm_os_linux.h>
 #include <drm/drm_pci.h>
 #include <drm/drm_print.h>
 
@@ -169,6 +168,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
 		page_base = (u32) entry->busaddr[i];
 
 		for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) {
+			u32 offset;
 			u32 val;
 
 			switch(gart_info->gart_reg_if) {
@@ -184,10 +184,12 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
 				break;
 			}
 			if (gart_info->gart_table_location ==
-			    DRM_ATI_GART_MAIN)
+			    DRM_ATI_GART_MAIN) {
 				pci_gart[gart_idx] = cpu_to_le32(val);
-			else
-				DRM_WRITE32(map, gart_idx * sizeof(u32), val);
+			} else {
+				offset = gart_idx * sizeof(u32);
+				writel(val, (void __iomem *)map->handle + offset);
+			}
 			gart_idx++;
 			page_base += ATI_PCIGART_PAGE_SIZE;
 		}
Signature · 1 line
2.20.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#17 lore raw

Re: [PATCH v1 04/11] drm/ati_pcigart: drop dependency on drm_os_linux.h

Hi Sean.

Quoted 5 lines

Any plans for the other users of DRM_WRITE<N>()? It seems like it'd be trivial to fix it up for via and mga. I don't really have any background on drm_os_linux.h, but it doesn't seem like it'd be that much more effort to just remove the whole thing.

During the drmP.h removal I also took care of drm_os_linux.h, so when the patches land then there will be no users left. I look forward to delete that file.

For via I only just posted the patches today.
For mga they already landed in drm-misc-next.

I expect that we after next merge window can delete both drm_os_linux.h and drmP.h.

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

Reviewed-by
#18 lore raw

Re: [PATCH v1 04/11] drm/ati_pcigart: drop dependency on drm_os_linux.h

Quoted 7 lines · Sam Ravnborg

Hi Sean.

Quoted 5 lines

Any plans for the other users of DRM_WRITE<N>()? It seems like it'd be trivial to fix it up for via and mga. I don't really have any background on drm_os_linux.h, but it doesn't seem like it'd be that much more effort to just remove the whole thing.

Quoted 7 lines

During the drmP.h removal I also took care of drm_os_linux.h, so when the patches land then there will be no users left. I look forward to delete that file.

For via I only just posted the patches today.
For mga they already landed in drm-misc-next.

Awesome! I think I was looking at drm-next instead of -misc-next, so happy to hear the future is bright :)

Quoted 4 lines

I expect that we after next merge window can delete both drm_os_linux.h and drmP.h.

Sam

Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#19 lore raw

PATCH 5/11 drm/vblank: drop use of DRM_WAIT_ON()

In reply to Sam Ravnborg

DRM_WAIT_ON() is from the deprecated drm_os_linux header and the modern replacement is the wait_event_*.

The return values differ, so a conversion is needed to keep the original interface towards userspace. Introduced a switch/case to make code obvious and to allow different debug prints depending on the result.

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/drm_vblank.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)
drivers/gpu/drm/drm_vblank.c +20 -9
index 603ab105125d..8e9ac187500e 100644
@@ -31,7 +31,6 @@
 #include <drm/drm_drv.h>
 #include <drm/drm_framebuffer.h>
 #include <drm/drm_print.h>
-#include <drm/drm_os_linux.h>
 #include <drm/drm_vblank.h>
 
 #include "drm_internal.h"
@@ -1672,19 +1671,31 @@ int drm_wait_vblank_ioctl(struct drm_device *dev, void *data,
 	if (req_seq != seq) {
 		DRM_DEBUG("waiting on vblank count %llu, crtc %u\n",
 			  req_seq, pipe);
-		DRM_WAIT_ON(ret, vblank->queue, 3 * HZ,
-			    vblank_passed(drm_vblank_count(dev, pipe),
-					  req_seq) ||
-			    !READ_ONCE(vblank->enabled));
+		ret = wait_event_interruptible_timeout(vblank->queue,
+			vblank_passed(drm_vblank_count(dev, pipe), req_seq) ||
+				      !READ_ONCE(vblank->enabled),
+			msecs_to_jiffies(3000));
 	}
 
-	if (ret != -EINTR) {
+	switch (ret) {
+	case 0:
+		/* timeout */
+		ret = -EBUSY;
 		drm_wait_vblank_reply(dev, pipe, &vblwait->reply);
-
-		DRM_DEBUG("crtc %d returning %u to client\n",
+		DRM_DEBUG("timeout waiting for vblank. crtc %d returning %u to client\n",
 			  pipe, vblwait->reply.sequence);
-	} else {
+		break;
+	case -ERESTARTSYS:
+		/* interrupted by signal */
+		ret = -EINTR;
 		DRM_DEBUG("crtc %d vblank wait interrupted by signal\n", pipe);
+		break;
+	default:
+		ret = 0;
+		drm_wait_vblank_reply(dev, pipe, &vblwait->reply);
+		DRM_DEBUG("crtc %d returning %u to client\n",
+			  pipe, vblwait->reply.sequence);
+		break;
 	}
 
 done:
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 5/11
#20 lore raw

Re: [PATCH v1 05/11] drm/vblank: drop use of DRM_WAIT_ON()

Quoted 9 lines · Sam Ravnborg

DRM_WAIT_ON() is from the deprecated drm_os_linux header and the modern replacement is the wait_event_*.

The return values differ, so a conversion is needed to keep the original interface towards userspace. Introduced a switch/case to make code obvious and to allow different debug prints depending on the result.

Quoted 64 lines
Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/drm_vblank.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)
drivers/gpu/drm/drm_vblank.c +20 -9
index 603ab105125d..8e9ac187500e 100644
@@ -31,7 +31,6 @@
 #include <drm/drm_drv.h>
 #include <drm/drm_framebuffer.h>
 #include <drm/drm_print.h>
-#include <drm/drm_os_linux.h>
 #include <drm/drm_vblank.h>
 
 #include "drm_internal.h"
@@ -1672,19 +1671,31 @@ int drm_wait_vblank_ioctl(struct drm_device *dev, void *data,
 	if (req_seq != seq) {
 		DRM_DEBUG("waiting on vblank count %llu, crtc %u\n",
 			  req_seq, pipe);
-		DRM_WAIT_ON(ret, vblank->queue, 3 * HZ,
-			    vblank_passed(drm_vblank_count(dev, pipe),
-					  req_seq) ||
-			    !READ_ONCE(vblank->enabled));
+		ret = wait_event_interruptible_timeout(vblank->queue,
+			vblank_passed(drm_vblank_count(dev, pipe), req_seq) ||
+				      !READ_ONCE(vblank->enabled),
+			msecs_to_jiffies(3000));
 	}
 
-	if (ret != -EINTR) {
+	switch (ret) {
+	case 0:
+		/* timeout */
+		ret = -EBUSY;
 		drm_wait_vblank_reply(dev, pipe, &vblwait->reply);
-
-		DRM_DEBUG("crtc %d returning %u to client\n",
+		DRM_DEBUG("timeout waiting for vblank. crtc %d returning %u to client\n",
 			  pipe, vblwait->reply.sequence);
-	} else {
+		break;
+	case -ERESTARTSYS:
+		/* interrupted by signal */
+		ret = -EINTR;
 		DRM_DEBUG("crtc %d vblank wait interrupted by signal\n", pipe);
+		break;
+	default:
+		ret = 0;
+		drm_wait_vblank_reply(dev, pipe, &vblwait->reply);
+		DRM_DEBUG("crtc %d returning %u to client\n",
+			  pipe, vblwait->reply.sequence);
+		break;
 	}
 
 done:
Signature · 1 line
2.20.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#21 lore raw

PATCH 6/11 drm: direct include of drm.h in drm_gem.c

In reply to Sam Ravnborg

Do not rely on including drm.h from drm_file.h,
as the include in drm_file.h will be dropped.

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Eric Anholt <[email protected]>
Cc Thomas Zimmermann <[email protected]>
Cc Rob Herring <[email protected]>
---
 drivers/gpu/drm/drm_gem.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_gem.c +1 -0
index e6c12c6ec728..243f43d70f42 100644
@@ -39,6 +39,7 @@
 #include <linux/mem_encrypt.h>
 #include <linux/pagevec.h>
 
+#include <drm/drm.h>
 #include <drm/drm_device.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_file.h>
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 6/11
#22 lore raw

Re: [PATCH v1 06/11] drm: direct include of drm.h in drm_gem.c

Quoted 4 lines · Sam Ravnborg

Do not rely on including drm.h from drm_file.h,
as the include in drm_file.h will be dropped.

Quoted 27 lines
Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Eric Anholt <[email protected]>
Cc Thomas Zimmermann <[email protected]>
Cc Rob Herring <[email protected]>
---
 drivers/gpu/drm/drm_gem.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_gem.c +1 -0
index e6c12c6ec728..243f43d70f42 100644
@@ -39,6 +39,7 @@
 #include <linux/mem_encrypt.h>
 #include <linux/pagevec.h>
 
+#include <drm/drm.h>
 #include <drm/drm_device.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_file.h>
Signature · 1 line
2.20.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#23 lore raw

PATCH 7/11 drm: direct include of drm.h in drm_gem_shmem_helper.c

In reply to Sam Ravnborg

Do not rely on including drm.h from drm_file.h,
as the include in drm_file.h will be dropped.

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Eric Anholt <[email protected]>
Cc Thomas Zimmermann <[email protected]>
Cc Rob Herring <[email protected]>
---
 drivers/gpu/drm/drm_gem_shmem_helper.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_gem_shmem_helper.c +1 -0
index 472ea5d81f82..2f64667ac805 100644
@@ -10,6 +10,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 
+#include <drm/drm.h>
 #include <drm/drm_device.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_gem_shmem_helper.h>
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 7/11
#24 lore raw

Re: [PATCH v1 07/11] drm: direct include of drm.h in drm_gem_shmem_helper.c

Quoted 4 lines · Sam Ravnborg

Do not rely on including drm.h from drm_file.h,
as the include in drm_file.h will be dropped.

Quoted 27 lines
Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Eric Anholt <[email protected]>
Cc Thomas Zimmermann <[email protected]>
Cc Rob Herring <[email protected]>
---
 drivers/gpu/drm/drm_gem_shmem_helper.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_gem_shmem_helper.c +1 -0
index 472ea5d81f82..2f64667ac805 100644
@@ -10,6 +10,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 
+#include <drm/drm.h>
 #include <drm/drm_device.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_gem_shmem_helper.h>
Signature · 1 line
2.20.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#25 lore raw

PATCH 8/11 drm: direct include of drm.h in drm_prime.c

In reply to Sam Ravnborg

Do not rely on including drm.h from drm_file.h, as the include in drm_file.h will be dropped.

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Christian König <[email protected]>
Cc Noralf Trønnes <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Eric Anholt <[email protected]>
---
 drivers/gpu/drm/drm_prime.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_prime.c +1 -0
index 189d980402ad..eca484106cc2 100644
@@ -30,6 +30,7 @@
 #include <linux/dma-buf.h>
 #include <linux/rbtree.h>
 
+#include <drm/drm.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_file.h>
 #include <drm/drm_framebuffer.h>
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 8/11
#26 lore raw

Re: [PATCH v1 08/11] drm: direct include of drm.h in drm_prime.c

Quoted 4 lines · Sam Ravnborg

Do not rely on including drm.h from drm_file.h,
as the include in drm_file.h will be dropped.

Quoted 28 lines
Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Christian König <[email protected]>
Cc Noralf Trønnes <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Eric Anholt <[email protected]>
---
 drivers/gpu/drm/drm_prime.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_prime.c +1 -0
index 189d980402ad..eca484106cc2 100644
@@ -30,6 +30,7 @@
 #include <linux/dma-buf.h>
 #include <linux/rbtree.h>
 
+#include <drm/drm.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_file.h>
 #include <drm/drm_framebuffer.h>
Signature · 1 line
2.20.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#27 lore raw

PATCH 9/11 drm: direct include of drm.h in drm_syncobj.c

In reply to Sam Ravnborg

Do not rely on including drm.h from drm_file.h,
as the include in drm_file.h will be dropped.

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Lionel Landwerlin <[email protected]>
Cc Chunming Zhou <[email protected]>
Cc Christian König <[email protected]>
---
 drivers/gpu/drm/drm_syncobj.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_syncobj.c +1 -0
index a199c8d56b95..75cb4bb7619e 100644
@@ -53,6 +53,7 @@
 #include <linux/sync_file.h>
 #include <linux/uaccess.h>
 
+#include <drm/drm.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_file.h>
 #include <drm/drm_gem.h>
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 9/11
#28 lore raw

Re: [PATCH v1 09/11] drm: direct include of drm.h in drm_syncobj.c

Quoted 4 lines · Sam Ravnborg

Do not rely on including drm.h from drm_file.h,
as the include in drm_file.h will be dropped.

Quoted 27 lines
Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Lionel Landwerlin <[email protected]>
Cc Chunming Zhou <[email protected]>
Cc Christian König <[email protected]>
---
 drivers/gpu/drm/drm_syncobj.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_syncobj.c +1 -0
index a199c8d56b95..75cb4bb7619e 100644
@@ -53,6 +53,7 @@
 #include <linux/sync_file.h>
 #include <linux/uaccess.h>
 
+#include <drm/drm.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_file.h>
 #include <drm/drm_gem.h>
Signature · 1 line
2.20.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#29 lore raw

PATCH 10/11 drm/mediatek: direct include of drm.h in mtk_drm_gem.c

In reply to Sam Ravnborg

Do not rely on including drm.h from drm_file.h, as the include in drm_file.h will be dropped.

---
 drivers/gpu/drm/mediatek/mtk_drm_gem.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/mediatek/mtk_drm_gem.c +1 -0
index 9434f88c6341..ca672f1d140d 100644
@@ -5,6 +5,7 @@
 
 #include <linux/dma-buf.h>
 
+#include <drm/drm.h>
 #include <drm/drm_device.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_prime.h>
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 10/11
#30 lore raw

Re: [PATCH v1 10/11] drm/mediatek: direct include of drm.h in mtk_drm_gem.c

Quoted 4 lines · Sam Ravnborg

Do not rely on including drm.h from drm_file.h, as the include in drm_file.h will be dropped.

Quoted 24 lines
---
 drivers/gpu/drm/mediatek/mtk_drm_gem.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/mediatek/mtk_drm_gem.c +1 -0
index 9434f88c6341..ca672f1d140d 100644
@@ -5,6 +5,7 @@
 
 #include <linux/dma-buf.h>
 
+#include <drm/drm.h>
 #include <drm/drm_device.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_prime.h>
Signature · 1 line
2.20.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Acked-by on v1 10/11
#31 lore raw

Re: [PATCH v1 10/11] drm/mediatek: direct include of drm.h in mtk_drm_gem.c

In reply to Sam Ravnborg
Quoted 3 lines · Sam Ravnborg

Do not rely on including drm.h from drm_file.h, as the include in drm_file.h will be dropped.

Quoted 15 lines
---
 drivers/gpu/drm/mediatek/mtk_drm_gem.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/mediatek/mtk_drm_gem.c +0 -0
index 9434f88c6341..ca672f1d140d 100644

drivers/gpu/drm/mediatek/mtk_drm_gem.c line 11

Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_drm_gem.c +1 -0
@@ -5,6 +5,7 @@
 
 #include <linux/dma-buf.h>
 
+#include <drm/drm.h>
 #include <drm/drm_device.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_prime.h>

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

#32 lore raw

Re: [PATCH v1 10/11] drm/mediatek: direct include of drm.h in mtk_drm_gem.c

Hi, Sam:

You could apply this patch into drm-misc-next by yourself, thanks.

Regards,
CK

Quoted 23 lines · CK Hu
Quoted 3 lines · Sam Ravnborg

Do not rely on including drm.h from drm_file.h, as the include in drm_file.h will be dropped.

Quoted 16 lines
---
 drivers/gpu/drm/mediatek/mtk_drm_gem.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/mediatek/mtk_drm_gem.c +0 -0
index 9434f88c6341..ca672f1d140d 100644
@@ -5,6 +5,7 @@
 
Quoted 7 lines

drivers/gpu/drm/mediatek/mtk_drm_gem.c line 11

Quoted 6 lines
drivers/gpu/drm/mediatek/mtk_drm_gem.c +1 -0
 #include <linux/dma-buf.h>
 
+#include <drm/drm.h>
 #include <drm/drm_device.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_prime.h>

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

#33 lore raw

PATCH 11/11 drm: drop uapi dependency from drm_file.h

In reply to Sam Ravnborg

drm_file used drm_magic_t from uapi/drm/drm.h.
This is a simple unsigned int.
Just opencode it as such to break the dependency from this header file to uapi.

Cc Sean Paul <[email protected]>
Cc Liviu Dudau <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Eric Anholt <[email protected]>
---
 include/drm/drm_file.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
include/drm/drm_file.h +1 -3
index 67af60bb527a..046cd1bf91eb 100644
@@ -34,8 +34,6 @@
 #include <linux/completion.h>
 #include <linux/idr.h>
 
-#include <uapi/drm/drm.h>
-
 #include <drm/drm_prime.h>
 
 struct dma_fence;
@@ -227,7 +225,7 @@ struct drm_file {
 	struct pid *pid;
 
 	/** @magic: Authentication magic, see @authenticated. */
-	drm_magic_t magic;
+	unsigned int magic;
 
 	/**
 	 * @lhead:
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 11/11
#34 lore raw

Re: [PATCH v1 11/11] drm: drop uapi dependency from drm_file.h

Quoted 6 lines · Sam Ravnborg

drm_file used drm_magic_t from uapi/drm/drm.h.
This is a simple unsigned int.
Just opencode it as such to break the dependency from this header file to uapi.

Passes my build tests, thanks for the clean-ups!

Quoted 39 lines
Cc Sean Paul <[email protected]>
Cc Liviu Dudau <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Eric Anholt <[email protected]>
---
 include/drm/drm_file.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
include/drm/drm_file.h +1 -3
index 67af60bb527a..046cd1bf91eb 100644
@@ -34,8 +34,6 @@
 #include <linux/completion.h>
 #include <linux/idr.h>
 
-#include <uapi/drm/drm.h>
-
 #include <drm/drm_prime.h>
 
 struct dma_fence;
@@ -227,7 +225,7 @@ struct drm_file {
 	struct pid *pid;
 
 	/** @magic: Authentication magic, see @authenticated. */
-	drm_magic_t magic;
+	unsigned int magic;
 
 	/**
 	 * @lhead:
Signature · 1 line
2.20.1
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
#35 lore raw

Re: [PATCH v1 11/11] drm: drop uapi dependency from drm_file.h

In reply to Sam Ravnborg

Am 18.07.19 um 18:15 schrieb Sam Ravnborg:

Quoted 4 lines

drm_file used drm_magic_t from uapi/drm/drm.h.
This is a simple unsigned int.
Just opencode it as such to break the dependency from this header file to uapi.

Mhm, why do you want to remove UAPI dependency here in the first place?

I mean the type can't change because it is UAPI, but it is rather bad for a documentation point of view.

Christian.

Quoted 30 lines
Cc Sean Paul <[email protected]>
Cc Liviu Dudau <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Eric Anholt <[email protected]>
---
  include/drm/drm_file.h | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
include/drm/drm_file.h +0 -2
index 67af60bb527a..046cd1bf91eb 100644
@@ -34,8 +34,6 @@
  #include <linux/completion.h>
  #include <linux/idr.h>
 
-#include <uapi/drm/drm.h>
-
  #include <drm/drm_prime.h>
 
  struct dma_fence;

include/drm/drm_file.h struct drm_file { · line 231

Quoted 8 lines
include/drm/drm_file.h +1 -1
@@ -227,7 +225,7 @@ struct drm_file {
  	struct pid *pid;
 
  	/** @magic: Authentication magic, see @authenticated. */
-	drm_magic_t magic;
+	unsigned int magic;
 
  	/**
  	 * @lhead:

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

#36 lore raw

Re: [PATCH v1 11/11] drm: drop uapi dependency from drm_file.h

Hi Christian.

Thanks for your comments and very valid question.

Quoted 7 lines · Christian

Am 18.07.19 um 18:15 schrieb Sam Ravnborg:

Quoted 4 lines

drm_file used drm_magic_t from uapi/drm/drm.h.
This is a simple unsigned int.
Just opencode it as such to break the dependency from this header file to uapi.

Mhm, why do you want to remove UAPI dependency here in the first place?

The idea is to make include/drm/* independent of uapi/drm/* so the header files are less tangled up thus easier to read and comprehend.

.c files that requires uapi can then include the uapi headers.

For now my focus was solely on uapi/drm/drm.h - so I dunno if this is an achievable goal for include/drm/*.

For uapi/drm/* headers things are more clear. They shall be independent of include/drm/* as they are exported.

Quoted 2 lines

I mean the type can't change because it is UAPI, but it is rather bad for a documentation point of view.

For a widely used type I would agree.
For struct auth, that is ony used in drm_auth.c then the documentation impact is minor. But your point is indeed valid.
(struct auth has one field of type magic_t).

I will await further feedback before we decide to apply this patch or not.
The patches that pushes include of drm/drm.h to the respective .c files are legit as we drop the dependency on an indirectly included header file. I will process these patches.

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

#37 lore raw

✗ Fi.CI.CHECKPATCH: warning for drm: header maintenance

In reply to Sam Ravnborg
== Series Details ==

== Series Details ==

Series: drm: header maintenance
URL : https://patchwork.freedesktop.org/series/63900/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
6910607ff7fd drm/panel: make drm_panel.h self-contained
f605dd5fa4e8 drm: drop uapi dependency from drm_print.h
7c8cbcd71261 drm: drop uapi dependency from drm_vblank.h
3447b6726480 drm/ati_pcigart: drop dependency on drm_os_linux.h
a64c7d7bde6b drm/vblank: drop use of DRM_WAIT_ON()
-:42: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#42: FILE: drivers/gpu/drm/drm_vblank.c:1675:
+		ret = wait_event_interruptible_timeout(vblank->queue,
+			vblank_passed(drm_vblank_count(dev, pipe), req_seq) ||

total: 0 errors, 0 warnings, 1 checks, 46 lines checked 1d8f58ca09c8 drm: direct include of drm.h in drm_gem.c 9c025c1aba62 drm: direct include of drm.h in drm_gem_shmem_helper.c cdd0c64f15fd drm: direct include of drm.h in drm_prime.c f01beafe627c drm: direct include of drm.h in drm_syncobj.c 5e97e4edeb58 drm/mediatek: direct include of drm.h in mtk_drm_gem.c 96a1d990294f drm: drop uapi dependency from drm_file.h

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

#38 lore raw

✓ Fi.CI.BAT: success for drm: header maintenance

In reply to Sam Ravnborg
== Series Details ==

== Series Details ==

Series: drm: header maintenance
URL : https://patchwork.freedesktop.org/series/63900/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6504 -> Patchwork_13691
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/

Known issues
------------

Here are the changes found in Patchwork_13691 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live_hangcheck:
- fi-icl-u3: [PASS][1] -> [INCOMPLETE][2] ([fdo#107713] / [fdo#108569])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/fi-icl-u3/igt@i915_selftest@live_hangcheck.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/fi-icl-u3/igt@i915_selftest@live_hangcheck.html

* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [PASS][3] -> [DMESG-WARN][4] ([fdo#102614])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/fi-hsw-peppy/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/fi-hsw-peppy/igt@[email protected]

#### Possible fixes ####

* igt@kms_chamelium@dp-edid-read:
- fi-cml-u2: [FAIL][5] ([fdo#109483]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/fi-cml-u2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/fi-cml-u2/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][7] ([fdo#109485]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/fi-kbl-7500u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/fi-kbl-7500u/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485

Participating hosts (54 -> 45)
------------------------------

Additional (1): fi-pnv-d510
Missing (10): fi-kbl-soraka fi-hsw-4770r fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-apl-guc fi-ctg-p8600 fi-icl-y fi-byt-clapper fi-bdw-samus

Build changes
-------------

* Linux: CI_DRM_6504 -> Patchwork_13691

CI_DRM_6504: a23df173f63ed05ae452ab478a01131a89938654 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5102: 6038ace76016d8892f4d13aef5301f71ca1a6e2d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13691: 96a1d990294f84e9e20e6d0d8d95cf7fcc2c7667 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

96a1d990294f drm: drop uapi dependency from drm_file.h 5e97e4edeb58 drm/mediatek: direct include of drm.h in mtk_drm_gem.c f01beafe627c drm: direct include of drm.h in drm_syncobj.c cdd0c64f15fd drm: direct include of drm.h in drm_prime.c 9c025c1aba62 drm: direct include of drm.h in drm_gem_shmem_helper.c 1d8f58ca09c8 drm: direct include of drm.h in drm_gem.c a64c7d7bde6b drm/vblank: drop use of DRM_WAIT_ON() 3447b6726480 drm/ati_pcigart: drop dependency on drm_os_linux.h 7c8cbcd71261 drm: drop uapi dependency from drm_vblank.h f605dd5fa4e8 drm: drop uapi dependency from drm_print.h 6910607ff7fd drm/panel: make drm_panel.h self-contained

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#39 lore raw

✗ Fi.CI.IGT: failure for drm: header maintenance

In reply to Sam Ravnborg
== Series Details ==

== Series Details ==

Series: drm: header maintenance
URL : https://patchwork.freedesktop.org/series/63900/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_6504_full -> Patchwork_13691_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_13691_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_13691_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_13691_full:

### IGT changes ###

#### Possible regressions ####

* igt@debugfs_test@read_all_entries_display_on:
- shard-iclb: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-iclb8/igt@debugfs_test@read_all_entries_display_on.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-iclb4/igt@debugfs_test@read_all_entries_display_on.html

* igt@kms_vblank@invalid:
- shard-kbl: [PASS][3] -> [FAIL][4] +15 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-kbl6/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-kbl7/igt@[email protected]

* igt@kms_vblank@pipe-a-query-idle:
- shard-glk: [PASS][5] -> [FAIL][6] +28 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-glk1/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-glk5/igt@[email protected]

* igt@kms_vblank@pipe-a-query-idle-hang:
- shard-snb: [PASS][7] -> [FAIL][8] +14 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-snb6/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-snb5/igt@[email protected]

* igt@kms_vblank@pipe-b-query-forked:
- shard-skl: [PASS][9] -> [FAIL][10] +20 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-skl5/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-skl7/igt@[email protected]

* igt@kms_vblank@pipe-b-query-idle:
- shard-skl: NOTRUN -> [FAIL][11] +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-skl5/igt@[email protected]

* igt@kms_vblank@pipe-b-query-idle-hang:
- shard-iclb: [PASS][12] -> [FAIL][13] +21 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-iclb8/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-iclb4/igt@[email protected]

* igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm:
- shard-apl: [PASS][14] -> [FAIL][15] +22 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-apl2/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-apl1/igt@[email protected]

* igt@kms_vblank@pipe-c-query-forked-hang:
- shard-iclb: NOTRUN -> [FAIL][16]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-iclb6/igt@[email protected]

* igt@kms_vblank@pipe-c-ts-continuation-modeset-rpm:
- shard-hsw: [PASS][17] -> [FAIL][18] +29 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-hsw4/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-hsw8/igt@[email protected]

#### Warnings ####

* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-glk: [FAIL][19] ([fdo#105363]) -> [FAIL][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-glk7/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-glk8/igt@[email protected]

Known issues
------------

Here are the changes found in Patchwork_13691_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_pwrite@small-gtt-backwards:
- shard-apl: [PASS][21] -> [INCOMPLETE][22] ([fdo#103927])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-apl3/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-apl2/igt@[email protected]

* igt@gem_softpin@noreloc-s3:
- shard-apl: [PASS][23] -> [DMESG-WARN][24] ([fdo#108566]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-apl5/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-apl4/igt@[email protected]

* igt@gem_workarounds@suspend-resume:
- shard-kbl: [PASS][25] -> [DMESG-WARN][26] ([fdo#108566])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-kbl1/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-kbl6/igt@[email protected]

* igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
- shard-glk: [PASS][27] -> [FAIL][28] ([fdo#106509] / [fdo#107409])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-glk4/igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-glk3/igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic.html

* igt@kms_flip@2x-flip-vs-suspend:
- shard-hsw: [PASS][29] -> [INCOMPLETE][30] ([fdo#103540])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-hsw8/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-hsw4/igt@[email protected]

* igt@kms_flip@plain-flip-fb-recreate-interruptible:
- shard-iclb: [PASS][31] -> [FAIL][32] ([fdo#105702])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-iclb5/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-iclb8/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: [PASS][33] -> [FAIL][34] ([fdo#103167]) +5 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-iclb6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html

* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [PASS][35] -> [FAIL][36] ([fdo#108145])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-skl10/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-skl7/igt@[email protected]

* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][37] -> [SKIP][38] ([fdo#109441]) +6 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-iclb7/igt@kms_psr@psr2_cursor_mmap_cpu.html

* igt@kms_vblank@pipe-a-ts-continuation-dpms-rpm:
- shard-skl: [PASS][39] -> [FAIL][40] ([fdo#109495]) +8 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-skl5/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-skl7/igt@[email protected]

* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- shard-iclb: [PASS][41] -> [INCOMPLETE][42] ([fdo#107713])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-iclb4/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-iclb3/igt@[email protected]

* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-kbl: [PASS][43] -> [FAIL][44] ([fdo#109495]) +8 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-kbl1/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-kbl7/igt@[email protected]
- shard-apl: [PASS][45] -> [DMESG-FAIL][46] ([fdo#108566])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-apl2/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-apl1/igt@[email protected]

* igt@kms_vblank@pipe-c-accuracy-idle:
- shard-skl: [PASS][47] -> [FAIL][48] ([fdo#102583])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-skl8/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-skl5/igt@[email protected]

#### Possible fixes ####

* igt@gem_ctx_isolation@vcs0-s3:
- shard-kbl: [DMESG-WARN][49] ([fdo#108566]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-kbl6/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-kbl7/igt@[email protected]

* igt@kms_cursor_legacy@cursor-vs-flip-atomic:
- shard-hsw: [FAIL][51] ([fdo#103355]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-hsw6/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-hsw1/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-apl: [DMESG-WARN][53] ([fdo#108566]) -> [PASS][54] +3 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-apl6/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-apl2/igt@[email protected]
- shard-hsw: [INCOMPLETE][55] ([fdo#103540]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-hsw4/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-hsw8/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
- shard-iclb: [FAIL][57] ([fdo#103167]) -> [PASS][58] +3 similar issues
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-iclb5/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-iclb4/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-suspend:
- shard-iclb: [INCOMPLETE][59] ([fdo#106978] / [fdo#107713]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-iclb7/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-iclb6/igt@[email protected]

* igt@kms_psr@no_drrs:
- shard-iclb: [FAIL][61] ([fdo#108341]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-iclb1/igt@kms_psr@no_drrs.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-iclb5/igt@kms_psr@no_drrs.html

* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][63] ([fdo#109441]) -> [PASS][64] +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-iclb6/igt@kms_psr@psr2_sprite_plane_move.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html

* igt@kms_setmode@basic:
- shard-apl: [FAIL][65] ([fdo#99912]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-apl2/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-apl4/igt@[email protected]
- shard-skl: [FAIL][67] ([fdo#99912]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-skl5/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-skl2/igt@[email protected]
- shard-kbl: [FAIL][69] ([fdo#99912]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-kbl4/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-kbl1/igt@[email protected]

* igt@kms_vblank@pipe-a-wait-forked-busy-hang:
- shard-snb: [SKIP][71] ([fdo#109271]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-snb1/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-snb6/igt@[email protected]

* igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
- shard-skl: [INCOMPLETE][73] ([fdo#104108]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-skl8/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-skl5/igt@[email protected]

* igt@perf@blocking:
- shard-skl: [FAIL][75] ([fdo#110728]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-skl4/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-skl6/igt@[email protected]

#### Warnings ####

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-blt:
- shard-skl: [FAIL][77] ([fdo#108040]) -> [FAIL][78] ([fdo#103167])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6504/shard-skl2/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/shard-skl4/igt@[email protected]

[fdo#102583]: https://bugs.freedesktop.org/show_bug.cgi?id=102583
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103355]: https://bugs.freedesktop.org/show_bug.cgi?id=103355
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105702]: https://bugs.freedesktop.org/show_bug.cgi?id=105702
[fdo#106509]: https://bugs.freedesktop.org/show_bug.cgi?id=106509
[fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
[fdo#107409]: https://bugs.freedesktop.org/show_bug.cgi?id=107409
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108040]: https://bugs.freedesktop.org/show_bug.cgi?id=108040
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108341]: https://bugs.freedesktop.org/show_bug.cgi?id=108341
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109495]: https://bugs.freedesktop.org/show_bug.cgi?id=109495
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912

Participating hosts (10 -> 10)
------------------------------

No changes in participating hosts

Build changes
-------------

* Linux: CI_DRM_6504 -> Patchwork_13691

CI_DRM_6504: a23df173f63ed05ae452ab478a01131a89938654 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5102: 6038ace76016d8892f4d13aef5301f71ca1a6e2d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13691: 96a1d990294f84e9e20e6d0d8d95cf7fcc2c7667 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13691/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#40 lore raw
In reply to Sam Ravnborg
Quoted 22 lines · Sam Ravnborg

First patch from Jani fixes so drm_print.h is self-contained. Next two patches are trivial removal of uapi dependencies.

ati_pcigart is fixed to drop use of drm_os_linux.h

drm_vblank is likewise fixed to drop use of drm_os_linux.h This was a non-trivial conversion, *review requested!*

The remaining patches are preparation for and removal of uapi/drm/drmh from drm_file.h.
There were a few files where we had to push include of drm/drm.h out to to have a clean build.

CK Hu - please let me apply the mediatek patch to drm-misc-next, as it is required for the final patch. Or push it to drm-misc-next yourself.

Sam

Jani Nikula (1):
drm/panel: make drm_panel.h self-contained

Quoted 11 lines

Sam Ravnborg (10):
drm: drop uapi dependency from drm_print.h
drm: drop uapi dependency from drm_vblank.h drm/ati_pcigart: drop dependency on drm_os_linux.h drm/vblank: drop use of DRM_WAIT_ON()
drm: direct include of drm.h in drm_gem.c
drm: direct include of drm.h in drm_gem_shmem_helper.c
drm: direct include of drm.h in drm_prime.c
drm: direct include of drm.h in drm_syncobj.c drm/mediatek: direct include of drm.h in mtk_drm_gem.c
drm: drop uapi dependency from drm_file.h

Added relevant acks and pushed following patches to drm-misc-next:
drm/panel: make drm_panel.h self-contained
drm: drop uapi dependency from drm_vblank.h drm/ati_pcigart: drop dependency on drm_os_linux.h
drm: direct include of drm.h in drm_gem.c
drm: direct include of drm.h in drm_gem_shmem_helper.c
drm: direct include of drm.h in drm_prime.c
drm: direct include of drm.h in drm_syncobj.c drm/mediatek: direct include of drm.h in mtk_drm_gem.c

Following patches was dropped:
drm: drop uapi dependency from drm_print.h
- There was not a clear consensus what to do here, and the patch broke one way to use the DRM_(PRINT) macros.
- I did not have the time/enegy to start a logging debate. There is too much that could be done and it is not the right time for me to look into the possibilities.

drm: drop uapi dependency from drm_file.h
- There were relevant push back from loosing the information that a uapi type was used to represent 'magic'

Following patch is worked on:
drm/vblank: drop use of DRM_WAIT_ON()
- Got excellent feedback from Michel Dänzer and Daniel Vetter.
- An updated version will be posted when I have tested it at my local setup

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