Skip to contentSkip to conversation

drm: drop uapi dependencies from include/drm

PATCH In review Sam Ravnborg 5 participants 9 messages Jun 22, 2019 – Jun 24, 2019

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

cover drm: drop uapi dependencies from include/drm

include/drm/* shall have no or at least minimal dependencies to include/uapi/drm/*.
Following two patches do a small effort to drop such dependencies.

After these patches there are two users
of uapi/drm/drm.h left in include/drm:

drm_file.h:
- needs drm_magic_t
drm_magic_t is a simple typedef, a simple unsigned int would do the trick

drm_legacy.h
- needs drm_map_type and drm_map_flags. Seems legit.

I did not spend time to analyze further dependencies.

Patches are build tested.

Sam

Sam Ravnborg (2):
drm: drop uapi dependency from drm_print.h
drm: drop uapi dependency from drm_vblank.h

 include/drm/drm_print.h  | 4 +---
 include/drm/drm_vblank.h | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

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

#1 lore raw

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

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

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

PATCH 2/2 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]>
---
 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

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

✓ Fi.CI.BAT: success for drm: drop uapi dependencies from include/drm

In reply to Sam Ravnborg
== Series Details ==

== Series Details ==

Series: drm: drop uapi dependencies from include/drm
URL : https://patchwork.freedesktop.org/series/62575/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6329 -> Patchwork_13399
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

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

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

### IGT changes ###

#### Issues hit ####

* igt@kms_chamelium@common-hpd-after-suspend:
- fi-skl-6700k2: [PASS][1] -> [INCOMPLETE][2] ([fdo#104108])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/fi-skl-6700k2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/fi-skl-6700k2/igt@[email protected]

#### Possible fixes ####

* igt@gem_mmap_gtt@basic-small-bo-tiledy:
- fi-ilk-650: [FAIL][3] ([fdo#108803]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/fi-ilk-650/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/fi-ilk-650/igt@[email protected]

* igt@i915_selftest@live_sanitycheck:
- fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/fi-icl-u3/igt@i915_selftest@live_sanitycheck.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/fi-icl-u3/igt@i915_selftest@live_sanitycheck.html

[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108803]: https://bugs.freedesktop.org/show_bug.cgi?id=108803

Participating hosts (51 -> 40)
------------------------------

Missing (11): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-kbl-8809g fi-icl-y fi-icl-dsi fi-bdw-samus

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

* Linux: CI_DRM_6329 -> Patchwork_13399

CI_DRM_6329: 7ff7b7a9d09acaa647921780fa5ed3525ab8f278 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5064: 22850c1906550fb97b405c019275dcfb34be8cf7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13399: c06b767d15a0f4f3f49ccb14cbb02cf6071b8832 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

c06b767d15a0 drm: drop uapi dependency from drm_vblank.h 2b279f563f9c drm: drop uapi dependency from drm_print.h

== Logs ==

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

#4 lore raw

✓ Fi.CI.IGT: success for drm: drop uapi dependencies from include/drm

In reply to Sam Ravnborg
== Series Details ==

== Series Details ==

Series: drm: drop uapi dependencies from include/drm
URL : https://patchwork.freedesktop.org/series/62575/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6329_full -> Patchwork_13399_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_eio@unwedge-stress:
- shard-snb: [PASS][1] -> [FAIL][2] ([fdo#109661])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-snb1/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-snb2/igt@[email protected]

* igt@gem_partial_pwrite_pread@writes-after-reads-snoop:
- shard-apl: [PASS][3] -> [DMESG-WARN][4] ([fdo#110913 ]) +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-apl7/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-apl6/igt@[email protected]

* igt@gem_persistent_relocs@forked-faulting-reloc-thrashing:
- shard-snb: [PASS][5] -> [DMESG-WARN][6] ([fdo#110789] / [fdo#110913 ]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-snb6/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-snb6/igt@[email protected]

* igt@gem_softpin@noreloc-s3:
- shard-skl: [PASS][7] -> [INCOMPLETE][8] ([fdo#104108] / [fdo#107773])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-skl2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-skl6/igt@[email protected]

* igt@gem_tiled_partial_pwrite_pread@writes-after-reads:
- shard-kbl: [PASS][9] -> [DMESG-WARN][10] ([fdo#110913 ]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-kbl7/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-kbl4/igt@[email protected]

* igt@i915_pm_rpm@gem-execbuf-stress:
- shard-iclb: [PASS][11] -> [INCOMPLETE][12] ([fdo#107713] / [fdo#108840])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-iclb7/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-iclb7/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-apl: [PASS][13] -> [DMESG-WARN][14] ([fdo#108566])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-apl2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-apl6/igt@[email protected]

* igt@kms_flip@2x-flip-vs-absolute-wf_vblank:
- shard-hsw: [PASS][15] -> [SKIP][16] ([fdo#109271]) +10 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-hsw4/igt@kms_flip@2x-flip-vs-absolute-wf_vblank.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-hsw1/igt@kms_flip@2x-flip-vs-absolute-wf_vblank.html

* igt@kms_flip@plain-flip-ts-check-interruptible:
- shard-glk: [PASS][17] -> [FAIL][18] ([fdo#100368])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-glk2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-glk8/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite:
- shard-iclb: [PASS][19] -> [FAIL][20] ([fdo#103167]) +5 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-iclb4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html

* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-render:
- shard-iclb: [PASS][21] -> [INCOMPLETE][22] ([fdo#106978] / [fdo#107713])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-iclb3/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-render.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-iclb7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-render.html

* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [PASS][23] -> [FAIL][24] ([fdo#108145])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-skl7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-skl5/igt@[email protected]

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

* igt@kms_rotation_crc@multiplane-rotation:
- shard-kbl: [PASS][27] -> [DMESG-FAIL][28] ([fdo#105763])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-kbl6/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-kbl3/igt@[email protected]

* igt@kms_setmode@basic:
- shard-hsw: [PASS][29] -> [FAIL][30] ([fdo#99912])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-hsw1/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-hsw1/igt@[email protected]

* igt@perf_pmu@rc6:
- shard-kbl: [PASS][31] -> [SKIP][32] ([fdo#109271])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-kbl3/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-kbl7/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s3:
- shard-skl: [INCOMPLETE][33] ([fdo#104108]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-skl7/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-skl5/igt@[email protected]

* igt@gem_partial_pwrite_pread@writes-after-reads-uncached:
- shard-kbl: [DMESG-WARN][35] ([fdo#110913 ]) -> [PASS][36] +3 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-kbl4/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-kbl1/igt@[email protected]

* igt@gem_persistent_relocs@forked-thrashing:
- shard-apl: [DMESG-WARN][37] ([fdo#110913 ]) -> [PASS][38] +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-apl8/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-apl3/igt@[email protected]

* igt@gem_softpin@evict-active-interruptible:
- shard-snb: [DMESG-WARN][39] ([fdo#110789] / [fdo#110913 ]) -> [PASS][40] +2 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-snb2/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-snb5/igt@[email protected]

* igt@gem_tiled_swapping@non-threaded:
- shard-hsw: [DMESG-WARN][41] ([fdo#108686]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-hsw1/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-hsw1/igt@[email protected]

* igt@i915_suspend@debugfs-reader:
- shard-apl: [DMESG-WARN][43] ([fdo#108566]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-apl7/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-apl2/igt@[email protected]

* igt@kms_flip@2x-wf_vblank-ts-check-interruptible:
- shard-hsw: [SKIP][45] ([fdo#109271]) -> [PASS][46] +5 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-hsw1/igt@kms_flip@2x-wf_vblank-ts-check-interruptible.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-hsw5/igt@kms_flip@2x-wf_vblank-ts-check-interruptible.html

* igt@kms_flip@flip-vs-expired-vblank:
- shard-glk: [FAIL][47] ([fdo#105363]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-glk9/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-glk9/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-badstride:
- shard-iclb: [FAIL][49] ([fdo#103167]) -> [PASS][50] +4 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-iclb8/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-iclb1/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-rte:
- shard-iclb: [FAIL][51] ([fdo#103167] / [fdo#110378]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-iclb4/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-iclb6/igt@[email protected]

* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [FAIL][53] ([fdo#103166]) -> [PASS][54] +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-iclb8/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-iclb5/igt@[email protected]

* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [SKIP][55] ([fdo#109441]) -> [PASS][56] +2 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-iclb7/igt@kms_psr@psr2_cursor_mmap_cpu.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html

* igt@kms_setmode@basic:
- shard-apl: [FAIL][57] ([fdo#99912]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-apl3/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-apl7/igt@[email protected]
- shard-kbl: [FAIL][59] ([fdo#99912]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-kbl7/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-kbl2/igt@[email protected]

* igt@prime_busy@hang-bsd:
- shard-glk: [INCOMPLETE][61] ([fdo#103359] / [k.org#198133]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6329/shard-glk2/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13399/shard-glk8/igt@[email protected]

[fdo#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
[fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773
[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#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
[fdo#110378]: https://bugs.freedesktop.org/show_bug.cgi?id=110378
[fdo#110789]: https://bugs.freedesktop.org/show_bug.cgi?id=110789
[fdo#110913 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110913
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133

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

No changes in participating hosts

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

* Linux: CI_DRM_6329 -> Patchwork_13399

CI_DRM_6329: 7ff7b7a9d09acaa647921780fa5ed3525ab8f278 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5064: 22850c1906550fb97b405c019275dcfb34be8cf7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13399: c06b767d15a0f4f3f49ccb14cbb02cf6071b8832 @ 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_13399/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw
In reply to Sam Ravnborg
Quoted 10 lines · Sam Ravnborg

include/drm/* shall have no or at least minimal dependencies to include/uapi/drm/*.
Following two patches do a small effort to drop such dependencies.

After these patches there are two users
of uapi/drm/drm.h left in include/drm:

drm_file.h:
- needs drm_magic_t
drm_magic_t is a simple typedef, a simple unsigned int would do the trick

I think we could switch over to unsigned int for this.

Quoted 2 lines

drm_legacy.h
- needs drm_map_type and drm_map_flags. Seems legit.

enum in uapi, sweet (never do this, it's not portable across compilers, #defines all the way). But yeah seems legit, plus we don't care about drm_legacy.h

Quoted 10 lines

I did not spend time to analyze further dependencies.

Patches are build tested.

Sam

Sam Ravnborg (2):
drm: drop uapi dependency from drm_print.h
drm: drop uapi dependency from drm_vblank.h

On both Reviewed-by: Daniel Vetter <[email protected]>

Quoted 6 lines
 include/drm/drm_print.h  | 4 +---
 include/drm/drm_vblank.h | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw
Quoted 5 lines · Daniel Vetter
Quoted 2 lines

drm_legacy.h
- needs drm_map_type and drm_map_flags. Seems legit.

enum in uapi, sweet (never do this, it's not portable across compilers, #defines all the way).

Don't look too closely then

$ git grep enum -- include/uapi/drm/ | wc -l
96

A handful of those are legacy stuff, yet quite a few are not :-\

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

#7 lore raw
Quoted 5 lines · Emil Velikov
Quoted 3 lines · Daniel Vetter
Quoted 2 lines

drm_legacy.h
- needs drm_map_type and drm_map_flags. Seems legit.

Quoted 8 lines
Quoted 2 lines

enum in uapi, sweet (never do this, it's not portable across compilers, #defines all the way).

Don't look too closely then

$ git grep enum -- include/uapi/drm/ | wc -l
96

A handful of those are legacy stuff, yet quite a few are not :-\

Enums are just fine for *values* as long as they're not used as types in struct members or function parameters or return types, right?

So we do have some we've screwed up, but it's not nearly as bad as the git grep above would lead you to believe.

The ones in question are used in struct drm_map which is used in DRM_IOCTL_GET_MAP, DRM_IOCTL_ADD_MAP, and DRM_IOCTL_RM_MAP.

BR,
Jani.

Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw
In reply to Daniel Vetter

Hi Daniel.

Quoted 5 lines
Quoted 3 lines

drm_file.h:
- needs drm_magic_t
drm_magic_t is a simple typedef, a simple unsigned int would do the trick

I think we could switch over to unsigned int for this.

OK, will send a v2 with this addressed.
There is some preparatory patches to fix build breakage when the include file is dropped.

Quoted 7 lines
Quoted 3 lines

drm_legacy.h
- needs drm_map_type and drm_map_flags. Seems legit.

enum in uapi, sweet (never do this, it's not portable across compilers, #defines all the way). But yeah seems legit, plus we don't care about drm_legacy.h

And this part I will happily ignore.
Maybe one day I will check what other dependencies there are. On a rainy day or when there are no more users of drmP.h or so.

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