Hi Jani. On Thu, Dec 27, 2018 at 02:56:35PM +0200, Jani Nikula wrote: > First make some drm headers self-contained, removing the implicit > dependency on a previous drmP.h include. Then remove all drmP.h includes > from drm/i915. > > Inspired by Sam's series [1]. Theres a one line trivial conflict between > that one and this series in drm_file.h (patch 3), but I'm keeping this > series self-contained. Should be easy enough to resolve. > > I'm fine with merging the first 5 through either drm-misc or drm-intel, > but I'd rather merge the last one through drm-intel. > > BR, > Jani. > > Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> > Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > > > Jani Nikula (6): > drm: include drm_device.h from drm_legacy.h > drm: include kernel.h and agp_backend.h from intel-gtt.h > drm: include idr.h from drm_file.h > drm: include types.h from drm_hdcp.h > drm: include drm_file.h from drm_syncobj.h > drm/i915: drop all drmP.h includes Series looks good. Could I ask you to include the following patch in your series: diff --git a/include/drm/drm_framebuffer.h b/include/drm/drm_framebuffer.h index c50502c656e5..112944eed49d 100644 --- a/include/drm/drm_framebuffer.h +++ b/include/drm/drm_framebuffer.h @@ -23,8 +23,10 @@ #ifndef __DRM_FRAMEBUFFER_H__ #define __DRM_FRAMEBUFFER_H__ -#include <linux/list.h> #include <linux/ctype.h> +#include <linux/list.h> +#include <linux/sched.h> + #include <drm/drm_mode_object.h> struct drm_framebuffer; Without this all users of drm_framebuffer.h needs to include linux/sched.h The only thing required from sched.h is TASK_COMM_LEN but I did not find any good way to avoid this dependency. (I sorted the includes in alphabetic order too). No need to credit me in any way for this trivial fix. Sam _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
