drm: make headers self-contained and drop drmP.h
Subsystems (2)
v2 cover drm: make headers self-contained and drop drmP.h
While removing use of drmP.h from files in drm/* I noticed that I had to add the same include files due to dependencies in the header files.
It is better to let the header files be self-contained and let the users pull in only the additional headers files required. So I went ahead and made the relevant header files self-contained. (I did not check if this made any includes redundant in some files, I do not have tooling in place to do so).
Daniel suggested to add support for testing that they stay self contained.
Jani Nikula has sent a patch to kbuild to make this part of the kbuild machinery. I have used it locally and as soon as it lands in kbuild I will start using it for drm.
We could have duplicated the infrastructure now but that seemed too much code chrunch.
This patchset include the actual removal of drmP.h as one big patch. This is build tested on alpha (always interesting), arm, arm64, x86 etc.
For all files touched the following was done:
- include files divided up in blocks in following order:
linux/* video/* drm/* ""
- within each block the include files are sorted alphabetically
v2:
- use same ordering af blocks
- move includes down below license text
- added patch with actual drmP.h removal
- reworded some subjects to make them more descriptive
- fixed a few spelling erros in changelogs (but a few may remain)
Sam
Sam Ravnborg (7):
drm: make drm/drm_auth.h self contained
drm: make drm/drm_legacy.h self-contained
drm: make drm_crtc_internal.h self-contained
drm: make drm_internal.h self-contained
drm: make drm_legacy.h self-contained
drm: make drm_trace.h self-contained
drm: drop use of drmP.h in drm/*
drivers/gpu/drm/ati_pcigart.c | 5 ++++- drivers/gpu/drm/drm_agpsupport.c | 11 +++++++++-- drivers/gpu/drm/drm_atomic.c | 9 +++++++-- drivers/gpu/drm/drm_atomic_helper.c | 11 +++++++---- drivers/gpu/drm/drm_atomic_state_helper.c | 7 ++++--- drivers/gpu/drm/drm_auth.c | 10 ++++++++-- drivers/gpu/drm/drm_blend.c | 9 ++++++--- drivers/gpu/drm/drm_bufs.c | 21 ++++++++++++++++----- drivers/gpu/drm/drm_client.c | 2 +- drivers/gpu/drm/drm_color_mgmt.c | 8 ++++++-- drivers/gpu/drm/drm_context.c | 8 +++++++- drivers/gpu/drm/drm_crtc_helper.c | 14 ++++++++------ drivers/gpu/drm/drm_crtc_internal.h | 24 ++++++++++++++++++++---- drivers/gpu/drm/drm_debugfs.c | 13 ++++++++----- drivers/gpu/drm/drm_debugfs_crc.c | 9 ++++++++- drivers/gpu/drm/drm_dma.c | 6 +++++- drivers/gpu/drm/drm_drv.c | 9 ++++++--- drivers/gpu/drm/drm_dumb_buffers.c | 4 +++- drivers/gpu/drm/drm_encoder.c | 4 +++- drivers/gpu/drm/drm_fb_helper.c | 19 ++++++++++++------- drivers/gpu/drm/drm_file.c | 11 +++++++---- drivers/gpu/drm/drm_flip_work.c | 6 ++++-- drivers/gpu/drm/drm_fourcc.c | 2 +- drivers/gpu/drm/drm_framebuffer.c | 13 +++++++++---- drivers/gpu/drm/drm_gem.c | 8 ++++++-- drivers/gpu/drm/drm_gem_cma_helper.c | 11 ++++++----- drivers/gpu/drm/drm_gem_framebuffer_helper.c | 1 - drivers/gpu/drm/drm_hashtab.c | 10 +++++++--- drivers/gpu/drm/drm_internal.h | 10 +++++++++- drivers/gpu/drm/drm_ioc32.c | 9 ++++++--- drivers/gpu/drm/drm_ioctl.c | 22 ++++++++++++++-------- drivers/gpu/drm/drm_irq.c | 13 +++++++++---- drivers/gpu/drm/drm_kms_helper_common.c | 3 ++- drivers/gpu/drm/drm_lease.c | 15 ++++++++++----- drivers/gpu/drm/drm_legacy.h | 4 ++++ drivers/gpu/drm/drm_legacy_misc.c | 7 ++++++- drivers/gpu/drm/drm_lock.c | 8 ++++++-- drivers/gpu/drm/drm_memory.c | 9 +++++++-- drivers/gpu/drm/drm_mm.c | 9 +++++---- drivers/gpu/drm/drm_mode_config.c | 6 +++++- drivers/gpu/drm/drm_mode_object.c | 9 +++++++-- drivers/gpu/drm/drm_modes.c | 7 +++++-- drivers/gpu/drm/drm_modeset_lock.c | 2 +- drivers/gpu/drm/drm_of.c | 5 +++-- drivers/gpu/drm/drm_pci.c | 11 ++++++++--- drivers/gpu/drm/drm_plane_helper.c | 9 +++++---- drivers/gpu/drm/drm_prime.c | 7 +++++-- drivers/gpu/drm/drm_print.c | 7 ++++++- drivers/gpu/drm/drm_probe_helper.c | 7 ++++--- drivers/gpu/drm/drm_property.c | 7 ++++++- drivers/gpu/drm/drm_rect.c | 4 +++- drivers/gpu/drm/drm_scatter.c | 9 +++++++-- drivers/gpu/drm/drm_scdc_helper.c | 2 +- drivers/gpu/drm/drm_simple_kms_helper.c | 5 +++-- drivers/gpu/drm/drm_syncobj.c | 13 +++++++++---- drivers/gpu/drm/drm_sysfs.c | 15 +++++++++++---- drivers/gpu/drm/drm_trace.h | 2 ++ drivers/gpu/drm/drm_trace_points.c | 3 ++- drivers/gpu/drm/drm_vblank.c | 12 +++++++++--- drivers/gpu/drm/drm_vm.c | 14 +++++++++++++- drivers/gpu/drm/drm_vma_manager.c | 6 +++--- drivers/gpu/drm/drm_vram_mm_helper.c | 4 +++- drivers/gpu/drm/drm_writeback.c | 6 ++++-- include/drm/drm_auth.h | 11 +++++++++-- include/drm/drm_legacy.h | 12 ++++++------ 65 files changed, 406 insertions(+), 163 deletions(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/7 drm: make drm/drm_auth.h self contained
Do not require users of include/drm/drm_auth.h to include other files just to let it build.
--- include/drm/drm_auth.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
include/drm/drm_auth.h +9 -2
@@ -1,3 +1,6 @@ +#ifndef _DRM_AUTH_H_ +#define _DRM_AUTH_H_ +/* * Internal Header for the Direct Rendering Manager *
@@ -25,8 +28,12 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef _DRM_AUTH_H_ -#define _DRM_AUTH_H_ +#include <linux/idr.h> +#include <linux/kref.h> +#include <linux/wait.h> + +struct drm_file ; +struct drm_hw_lock ;/* * Legacy DRI1 locking data structure. Only here instead of in drm_legacy.h for
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/7] drm: make drm/drm_auth.h self contained
Quoted 18 lines · Sam Ravnborg
Do not require users of
include/drm/drm_auth.hto include other files just to let it build.Signed-off-by Sam Ravnborg <[email protected]>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_auth.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)include/drm/drm_auth.h +0
-0
include/drm/drm_auth.h line 3
Quoted 3 lines
include/drm/drm_auth.h +3
-0@@ -1,3 +1,6 @@ +#ifndef _DRM_AUTH_H_ +#define _DRM_AUTH_H_ +
It's a bit of a bikeshed and this got applied already, but I think the copyright/license comment should be the first thing in any file, and the ifdefs should come after that. Using SPDX headers mandate this anyway.
BR,
Jani.
Quoted 18 lines
include/drm/drm_auth.h +6
-2/* * Internal Header for the Direct Rendering Manager * @@ -25,8 +28,12 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef _DRM_AUTH_H_ -#define _DRM_AUTH_H_ +#include <linux/idr.h> +#include <linux/kref.h> +#include <linux/wait.h> + +struct drm_file ; +struct drm_hw_lock ;/* * Legacy DRI1 locking data structure. Only here instead of in drm_legacy.h for
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/7] drm: make drm/drm_auth.h self contained
Hi Jani.
Quoted 14 lines · Jani Nikula
Quoted 13 lines · Sam Ravnborg
Do not require users of
include/drm/drm_auth.hto include other files just to let it build.Signed-off-by Sam Ravnborg <[email protected]>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_auth.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
Quoted 12 lines
include/drm/drm_auth.h line 3
Quoted 8 lines
include/drm/drm_auth.h +3
-0@@ -1,3 +1,6 @@ +#ifndef _DRM_AUTH_H_ +#define _DRM_AUTH_H_ +It's a bit of a bikeshed and this got applied already, but I think the copyright/license comment should be the first thing in any file, and the ifdefs should come after that. Using SPDX headers mandate this anyway.
I was inspired by other files when I did this change. But you are right, this was a bad change.
For future changes I will keep this in mind.
Sam
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/7 drm: make drm/drm_legacy.h self-contained
In reply to Sam RavnborgDo not require users of include/drm/drm_legacy.h to include other files just to let it build.
--- include/drm/drm_legacy.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
include/drm/drm_legacy.h +6 -6
@@ -1,11 +1,5 @@#ifndef __DRM_DRM_LEGACY_H__#define __DRM_DRM_LEGACY_H__ - -#include <drm/drm_auth.h> -#include <drm/drm_hashtab.h> - -struct drm_device ; -/* * Legacy driver interfaces for the Direct Rendering Manager *
@@ -39,6 +33,12 @@ struct drm_device;* OTHER DEALINGS IN THE SOFTWARE. */ +#include <drm/drm.h> +#include <drm/drm_auth.h> +#include <drm/drm_hashtab.h> + +struct drm_device ; +struct file ;/* * Legacy Support for palateontologic DRM drivers
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 3/7 drm: make drm_crtc_internal.h self-contained
In reply to Sam RavnborgDo not require users of drm_crtc_internal.h to include other files just to let it build
--- drivers/gpu/drm/drm_crtc_internal.h | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_crtc_internal.h +20 -4
@@ -31,14 +31,30 @@* and are not exported to drivers. */ -enum drm_mode_status ; +#include <linux/types.h> + +enum drm_color_encoding ; +enum drm_color_range ;enum drm_connector_force ; +enum drm_mode_status ; -struct drm_display_mode ; -struct work_struct ; -struct drm_connector ; +struct drm_atomic_state ;struct drm_bridge ; +struct drm_connector ; +struct drm_crtc ; +struct drm_device ; +struct drm_display_mode ; +struct drm_file ; +struct drm_framebuffer ; +struct drm_mode_create_dumb ; +struct drm_mode_fb_cmd2 ; +struct drm_mode_fb_cmd ; +struct drm_mode_object ; +struct drm_plane ; +struct drm_property ;struct edid ; +struct kref ; +struct work_struct ;/* drm_crtc.c */ int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 4/7 drm: make drm_internal.h self-contained
In reply to Sam RavnborgDo not require users of drm_internal.h to include other files just to let it build
--- drivers/gpu/drm/drm_internal.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_internal.h +9 -1
@@ -28,8 +28,16 @@#define DRM_IF_VERSION (maj, min) (maj << 16 | min) -struct drm_prime_file_private ; +struct dentry ;struct dma_buf ; +struct drm_connector ; +struct drm_crtc ; +struct drm_framebuffer ; +struct drm_gem_object ; +struct drm_master ; +struct drm_minor ; +struct drm_prime_file_private ; +struct drm_printer ;/* drm_file.c */ extern struct mutex drm_global_mutex;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 5/7 drm: make drm_legacy.h self-contained
In reply to Sam RavnborgDo not require users of drm_legacy.h to include other files just to let it build
--- drivers/gpu/drm/drm_legacy.h | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/drm_legacy.h +4 -0
@@ -29,11 +29,15 @@* drivers use them, and removing them are API breaks. */ #include <linux/list.h> + +#include <drm/drm.h> +#include <drm/drm_device.h> #include <drm/drm_legacy.h> struct agp_memory ;struct drm_device ;struct drm_file ; +struct drm_buf_desc ;/* * Generic DRM Contexts
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/7 drm: make drm_trace.h self-contained
In reply to Sam RavnborgDo not require users of drm_trace.h to include other files just to let it build
--- drivers/gpu/drm/drm_trace.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/drm_trace.h +2 -0
@@ -6,6 +6,8 @@#include <linux/types.h> #include <linux/tracepoint.h> +struct drm_file ; +#undef TRACE_SYSTEM#define TRACE_SYSTEM drm#define TRACE_INCLUDE_FILE drm_trace
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/7 drm: drop use of drmP.h in drm/*
In reply to Sam RavnborgThe use of the drmP.h header file is deprecated. Remove use from all files in drm/*
so people do not look there and follow a bad example.
Build tested allyesconfig,allmodconfig on x86, arm etc. Including alpha that is as always more challenging than the rest.
--- drivers/gpu/drm/ati_pcigart.c | 5 ++++- drivers/gpu/drm/drm_agpsupport.c | 11 ++++++++-- drivers/gpu/drm/drm_atomic.c | 9 ++++++-- drivers/gpu/drm/drm_atomic_helper.c | 11 ++++++---- drivers/gpu/drm/drm_atomic_state_helper.c | 7 ++++--- drivers/gpu/drm/drm_auth.c | 10 +++++++-- drivers/gpu/drm/drm_blend.c | 9 +++++--- drivers/gpu/drm/drm_bufs.c | 21 ++++++++++++++----- drivers/gpu/drm/drm_client.c | 2 +- drivers/gpu/drm/drm_color_mgmt.c | 8 +++++-- drivers/gpu/drm/drm_context.c | 8 ++++++- drivers/gpu/drm/drm_crtc_helper.c | 14 +++++++------ drivers/gpu/drm/drm_debugfs.c | 13 +++++++----- drivers/gpu/drm/drm_debugfs_crc.c | 9 +++++++- drivers/gpu/drm/drm_dma.c | 6 +++++- drivers/gpu/drm/drm_drv.c | 9 +++++--- drivers/gpu/drm/drm_dumb_buffers.c | 4 +++- drivers/gpu/drm/drm_encoder.c | 4 +++- drivers/gpu/drm/drm_fb_helper.c | 19 ++++++++++------- drivers/gpu/drm/drm_file.c | 11 ++++++---- drivers/gpu/drm/drm_flip_work.c | 6 ++++-- drivers/gpu/drm/drm_fourcc.c | 2 +- drivers/gpu/drm/drm_framebuffer.c | 13 ++++++++---- drivers/gpu/drm/drm_gem.c | 8 +++++-- drivers/gpu/drm/drm_gem_cma_helper.c | 11 +++++----- drivers/gpu/drm/drm_gem_framebuffer_helper.c | 1 - drivers/gpu/drm/drm_hashtab.c | 10 ++++++--- drivers/gpu/drm/drm_ioc32.c | 9 +++++--- drivers/gpu/drm/drm_ioctl.c | 22 +++++++++++++------- drivers/gpu/drm/drm_irq.c | 13 ++++++++---- drivers/gpu/drm/drm_kms_helper_common.c | 3 ++- drivers/gpu/drm/drm_lease.c | 15 ++++++++----- drivers/gpu/drm/drm_legacy_misc.c | 7 ++++++- drivers/gpu/drm/drm_lock.c | 8 +++++-- drivers/gpu/drm/drm_memory.c | 9 ++++++-- drivers/gpu/drm/drm_mm.c | 9 ++++---- drivers/gpu/drm/drm_mode_config.c | 6 +++++- drivers/gpu/drm/drm_mode_object.c | 9 ++++++-- drivers/gpu/drm/drm_modes.c | 7 +++++-- drivers/gpu/drm/drm_modeset_lock.c | 2 +- drivers/gpu/drm/drm_of.c | 5 +++-- drivers/gpu/drm/drm_pci.c | 11 +++++++--- drivers/gpu/drm/drm_plane_helper.c | 9 ++++---- drivers/gpu/drm/drm_prime.c | 7 +++++-- drivers/gpu/drm/drm_print.c | 7 ++++++- drivers/gpu/drm/drm_probe_helper.c | 7 ++++--- drivers/gpu/drm/drm_property.c | 7 ++++++- drivers/gpu/drm/drm_rect.c | 4 +++- drivers/gpu/drm/drm_scatter.c | 9 ++++++-- drivers/gpu/drm/drm_scdc_helper.c | 2 +- drivers/gpu/drm/drm_simple_kms_helper.c | 5 +++-- drivers/gpu/drm/drm_syncobj.c | 13 ++++++++---- drivers/gpu/drm/drm_sysfs.c | 15 +++++++++---- drivers/gpu/drm/drm_trace_points.c | 3 ++- drivers/gpu/drm/drm_vblank.c | 12 ++++++++--- drivers/gpu/drm/drm_vm.c | 14 ++++++++++++- drivers/gpu/drm/drm_vma_manager.c | 6 +++--- drivers/gpu/drm/drm_vram_mm_helper.c | 4 +++- drivers/gpu/drm/drm_writeback.c | 6 ++++-- 59 files changed, 356 insertions(+), 150 deletions(-)
drivers/gpu/drm/ati_pcigart.c +4 -1
@@ -32,9 +32,12 @@*/ #include <linux/export.h> -#include <drm/drmP.h> #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> # define ATI_PCIGART_PAGE_SIZE 4096/**< PCI GART page size */
drivers/gpu/drm/drm_agpsupport.c +9 -2
@@ -31,13 +31,20 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#include <drm/drmP.h> #include <linux/module.h> +#include <linux/pci.h> #include <linux/slab.h> -#include "drm_legacy.h" #include <asm/agp.h> +#include <drm/drm_agpsupport.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_print.h> + +#include "drm_legacy.h" +/** * Get AGP information. *
drivers/gpu/drm/drm_atomic.c +7 -2
@@ -26,13 +26,18 @@*/ -#include <drm/drmP.h> +#include <linux/sync_file.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_uapi.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_fourcc.h> #include <drm/drm_mode.h> #include <drm/drm_print.h> #include <drm/drm_writeback.h> -#include <linux/sync_file.h> #include "drm_crtc_internal.h" #include "drm_internal.h"
drivers/gpu/drm/drm_atomic_helper.c +7 -4
@@ -25,14 +25,17 @@* Daniel Vetter <[email protected]> */ -#include <drm/drmP.h> +#include <linux/dma-fence.h> +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_uapi.h> +#include <drm/drm_damage_helper.h> +#include <drm/drm_device.h> #include <drm/drm_plane_helper.h> -#include <drm/drm_atomic_helper.h> +#include <drm/drm_print.h> +#include <drm/drm_vblank.h> #include <drm/drm_writeback.h> -#include <drm/drm_damage_helper.h> -#include <linux/dma-fence.h> #include "drm_crtc_helper_internal.h" #include "drm_crtc_internal.h"
drivers/gpu/drm/drm_atomic_state_helper.c +4 -3
@@ -24,12 +24,13 @@* Daniel Vetter <[email protected]> */ +#include <drm/drm_atomic.h> #include <drm/drm_atomic_state_helper.h> -#include <drm/drm_crtc.h> -#include <drm/drm_plane.h> #include <drm/drm_connector.h> -#include <drm/drm_atomic.h> +#include <drm/drm_crtc.h> #include <drm/drm_device.h> +#include <drm/drm_plane.h> +#include <drm/drm_print.h> #include <drm/drm_writeback.h> #include <linux/slab.h>
drivers/gpu/drm/drm_auth.c +8 -2
@@ -28,10 +28,16 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#include <drm/drmP.h> +#include <linux/slab.h> + +#include <drm/drm_auth.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_lease.h> +#include <drm/drm_print.h> +#include "drm_internal.h" #include "drm_legacy.h" -#include <drm/drm_lease.h> /** * DOC: master and authentication
drivers/gpu/drm/drm_blend.c +6 -3
@@ -23,13 +23,16 @@* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -#include <drm/drmP.h> -#include <drm/drm_atomic.h> -#include <drm/drm_blend.h> +#include <linux/export.h> #include <linux/slab.h> #include <linux/sort.h> +#include <drm/drm_atomic.h> +#include <drm/drm_blend.h> +#include <drm/drm_device.h> +#include <drm/drm_print.h> +#include "drm_crtc_internal.h" /**
drivers/gpu/drm/drm_bufs.c +16 -5
@@ -28,15 +28,26 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#include <linux/vmalloc.h> -#include <linux/slab.h> -#include <linux/log2.h> #include <linux/export.h> +#include <linux/log2.h> +#include <linux/mm.h> +#include <linux/mman.h> +#include <linux/nospec.h> +#include <linux/slab.h> +#include <linux/uaccess.h> +#include <linux/vmalloc.h> +#include <asm/shmparam.h> -#include <drm/drmP.h> + +#include <drm/drm_agpsupport.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_pci.h> +#include <drm/drm_print.h> +#include "drm_legacy.h" -#include <linux/nospec.h> static struct drm_map_list *drm_find_matching_map (struct drm_device *dev,struct drm_local_map *map)
drivers/gpu/drm/drm_client.c +1 -1
@@ -15,10 +15,10 @@#include <drm/drm_drv.h> #include <drm/drm_file.h> #include <drm/drm_fourcc.h> +#include <drm/drm_framebuffer.h> #include <drm/drm_gem.h> #include <drm/drm_mode.h> #include <drm/drm_print.h> -#include <drm/drmP.h> #include "drm_crtc_internal.h" #include "drm_internal.h"
drivers/gpu/drm/drm_color_mgmt.c +6 -2
@@ -20,9 +20,13 @@* OF THIS SOFTWARE. */ -#include <drm/drmP.h> -#include <drm/drm_crtc.h> +#include <linux/uaccess.h> +#include <drm/drm_color_mgmt.h> +#include <drm/drm_crtc.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_print.h> #include "drm_crtc_internal.h"
drivers/gpu/drm/drm_context.c +7 -1
@@ -28,7 +28,13 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#include <drm/drmP.h> +#include <linux/slab.h> +#include <linux/uaccess.h> + +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_print.h> +#include "drm_legacy.h" struct drm_ctx_list {
drivers/gpu/drm/drm_crtc_helper.c +8 -6
@@ -29,21 +29,23 @@* Jesse Barnes <[email protected]> */ -#include <linux/kernel.h> #include <linux/export.h> +#include <linux/kernel.h> #include <linux/moduleparam.h> -#include <drm/drmP.h> #include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_uapi.h> #include <drm/drm_crtc.h> -#include <drm/drm_encoder.h> -#include <drm/drm_fourcc.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_edid.h> +#include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_edid.h> +#include <drm/drm_print.h> +#include <drm/drm_vblank.h> /** * DOC: overview
drivers/gpu/drm/drm_debugfs.c +8 -5
@@ -24,20 +24,23 @@*/ #include <linux/debugfs.h> +#include <linux/export.h> #include <linux/seq_file.h> #include <linux/slab.h> -#include <linux/export.h> +#include <linux/uaccess.h> +#include <drm/drm_atomic.h> +#include <drm/drm_auth.h> #include <drm/drm_client.h> #include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> #include <drm/drm_edid.h> -#include <drm/drm_atomic.h> -#include <drm/drm_auth.h> +#include <drm/drm_file.h> #include <drm/drm_gem.h> -#include <drm/drmP.h> -#include "drm_internal.h" #include "drm_crtc_internal.h" +#include "drm_internal.h" #if defined(CONFIG_DEBUG_FS )
drivers/gpu/drm/drm_debugfs_crc.c +8 -1
@@ -29,7 +29,14 @@#include <linux/circ_buf.h> #include <linux/ctype.h> #include <linux/debugfs.h> -#include <drm/drmP.h> +#include <linux/poll.h> +#include <linux/uaccess.h> + +#include <drm/drm_crtc.h> +#include <drm/drm_debugfs_crc.h> +#include <drm/drm_drv.h> +#include <drm/drm_print.h> +#include "drm_internal.h" /**
drivers/gpu/drm/drm_dma.c +5 -1
@@ -34,7 +34,11 @@*/ #include <linux/export.h> -#include <drm/drmP.h> + +#include <drm/drm_drv.h> +#include <drm/drm_pci.h> +#include <drm/drm_print.h> +#include "drm_legacy.h" /**
drivers/gpu/drm/drm_drv.c +6 -3
@@ -35,16 +35,19 @@#include <linux/srcu.h> #include <drm/drm_client.h> +#include <drm/drm_color_mgmt.h> #include <drm/drm_drv.h> -#include <drm/drmP.h> +#include <drm/drm_file.h> +#include <drm/drm_mode_object.h> +#include <drm/drm_print.h> #include "drm_crtc_internal.h" -#include "drm_legacy.h" #include "drm_internal.h" +#include "drm_legacy.h" /* * drm_debug: Enable debug output. -* Bitmask of DRM_UT_x. See include/drm/drmP.h for details. +* Bitmask of DRM_UT_x. See include/drm/drm_print.h for details. */ unsigned int drm_debug =0 ;EXPORT_SYMBOL (drm_debug);
drivers/gpu/drm/drm_dumb_buffers.c +3 -1
@@ -23,8 +23,10 @@* OF THIS SOFTWARE. */ -#include <drm/drmP.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> #include <drm/drm_gem.h> +#include <drm/drm_mode.h> #include "drm_crtc_internal.h"
drivers/gpu/drm/drm_encoder.c +3 -1
@@ -21,7 +21,9 @@*/ #include <linux/export.h> -#include <drm/drmP.h> + +#include <drm/drm_device.h> +#include <drm/drm_drv.h> #include <drm/drm_encoder.h> #include "drm_crtc_internal.h"
drivers/gpu/drm/drm_fb_helper.c +12 -7
@@ -32,18 +32,23 @@#include <linux/console.h> #include <linux/dma-buf.h> #include <linux/kernel.h> -#include <linux/sysrq.h> -#include <linux/slab.h> #include <linux/module.h> -#include <drm/drmP.h> -#include <drm/drm_crtc.h> -#include <drm/drm_fb_helper.h> -#include <drm/drm_crtc_helper.h> +#include <linux/slab.h> +#include <linux/sysrq.h> +#include <linux/vmalloc.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_print.h> +#include <drm/drm_vblank.h> -#include "drm_crtc_internal.h" #include "drm_crtc_helper_internal.h" +#include "drm_crtc_internal.h" #include "drm_internal.h" static bool drm_fbdev_emulation = true;
drivers/gpu/drm/drm_file.c +7 -4
@@ -31,17 +31,20 @@* OTHER DEALINGS IN THE SOFTWARE. */ +#include <linux/dma-fence.h> +#include <linux/module.h> +#include <linux/pci.h> #include <linux/poll.h> #include <linux/slab.h> -#include <linux/module.h> #include <drm/drm_client.h> +#include <drm/drm_drv.h> #include <drm/drm_file.h> -#include <drm/drmP.h> +#include <drm/drm_print.h> -#include "drm_legacy.h" -#include "drm_internal.h" #include "drm_crtc_internal.h" +#include "drm_internal.h" +#include "drm_legacy.h" /* from BKL pushdown */ DEFINE_MUTEX (drm_global_mutex);
drivers/gpu/drm/drm_flip_work.c +4 -2
@@ -21,9 +21,11 @@* SOFTWARE. */ -#include <drm/drmP.h> -#include <drm/drm_util.h> +#include <linux/slab.h> +#include <drm/drm_flip_work.h> +#include <drm/drm_print.h> +#include <drm/drm_util.h> /** * drm_flip_work_allocate_task - allocate a flip-work task
drivers/gpu/drm/drm_fourcc.c +1 -1
@@ -27,7 +27,7 @@#include <linux/export.h> #include <linux/kernel.h> -#include <drm/drmP.h> +#include <drm/drm_device.h> #include <drm/drm_fourcc.h> static char printable_char (int c)
drivers/gpu/drm/drm_framebuffer.c +9 -4
@@ -21,16 +21,21 @@*/ #include <linux/export.h> -#include <drm/drmP.h> -#include <drm/drm_auth.h> -#include <drm/drm_framebuffer.h> +#include <linux/uaccess.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_uapi.h> +#include <drm/drm_auth.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_framebuffer.h> #include <drm/drm_print.h> #include <drm/drm_util.h> -#include "drm_internal.h" #include "drm_crtc_internal.h" +#include "drm_internal.h" /** * DOC: overview
drivers/gpu/drm/drm_gem.c +6 -2
@@ -38,10 +38,14 @@#include <linux/dma-buf.h> #include <linux/mem_encrypt.h> #include <linux/pagevec.h> -#include <drm/drmP.h> -#include <drm/drm_vma_manager.h> + +#include <drm/drm_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> #include <drm/drm_gem.h> #include <drm/drm_print.h> +#include <drm/drm_vma_manager.h> +#include "drm_internal.h" /** @file drm_gem.c
drivers/gpu/drm/drm_gem_cma_helper.c +6 -5
@@ -17,15 +17,16 @@* GNU General Public License for more details. */ -#include <linux/mm.h> -#include <linux/slab.h> -#include <linux/mutex.h> -#include <linux/export.h> #include <linux/dma-buf.h> #include <linux/dma-mapping.h> +#include <linux/export.h> +#include <linux/mm.h> +#include <linux/mutex.h> +#include <linux/slab.h> -#include <drm/drmP.h> #include <drm/drm.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_vma_manager.h>
drivers/gpu/drm/drm_gem_framebuffer_helper.c +0 -1
@@ -14,7 +14,6 @@#include <linux/reservation.h> #include <linux/slab.h> -#include <drm/drmP.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_uapi.h> #include <drm/drm_damage_helper.h>
drivers/gpu/drm/drm_hashtab.c +7 -3
@@ -32,11 +32,15 @@* Thomas Hellström <thomas-at-tungstengraphics-dot-com> */ -#include <drm/drmP.h> -#include <drm/drm_hashtab.h> +#include <linux/export.h> #include <linux/hash.h> +#include <linux/mm.h> +#include <linux/rculist.h> #include <linux/slab.h> -#include <linux/export.h> +#include <linux/vmalloc.h> + +#include <drm/drm_hashtab.h> +#include <drm/drm_print.h> int drm_ht_create (struct drm_open_hash *ht,unsigned int order) {
drivers/gpu/drm/drm_ioc32.c +6 -3
@@ -31,10 +31,13 @@#include <linux/ratelimit.h> #include <linux/export.h> -#include <drm/drmP.h> -#include "drm_legacy.h" -#include "drm_internal.h" +#include <drm/drm_agpsupport.h> +#include <drm/drm_file.h> +#include <drm/drm_print.h> +#include "drm_crtc_internal.h" +#include "drm_internal.h" +#include "drm_legacy.h" #define DRM_IOCTL_VERSION32 DRM_IOWR(0x00, drm_version32_t)#define DRM_IOCTL_GET_UNIQUE32 DRM_IOWR(0x01, drm_unique32_t)
drivers/gpu/drm/drm_ioctl.c +14 -8
@@ -28,16 +28,22 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#include <drm/drm_ioctl.h> -#include <drm/drmP.h> -#include <drm/drm_auth.h> -#include "drm_legacy.h" -#include "drm_internal.h" -#include "drm_crtc_internal.h" - -#include <linux/pci.h> #include <linux/export.h> #include <linux/nospec.h> +#include <linux/pci.h> +#include <linux/uaccess.h> + +#include <drm/drm_agpsupport.h> +#include <drm/drm_auth.h> +#include <drm/drm_crtc.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_ioctl.h> +#include <drm/drm_print.h> + +#include "drm_crtc_internal.h" +#include "drm_internal.h" +#include "drm_legacy.h" /** * DOC: getunique and setversion story
drivers/gpu/drm/drm_irq.c +9 -4
@@ -51,13 +51,18 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#include <drm/drm_irq.h> -#include <drm/drmP.h> +#include <linux/export.h> #include <linux/interrupt.h> /* For task queue support */ - +#include <linux/pci.h> #include <linux/vgaarb.h> -#include <linux/export.h> + +#include <drm/drm.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_irq.h> +#include <drm/drm_print.h> +#include <drm/drm_vblank.h> #include "drm_internal.h"
drivers/gpu/drm/drm_kms_helper_common.c +2 -1
@@ -26,7 +26,8 @@*/ #include <linux/module.h> -#include <drm/drmP.h> + +#include <drm/drm_print.h> #include "drm_crtc_helper_internal.h"
drivers/gpu/drm/drm_lease.c +10 -5
@@ -11,14 +11,19 @@* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. */ +#include <linux/file.h> +#include <linux/uaccess.h> -#include <drm/drmP.h> -#include "drm_internal.h" -#include "drm_legacy.h" -#include "drm_crtc_internal.h" -#include <drm/drm_lease.h> #include <drm/drm_auth.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_lease.h> +#include <drm/drm_print.h> + +#include "drm_crtc_internal.h" +#include "drm_internal.h" +#include "drm_legacy.h" #define drm_for_each_lessee (lessee, lessor) \ list_for_each_entry((lessee), &(lessor)->lessees, lessee_list)
drivers/gpu/drm/drm_legacy_misc.c +6 -1
@@ -33,7 +33,12 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#include <drm/drmP.h> +#include <drm/drm_agpsupport.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_irq.h> +#include <drm/drm_print.h> +#include "drm_internal.h" #include "drm_legacy.h"
drivers/gpu/drm/drm_lock.c +6 -2
@@ -36,9 +36,13 @@#include <linux/export.h> #include <linux/sched/signal.h> -#include <drm/drmP.h> -#include "drm_legacy.h" +#include <drm/drm.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_print.h> +#include "drm_internal.h" +#include "drm_legacy.h" static int drm_lock_take (struct drm_lock_data *lock_data,unsigned int context);
drivers/gpu/drm/drm_memory.c +7 -2
@@ -33,10 +33,15 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#include <linux/highmem.h> #include <linux/export.h> +#include <linux/highmem.h> +#include <linux/pci.h> +#include <linux/vmalloc.h> #include <xen/xen.h> -#include <drm/drmP.h> + +#include <drm/drm_agpsupport.h> +#include <drm/drm_device.h> +#include "drm_legacy.h" #if IS_ENABLED (CONFIG_AGP )
drivers/gpu/drm/drm_mm.c +5 -4
@@ -42,12 +42,13 @@* Thomas Hellström <thomas-at-tungstengraphics-dot-com> */ -#include <drm/drmP.h> -#include <drm/drm_mm.h> -#include <linux/slab.h> -#include <linux/seq_file.h> #include <linux/export.h> #include <linux/interval_tree_generic.h> +#include <linux/seq_file.h> +#include <linux/slab.h> +#include <linux/stacktrace.h> + +#include <drm/drm_mm.h> /** * DOC: Overview
drivers/gpu/drm/drm_mode_config.c +5 -1
@@ -20,9 +20,13 @@* OF THIS SOFTWARE. */ +#include <linux/uaccess.h> + +#include <drm/drm_drv.h> #include <drm/drm_encoder.h> +#include <drm/drm_file.h> #include <drm/drm_mode_config.h> -#include <drm/drmP.h> +#include <drm/drm_print.h> #include "drm_crtc_internal.h" #include "drm_internal.h"
drivers/gpu/drm/drm_mode_object.c +7 -2
@@ -21,9 +21,14 @@*/ #include <linux/export.h> -#include <drm/drmP.h> -#include <drm/drm_mode_object.h> +#include <linux/uaccess.h> +#include <drm/drm_atomic.h> +#include <drm/drm_drv.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> +#include <drm/drm_mode_object.h> +#include <drm/drm_print.h> #include "drm_crtc_internal.h"
drivers/gpu/drm/drm_modes.c +5 -2
@@ -33,11 +33,14 @@#include <linux/list.h> #include <linux/list_sort.h> #include <linux/export.h> -#include <drm/drmP.h> -#include <drm/drm_crtc.h> +#include <video/of_videomode.h> #include <video/videomode.h> + +#include <drm/drm_crtc.h> +#include <drm/drm_device.h> #include <drm/drm_modes.h> +#include <drm/drm_print.h> #include "drm_crtc_internal.h"
drivers/gpu/drm/drm_modeset_lock.c +1 -1
@@ -21,9 +21,9 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#include <drm/drmP.h> #include <drm/drm_atomic.h> #include <drm/drm_crtc.h> +#include <drm/drm_device.h> #include <drm/drm_modeset_lock.h> /**
drivers/gpu/drm/drm_of.c +3 -2
@@ -2,12 +2,13 @@#include <linux/export.h> #include <linux/list.h> #include <linux/of_graph.h> -#include <drm/drmP.h> +#include <drm/drm_bridge.h> #include <drm/drm_crtc.h> +#include <drm/drm_device.h> #include <drm/drm_encoder.h> -#include <drm/drm_panel.h> #include <drm/drm_of.h> +#include <drm/drm_panel.h> /** * DOC: overview
drivers/gpu/drm/drm_pci.c +8 -3
@@ -22,12 +22,17 @@* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <linux/pci.h> -#include <linux/slab.h> #include <linux/dma-mapping.h> #include <linux/export.h> +#include <linux/pci.h> +#include <linux/slab.h> + +#include <drm/drm.h> +#include <drm/drm_agpsupport.h> +#include <drm/drm_drv.h> #include <drm/drm_pci.h> -#include <drm/drmP.h> +#include <drm/drm_print.h> +#include "drm_internal.h" #include "drm_legacy.h"
drivers/gpu/drm/drm_plane_helper.c +5 -4
@@ -24,14 +24,15 @@*/ #include <linux/list.h> -#include <drm/drmP.h> -#include <drm/drm_plane_helper.h> -#include <drm/drm_rect.h> +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_uapi.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_device.h> #include <drm/drm_encoder.h> -#include <drm/drm_atomic_helper.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_rect.h> #define SUBPIXEL_MASK 0xffff
drivers/gpu/drm/drm_prime.c +5 -2
@@ -29,9 +29,12 @@#include <linux/export.h> #include <linux/dma-buf.h> #include <linux/rbtree.h> -#include <drm/drm_prime.h> + +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_framebuffer.h> #include <drm/drm_gem.h> -#include <drm/drmP.h> +#include <drm/drm_prime.h> #include "drm_internal.h"
drivers/gpu/drm/drm_print.c +6 -1
@@ -26,8 +26,13 @@#define DEBUG /* for pr_debug() */ #include <stdarg.h> + +#include <linux/io.h> #include <linux/seq_file.h> -#include <drm/drmP.h> +#include <linux/slab.h> + +#include <drm/drm.h> +#include <drm/drm_drv.h> #include <drm/drm_print.h> void __drm_puts_coredump (struct drm_printer *p,const char *str)
drivers/gpu/drm/drm_probe_helper.c +4 -3
@@ -32,14 +32,15 @@#include <linux/export.h> #include <linux/moduleparam.h> -#include <drm/drmP.h> #include <drm/drm_client.h> #include <drm/drm_crtc.h> -#include <drm/drm_fourcc.h> -#include <drm/drm_fb_helper.h> #include <drm/drm_edid.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_modeset_helper_vtables.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_sysfs.h> #include "drm_crtc_helper_internal.h"
drivers/gpu/drm/drm_property.c +6 -1
@@ -21,7 +21,12 @@*/ #include <linux/export.h> -#include <drm/drmP.h> +#include <linux/uaccess.h> + +#include <drm/drm_crtc.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_framebuffer.h> #include <drm/drm_property.h> #include "drm_crtc_internal.h"
drivers/gpu/drm/drm_rect.c +3 -1
@@ -24,7 +24,9 @@#include <linux/errno.h> #include <linux/export.h> #include <linux/kernel.h> -#include <drm/drmP.h> + +#include <drm/drm_mode.h> +#include <drm/drm_print.h> #include <drm/drm_rect.h> /**
drivers/gpu/drm/drm_scatter.c +7 -2
@@ -31,9 +31,14 @@* DEALINGS IN THE SOFTWARE. */ -#include <linux/vmalloc.h> +#include <linux/mm.h> #include <linux/slab.h> -#include <drm/drmP.h> +#include <linux/vmalloc.h> + +#include <drm/drm.h> +#include <drm/drm_drv.h> +#include <drm/drm_print.h> +#include "drm_legacy.h" #define DEBUG_SCATTER 0
drivers/gpu/drm/drm_scdc_helper.c +1 -1
@@ -24,8 +24,8 @@#include <linux/slab.h> #include <linux/delay.h> +#include <drm/drm_print.h> #include <drm/drm_scdc_helper.h> -#include <drm/drmP.h> /** * DOC: scdc helpers
drivers/gpu/drm/drm_simple_kms_helper.c +3 -2
@@ -7,13 +7,14 @@* (at your option) any later version. */ -#include <drm/drmP.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> #include <drm/drm_simple_kms_helper.h> -#include <linux/slab.h> /** * DOC: overview
drivers/gpu/drm/drm_syncobj.c +9 -4
@@ -46,16 +46,21 @@* The file takes a reference on the kref. */ -#include <drm/drmP.h> +#include <linux/anon_inodes.h> #include <linux/file.h> #include <linux/fs.h> -#include <linux/anon_inodes.h> -#include <linux/sync_file.h> #include <linux/sched/signal.h> +#include <linux/sync_file.h> +#include <linux/uaccess.h> -#include "drm_internal.h" +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_gem.h> +#include <drm/drm_print.h> #include <drm/drm_syncobj.h> +#include "drm_internal.h" +struct syncobj_wait_entry {struct list_head node;struct task_struct *task;
drivers/gpu/drm/drm_sysfs.c +11 -4
@@ -13,13 +13,20 @@*/ #include <linux/device.h> -#include <linux/kdev_t.h> -#include <linux/gfp.h> #include <linux/err.h> #include <linux/export.h> - +#include <linux/gfp.h> +#include <linux/kdev_t.h> +#include <linux/slab.h> + +#include <drm/drm_connector.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> +#include <drm/drm_modes.h> +#include <drm/drm_print.h> +#include <drm/drm_property.h> #include <drm/drm_sysfs.h> -#include <drm/drmP.h> +#include "drm_internal.h" #define to_drm_minor (d) dev_get_drvdata(d)
drivers/gpu/drm/drm_trace_points.c +2 -1
@@ -1,4 +1,5 @@ -#include <drm/drmP.h> + +#include <drm/drm_file.h> #define CREATE_TRACE_POINTS #include "drm_trace.h"
drivers/gpu/drm/drm_vblank.c +9 -3
@@ -24,12 +24,18 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#include <drm/drm_vblank.h> -#include <drm/drmP.h> #include <linux/export.h> +#include <linux/moduleparam.h> + +#include <drm/drm_crtc.h> +#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_trace.h" #include "drm_internal.h" +#include "drm_trace.h" /** * DOC: vblank handling
drivers/gpu/drm/drm_vm.c +13 -1
@@ -33,15 +33,27 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#include <drm/drmP.h> #include <linux/export.h> +#include <linux/pci.h> #include <linux/seq_file.h> +#include <linux/vmalloc.h> +#if defined(__ia64__)#include <linux/efi.h> #include <linux/slab.h> #endif #include <linux/mem_encrypt.h> +#include <asm/pgtable.h> + +#include <drm/drm_agpsupport.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_framebuffer.h> +#include <drm/drm_gem.h> +#include <drm/drm_print.h> +#include "drm_internal.h" #include "drm_legacy.h"
drivers/gpu/drm/drm_vma_manager.c +3 -3
@@ -23,9 +23,6 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#include <drm/drmP.h> -#include <drm/drm_mm.h> -#include <drm/drm_vma_manager.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/rbtree.h>
@@ -33,6 +30,9 @@#include <linux/spinlock.h> #include <linux/types.h> +#include <drm/drm_mm.h> +#include <drm/drm_vma_manager.h> +/** * DOC: vma offset manager *
drivers/gpu/drm/drm_vram_mm_helper.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0-or-later +#include <drm/drm_device.h> +#include <drm/drm_file.h> #include <drm/drm_vram_mm_helper.h> -#include <drm/drmP.h> +#include <drm/ttm/ttm_page_alloc.h> /**
drivers/gpu/drm/drm_writeback.c +4 -2
@@ -9,12 +9,14 @@* of such GNU licence. */ +#include <linux/dma-fence.h> +#include <drm/drm_crtc.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> #include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_property.h> #include <drm/drm_writeback.h> -#include <drm/drmP.h> -#include <linux/dma-fence.h> /** * DOC: overview
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm: make headers self-contained and drop drmP.h
In reply to Sam Ravnborg== Series Details ==
== Series Details ==
Series: drm: make headers self-contained and drop drmP.h
URL : https://patchwork.freedesktop.org/series/61156/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 67d7923073e6 drm: make drm/drm_auth.h self contained -:21: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #21: FILE: include/drm/drm_auth.h:1: +#ifndef _DRM_AUTH_H_
total: 0 errors, 1 warnings, 0 checks, 20 lines checkedfe5661c9992c drm: make drm/drm_legacy.h self-containedcac5b083f2c5 drm: make drm_crtc_internal.h self-containedae0bbbbd1c92 drm: make drm_internal.h self-contained18d28270911c drm: make drm_legacy.h self-containede088cf6a4159 drm: make drm_trace.h self-contained17f37676c0e5 drm: drop use of drmP.h in drm/*
-:1213: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #1213: FILE: drivers/gpu/drm/drm_trace_points.c:1:
+
total: 0 errors, 1 warnings, 0 checks, 1020 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for drm: make headers self-contained and drop drmP.h
In reply to Sam Ravnborg== Series Details ==
== Series Details ==
Series: drm: make headers self-contained and drop drmP.h
URL : https://patchwork.freedesktop.org/series/61156/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm: make drm/drm_auth.h self contained Okay!
Commit: drm: make drm/drm_legacy.h self-contained
Okay!
Commit: drm: make drm_crtc_internal.h self-contained Okay!
Commit: drm: make drm_internal.h self-contained
Okay!
Commit: drm: make drm_legacy.h self-contained
Okay!
Commit: drm: make drm_trace.h self-contained
Okay!
Commit: drm: drop use of drmP.h in drm/* +drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void) +drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void) +drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void) +drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void) +drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void) +drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void) +drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void) -drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void) -drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void) -drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void) -drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void) -drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void) -drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void) -drivers/gpu/drm/drm_rect.c:100:27: warning: expression using sizeof(void)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm: make headers self-contained and drop drmP.h
In reply to Sam Ravnborg== Series Details ==
== Series Details ==
Series: drm: make headers self-contained and drop drmP.h
URL : https://patchwork.freedesktop.org/series/61156/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6142 -> Patchwork_13103
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/
Known issues
------------
Here are the changes found in Patchwork_13103 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_cpu_reloc@basic:
- fi-pnv-d510: [PASS][1] -> [INCOMPLETE][2] ([fdo#110740])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/fi-pnv-d510/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/fi-pnv-d510/igt@[email protected]
* igt@gem_flink_basic@bad-open:
- fi-icl-u3: [PASS][3] -> [DMESG-WARN][4] ([fdo#107724])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/fi-icl-u3/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/fi-icl-u3/igt@[email protected]
* igt@i915_selftest@live_contexts:
- fi-skl-gvtdvm: [PASS][5] -> [DMESG-FAIL][6] ([fdo#110235])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/fi-skl-gvtdvm/igt@i915_selftest@live_contexts.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/fi-skl-gvtdvm/igt@i915_selftest@live_contexts.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-blb-e6850: [INCOMPLETE][7] ([fdo#107718]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/fi-blb-e6850/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/fi-blb-e6850/igt@[email protected]
* igt@i915_selftest@live_contexts:
- fi-bdw-gvtdvm: [DMESG-FAIL][9] ([fdo#110235]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/fi-bdw-gvtdvm/igt@i915_selftest@live_contexts.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/fi-bdw-gvtdvm/igt@i915_selftest@live_contexts.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][11] ([fdo#109485]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/fi-kbl-7500u/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/fi-kbl-7500u/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u3: [FAIL][13] ([fdo#103167]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/fi-icl-u3/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/fi-icl-u3/igt@[email protected]
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
[fdo#110235]: https://bugs.freedesktop.org/show_bug.cgi?id=110235
[fdo#110740]: https://bugs.freedesktop.org/show_bug.cgi?id=110740
Participating hosts (53 -> 45)
------------------------------
Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-icl-dsi fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6142 -> Patchwork_13103
CI_DRM_6142: a388075b2bdc3f714c11e90afb32d65e121987f3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5015: cdd6b0a7630762cec14596b9863f418b48c32f46 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13103: 17f37676c0e5f24e1498a056df5e71ace0f2ad61 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
17f37676c0e5 drm: drop use of drmP.h in drm/* e088cf6a4159 drm: make drm_trace.h self-contained 18d28270911c drm: make drm_legacy.h self-contained ae0bbbbd1c92 drm: make drm_internal.h self-contained cac5b083f2c5 drm: make drm_crtc_internal.h self-contained fe5661c9992c drm: make drm/drm_legacy.h self-contained 67d7923073e6 drm: make drm/drm_auth.h self contained
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 29 lines · Sam Ravnborg
While removing use of
drmP.hfrom files in drm/* I noticed that I had to add the same include files due to dependencies in the header files.It is better to let the header files be self-contained and let the users pull in only the additional headers files required. So I went ahead and made the relevant header files self-contained. (I did not check if this made any includes redundant in some files, I do not have tooling in place to do so).
Daniel suggested to add support for testing that they stay self contained.
Jani Nikula has sent a patch to kbuild to make this part of the kbuild machinery. I have used it locally and as soon as it lands in kbuild I will start using it for drm.
We could have duplicated the infrastructure now but that seemed too much code chrunch.This patchset include the actual removal of
drmP.has one big patch. This is build tested on alpha (always interesting), arm, arm64, x86 etc.For all files touched the following was done:
- include files divided up in blocks in following order:linux/* video/* drm/* ""- within each block the include files are sorted alphabetically
Quoted 8 lines
v2:
- use same ordering af blocks
- move includes down below license text
- added patch with actualdrmP.hremoval
- reworded some subjects to make them more descriptive
- fixed a few spelling erros in changelogs (but a few may remain)Sam
On the series:
Did a bit of scrolling, looks all reasonable, but definitely didn't check things in-depth.
btw did you look at the i915 Makefile trickery to make sure headers stay self-contained?
-Daniel
Quoted 79 lines
Sam Ravnborg (7):
drm: makedrm/drm_auth.hself contained
drm: makedrm/drm_legacy.hself-contained
drm: makedrm_crtc_internal.hself-contained
drm: makedrm_internal.hself-contained
drm: makedrm_legacy.hself-contained
drm: makedrm_trace.hself-contained
drm: drop use ofdrmP.hin drm/*drivers/gpu/drm/ati_pcigart.c | 5 ++++- drivers/gpu/drm/drm_agpsupport.c | 11 +++++++++-- drivers/gpu/drm/drm_atomic.c | 9 +++++++-- drivers/gpu/drm/drm_atomic_helper.c | 11 +++++++---- drivers/gpu/drm/drm_atomic_state_helper.c | 7 ++++--- drivers/gpu/drm/drm_auth.c | 10 ++++++++-- drivers/gpu/drm/drm_blend.c | 9 ++++++--- drivers/gpu/drm/drm_bufs.c | 21 ++++++++++++++++----- drivers/gpu/drm/drm_client.c | 2 +- drivers/gpu/drm/drm_color_mgmt.c | 8 ++++++-- drivers/gpu/drm/drm_context.c | 8 +++++++- drivers/gpu/drm/drm_crtc_helper.c | 14 ++++++++------ drivers/gpu/drm/drm_crtc_internal.h | 24 ++++++++++++++++++++---- drivers/gpu/drm/drm_debugfs.c | 13 ++++++++----- drivers/gpu/drm/drm_debugfs_crc.c | 9 ++++++++- drivers/gpu/drm/drm_dma.c | 6 +++++- drivers/gpu/drm/drm_drv.c | 9 ++++++--- drivers/gpu/drm/drm_dumb_buffers.c | 4 +++- drivers/gpu/drm/drm_encoder.c | 4 +++- drivers/gpu/drm/drm_fb_helper.c | 19 ++++++++++++------- drivers/gpu/drm/drm_file.c | 11 +++++++---- drivers/gpu/drm/drm_flip_work.c | 6 ++++-- drivers/gpu/drm/drm_fourcc.c | 2 +- drivers/gpu/drm/drm_framebuffer.c | 13 +++++++++---- drivers/gpu/drm/drm_gem.c | 8 ++++++-- drivers/gpu/drm/drm_gem_cma_helper.c | 11 ++++++----- drivers/gpu/drm/drm_gem_framebuffer_helper.c | 1 - drivers/gpu/drm/drm_hashtab.c | 10 +++++++--- drivers/gpu/drm/drm_internal.h | 10 +++++++++- drivers/gpu/drm/drm_ioc32.c | 9 ++++++--- drivers/gpu/drm/drm_ioctl.c | 22 ++++++++++++++-------- drivers/gpu/drm/drm_irq.c | 13 +++++++++---- drivers/gpu/drm/drm_kms_helper_common.c | 3 ++- drivers/gpu/drm/drm_lease.c | 15 ++++++++++----- drivers/gpu/drm/drm_legacy.h | 4 ++++ drivers/gpu/drm/drm_legacy_misc.c | 7 ++++++- drivers/gpu/drm/drm_lock.c | 8 ++++++-- drivers/gpu/drm/drm_memory.c | 9 +++++++-- drivers/gpu/drm/drm_mm.c | 9 +++++---- drivers/gpu/drm/drm_mode_config.c | 6 +++++- drivers/gpu/drm/drm_mode_object.c | 9 +++++++-- drivers/gpu/drm/drm_modes.c | 7 +++++-- drivers/gpu/drm/drm_modeset_lock.c | 2 +- drivers/gpu/drm/drm_of.c | 5 +++-- drivers/gpu/drm/drm_pci.c | 11 ++++++++--- drivers/gpu/drm/drm_plane_helper.c | 9 +++++---- drivers/gpu/drm/drm_prime.c | 7 +++++-- drivers/gpu/drm/drm_print.c | 7 ++++++- drivers/gpu/drm/drm_probe_helper.c | 7 ++++--- drivers/gpu/drm/drm_property.c | 7 ++++++- drivers/gpu/drm/drm_rect.c | 4 +++- drivers/gpu/drm/drm_scatter.c | 9 +++++++-- drivers/gpu/drm/drm_scdc_helper.c | 2 +- drivers/gpu/drm/drm_simple_kms_helper.c | 5 +++-- drivers/gpu/drm/drm_syncobj.c | 13 +++++++++---- drivers/gpu/drm/drm_sysfs.c | 15 +++++++++++---- drivers/gpu/drm/drm_trace.h | 2 ++ drivers/gpu/drm/drm_trace_points.c | 3 ++- drivers/gpu/drm/drm_vblank.c | 12 +++++++++--- drivers/gpu/drm/drm_vm.c | 14 +++++++++++++- drivers/gpu/drm/drm_vma_manager.c | 6 +++--- drivers/gpu/drm/drm_vram_mm_helper.c | 4 +++- drivers/gpu/drm/drm_writeback.c | 6 ++++-- include/drm/drm_auth.h | 11 +++++++++-- include/drm/drm_legacy.h | 12 ++++++------ 65 files changed, 406 insertions(+), 163 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
Hi Daniel.
Quoted 37 lines · Daniel Vetter
Quoted 36 lines · Sam Ravnborg
While removing use of
drmP.hfrom files in drm/* I noticed that I had to add the same include files due to dependencies in the header files.It is better to let the header files be self-contained and let the users pull in only the additional headers files required. So I went ahead and made the relevant header files self-contained. (I did not check if this made any includes redundant in some files, I do not have tooling in place to do so).
Daniel suggested to add support for testing that they stay self contained.
Jani Nikula has sent a patch to kbuild to make this part of the kbuild machinery. I have used it locally and as soon as it lands in kbuild I will start using it for drm.
We could have duplicated the infrastructure now but that seemed too much code chrunch.This patchset include the actual removal of
drmP.has one big patch. This is build tested on alpha (always interesting), arm, arm64, x86 etc.For all files touched the following was done:
- include files divided up in blocks in following order:linux/* video/* drm/* ""- within each block the include files are sorted alphabetically
v2:
- use same ordering af blocks
- move includes down below license text
- added patch with actualdrmP.hremoval
- reworded some subjects to make them more descriptive
- fixed a few spelling erros in changelogs (but a few may remain)
Quoted 5 lines
Quoted 1 line
Sam
On the series:
Acked-by Daniel Vetter <[email protected]>
Thanks
Quoted 6 lines
Did a bit of scrolling, looks all reasonable, but definitely didn't check things in-depth.
btw did you look at the i915
Makefiletrickery to make sure headers stay self-contained?
Yup, this is what Jani works on getting upstreamed to be part of kbuild. When it lands I will activate it for the drm headers (if not beaten by someone else)
I used it locally to check everything was OK.
Sam
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Sam Ravnborg
AppliedQuoted 37 lines · Daniel Vetter
Quoted 36 lines · Sam Ravnborg
While removing use of
drmP.hfrom files in drm/* I noticed that I had to add the same include files due to dependencies in the header files.It is better to let the header files be self-contained and let the users pull in only the additional headers files required. So I went ahead and made the relevant header files self-contained. (I did not check if this made any includes redundant in some files, I do not have tooling in place to do so).
Daniel suggested to add support for testing that they stay self contained.
Jani Nikula has sent a patch to kbuild to make this part of the kbuild machinery. I have used it locally and as soon as it lands in kbuild I will start using it for drm.
We could have duplicated the infrastructure now but that seemed too much code chrunch.This patchset include the actual removal of
drmP.has one big patch. This is build tested on alpha (always interesting), arm, arm64, x86 etc.For all files touched the following was done:
- include files divided up in blocks in following order:linux/* video/* drm/* ""- within each block the include files are sorted alphabetically
v2:
- use same ordering af blocks
- move includes down below license text
- added patch with actualdrmP.hremoval
- reworded some subjects to make them more descriptive
- fixed a few spelling erros in changelogs (but a few may remain)
Quoted 8 lines
Quoted 1 line
Sam
On the series:
Acked-by Daniel Vetter <[email protected]>Did a bit of scrolling, looks all reasonable, but definitely didn't check things in-depth.
Thanks, applied and will be pushed out in a minute.
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✓ Fi.CI.IGT: success for drm: make headers self-contained and drop drmP.h
In reply to Sam Ravnborg== Series Details ==
== Series Details ==
Series: drm: make headers self-contained and drop drmP.h
URL : https://patchwork.freedesktop.org/series/61156/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6142_full -> Patchwork_13103_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13103_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_pwrite@small-cpu-fbr:
- shard-apl: [PASS][1] -> [INCOMPLETE][2] ([fdo#103927])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-apl5/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-apl6/igt@[email protected]
* igt@i915_pm_rpm@gem-execbuf:
- shard-skl: [PASS][3] -> [INCOMPLETE][4] ([fdo#107803] / [fdo#107807])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-skl1/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-skl1/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-apl: [PASS][5] -> [DMESG-WARN][6] ([fdo#108566]) +4 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-apl5/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-apl3/igt@[email protected]
* igt@kms_flip@2x-flip-vs-suspend:
- shard-hsw: [PASS][7] -> [INCOMPLETE][8] ([fdo#103540])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-hsw5/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-hsw2/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [PASS][9] -> [FAIL][10] ([fdo#105363])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-skl8/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-skl8/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-move:
- shard-hsw: [PASS][11] -> [SKIP][12] ([fdo#109271]) +3 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-hsw6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-hsw1/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render:
- shard-iclb: [PASS][13] -> [FAIL][14] ([fdo#103167]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-iclb6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-snb: [PASS][15] -> [INCOMPLETE][16] ([fdo#105411])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-snb1/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-snb1/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [PASS][17] -> [FAIL][18] ([fdo#103166])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-iclb6/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-iclb5/igt@[email protected]
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#109441])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-iclb6/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@tools_test@tools_test:
- shard-apl: [PASS][21] -> [SKIP][22] ([fdo#109271])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-apl5/igt@tools_test@tools_test.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-apl7/igt@tools_test@tools_test.html
#### Possible fixes ####
* igt@gem_exec_schedule@preemptive-hang-render:
- shard-glk: [INCOMPLETE][23] ([fdo#103359] / [k.org#198133]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-glk7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-glk4/igt@[email protected]
* igt@gem_tiled_swapping@non-threaded:
- shard-apl: [DMESG-WARN][25] ([fdo#108686]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-apl8/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-apl4/igt@[email protected]
* igt@gem_workarounds@suspend-resume-context:
- shard-kbl: [DMESG-WARN][27] ([fdo#108566]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-kbl1/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-kbl4/igt@[email protected]
* igt@i915_pm_rpm@system-suspend:
- shard-skl: [INCOMPLETE][29] ([fdo#104108] / [fdo#107807]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-skl2/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-skl2/igt@[email protected]
* igt@i915_pm_rpm@system-suspend-devices:
- shard-skl: [INCOMPLETE][31] ([fdo#107807]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-skl5/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-skl7/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-64x64-onscreen:
- shard-skl: [FAIL][33] ([fdo#103232]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-skl10/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-skl10/igt@[email protected]
* igt@kms_cursor_legacy@2x-flip-vs-cursor-legacy:
- shard-glk: [FAIL][35] ([fdo#104873]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-glk2/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-glk1/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-hsw: [INCOMPLETE][37] ([fdo#103540]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-hsw6/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-hsw8/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-skl: [INCOMPLETE][39] ([fdo#109507]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-skl7/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-skl10/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt:
- shard-iclb: [FAIL][41] ([fdo#103167]) -> [PASS][42] +7 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-iclb7/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-iclb8/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-onoff:
- shard-skl: [FAIL][43] ([fdo#103167]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-skl4/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-skl6/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-pwrite:
- shard-skl: [FAIL][45] ([fdo#103167] / [fdo#110379]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-skl4/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-skl6/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-apl: [DMESG-WARN][47] ([fdo#108566]) -> [PASS][48] +5 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-apl4/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-apl8/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][49] ([fdo#108145] / [fdo#110403]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-skl10/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-skl10/igt@[email protected]
* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][51] ([fdo#109642]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-iclb7/igt@kms_psr2_su@page_flip.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-iclb2/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_suspend:
- shard-iclb: [SKIP][53] ([fdo#109441]) -> [PASS][54] +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-iclb6/igt@kms_psr@psr2_suspend.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-iclb2/igt@kms_psr@psr2_suspend.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][55] ([fdo#99912]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-apl7/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-apl6/igt@[email protected]
- shard-skl: [FAIL][57] ([fdo#99912]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-skl8/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-skl5/igt@[email protected]
#### Warnings ####
* igt@i915_pm_rpm@pc8-residency:
- shard-skl: [INCOMPLETE][59] ([fdo#107807]) -> [SKIP][60] ([fdo#109271])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-skl9/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-skl8/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-wc:
- shard-skl: [FAIL][61] ([fdo#108040]) -> [FAIL][62] ([fdo#103167])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-skl7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-wc.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-skl9/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-wc.html
* igt@prime_vgem@fence-wait-bsd1:
- shard-snb: [FAIL][63] ([fdo#110764]) -> [INCOMPLETE][64] ([fdo#105411])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6142/shard-snb5/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13103/shard-snb7/igt@[email protected]
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[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#104873]: https://bugs.freedesktop.org/show_bug.cgi?id=104873
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#107803]: https://bugs.freedesktop.org/show_bug.cgi?id=107803
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#108040]: https://bugs.freedesktop.org/show_bug.cgi?id=108040
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110379]: https://bugs.freedesktop.org/show_bug.cgi?id=110379
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110764]: https://bugs.freedesktop.org/show_bug.cgi?id=110764
[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_6142 -> Patchwork_13103
CI_DRM_6142: a388075b2bdc3f714c11e90afb32d65e121987f3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5015: cdd6b0a7630762cec14596b9863f418b48c32f46 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13103: 17f37676c0e5f24e1498a056df5e71ace0f2ad61 @ 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_13103/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx