| Message ID | cover.1545915059.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | drm/i915: drmP.h include removal w/ drm prep work | expand |
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. Usually I'd say stuff it into drm-misc and then backmerge for the last patch, but -rc1 is still a few weeks away I think, so not great. Probably best if you stuff this into a topic branch in drm-intel, and then send out pull requests to both drm-misc-next and dinq. -Daniel > > BR, > Jani. > > Cc: Sam Ravnborg <sam@ravnborg.org> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > 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 > > drivers/gpu/drm/i915/dvo.h | 1 - > drivers/gpu/drm/i915/i915_drv.c | 1 - > drivers/gpu/drm/i915/i915_drv.h | 2 +- > drivers/gpu/drm/i915/i915_gem.c | 1 - > drivers/gpu/drm/i915/i915_gem_context.c | 1 - > drivers/gpu/drm/i915/i915_gem_dmabuf.c | 1 - > drivers/gpu/drm/i915/i915_gem_evict.c | 1 - > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1 - > drivers/gpu/drm/i915/i915_gem_fence_reg.c | 1 - > drivers/gpu/drm/i915/i915_gem_gtt.c | 1 - > drivers/gpu/drm/i915/i915_gem_internal.c | 1 - > drivers/gpu/drm/i915/i915_gem_object.h | 3 ++- > drivers/gpu/drm/i915/i915_gem_shrinker.c | 1 - > drivers/gpu/drm/i915/i915_gem_stolen.c | 1 - > drivers/gpu/drm/i915/i915_gem_tiling.c | 1 - > drivers/gpu/drm/i915/i915_gem_userptr.c | 1 - > drivers/gpu/drm/i915/i915_ioc32.c | 1 - > drivers/gpu/drm/i915/i915_irq.c | 1 - > drivers/gpu/drm/i915/i915_suspend.c | 1 - > drivers/gpu/drm/i915/i915_trace.h | 1 - > drivers/gpu/drm/i915/intel_acpi.c | 1 - > drivers/gpu/drm/i915/intel_atomic.c | 1 - > drivers/gpu/drm/i915/intel_atomic_plane.c | 1 - > drivers/gpu/drm/i915/intel_audio.c | 1 - > drivers/gpu/drm/i915/intel_bios.c | 1 - > drivers/gpu/drm/i915/intel_connector.c | 1 - > drivers/gpu/drm/i915/intel_crt.c | 1 - > drivers/gpu/drm/i915/intel_display.c | 1 - > drivers/gpu/drm/i915/intel_dp.c | 1 - > drivers/gpu/drm/i915/intel_dp_mst.c | 1 - > drivers/gpu/drm/i915/intel_dsi.h | 1 - > drivers/gpu/drm/i915/intel_dsi_vbt.c | 1 - > drivers/gpu/drm/i915/intel_dvo.c | 1 - > drivers/gpu/drm/i915/intel_fbdev.c | 1 - > drivers/gpu/drm/i915/intel_frontbuffer.c | 1 - > drivers/gpu/drm/i915/intel_hdcp.c | 1 - > drivers/gpu/drm/i915/intel_hdmi.c | 1 - > drivers/gpu/drm/i915/intel_hotplug.c | 1 - > drivers/gpu/drm/i915/intel_i2c.c | 1 - > drivers/gpu/drm/i915/intel_lrc.c | 1 - > drivers/gpu/drm/i915/intel_lvds.c | 1 - > drivers/gpu/drm/i915/intel_mocs.h | 1 - > drivers/gpu/drm/i915/intel_opregion.c | 1 - > drivers/gpu/drm/i915/intel_overlay.c | 1 - > drivers/gpu/drm/i915/intel_psr.c | 1 - > drivers/gpu/drm/i915/intel_ringbuffer.c | 1 - > drivers/gpu/drm/i915/intel_sdvo.c | 1 - > drivers/gpu/drm/i915/intel_sprite.c | 1 - > drivers/gpu/drm/i915/intel_tv.c | 1 - > drivers/gpu/drm/i915/intel_vdsc.c | 1 - > drivers/gpu/drm/i915/vlv_dsi.c | 1 - > include/drm/drm_file.h | 1 + > include/drm/drm_hdcp.h | 2 ++ > include/drm/drm_legacy.h | 1 + > include/drm/drm_syncobj.h | 4 +++- > include/drm/intel-gtt.h | 3 +++ > 56 files changed, 13 insertions(+), 52 deletions(-) > > -- > 2.11.0 >
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@ravnborg.org> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > 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
On Thu, 27 Dec 2018, Daniel Vetter <daniel@ffwll.ch> wrote: > 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. > > Usually I'd say stuff it into drm-misc and then backmerge for the last > patch, but -rc1 is still a few weeks away I think, so not great. Probably > best if you stuff this into a topic branch in drm-intel, and then send out > pull requests to both drm-misc-next and dinq. Thanks for all the reviews, pushed patches 1-5 to topic/drmp-cleanup with $(git merge-base drm-misc-next drm-intel-next-queued) as the starting point. It's also included in drm-tip now. I'll probably let it simmer there until, uh, next year, and send the pull requests to drm-misc and drm-intel after that. And then apply patch 6 on top of dinq. BR, Jani.
On Fri, 28 Dec 2018, Jani Nikula <jani.nikula@intel.com> wrote: > Thanks for all the reviews, pushed patches 1-5 to topic/drmp-cleanup > with $(git merge-base drm-misc-next drm-intel-next-queued) as the > starting point. It's also included in drm-tip now. So I did this *before* I got the review feedback from Laurent, based on Daniel's review only. Would you all like me to redo the branch with Laurent's comments addressed and r-b added? BR, Jani.
Hi Jani, On Wednesday, 2 January 2019 09:47:58 EET Jani Nikula wrote: > On Fri, 28 Dec 2018, Jani Nikula <jani.nikula@intel.com> wrote: > > Thanks for all the reviews, pushed patches 1-5 to topic/drmp-cleanup > > with $(git merge-base drm-misc-next drm-intel-next-queued) as the > > starting point. It's also included in drm-tip now. > > So I did this *before* I got the review feedback from Laurent, based on > Daniel's review only. Would you all like me to redo the branch with > Laurent's comments addressed and r-b added? If you think my comments are valuable, that may be a good idea :-)
On Wed, 02 Jan 2019, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > Hi Jani, > > On Wednesday, 2 January 2019 09:47:58 EET Jani Nikula wrote: >> On Fri, 28 Dec 2018, Jani Nikula <jani.nikula@intel.com> wrote: >> > Thanks for all the reviews, pushed patches 1-5 to topic/drmp-cleanup >> > with $(git merge-base drm-misc-next drm-intel-next-queued) as the >> > starting point. It's also included in drm-tip now. >> >> So I did this *before* I got the review feedback from Laurent, based on >> Daniel's review only. Would you all like me to redo the branch with >> Laurent's comments addressed and r-b added? > > If you think my comments are valuable, that may be a good idea :-) Put that way... apologies for even thinking I have an option here! :) I took the liberty of force pushing the topic branch, with just the commit messages updated to reflect your review. Thanks, Jani.