Skip to content

drm/i915: drmP.h include removal w/ drm prep work

Jani Nikula dri-devel intel-gfx 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 21 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6drm: include drm_device.h from drm_legacy.hinclude/drm/drm_legacy.h+1 -08 replies
2/6drm: include kernel.h and agp_backend.h from intel-gtt.hinclude/drm/intel-gtt.h+3 -01 reply
3/6drm: include idr.h from drm_file.hinclude/drm/drm_file.h+1 -02 replies
4/6drm: include types.h from drm_hdcp.hinclude/drm/drm_hdcp.h+2 -02 replies
5/6drm: include drm_file.h from drm_syncobj.hinclude/drm/drm_syncobj.h+3 -13 replies
6/6drm/i915: drop all drmP.h includesdrivers/gpu/drm/i915/dvo.h drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/i915_drv.h +48 more+3 -513 replies

Reviews trailers per patch

All 6 patches have a Reviewed-by or Acked-by.

PatchDaniel VetterLaurent Pinchart
1/6R-b R-b R-b R-b
2/6R-b
3/6R-b R-b
4/6R-b R-b
5/6R-b R-b R-b
6/6A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 0/6] drm/i915: drmP.h include removal w/ drm prep work

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 <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Laurent Pinchart <[email protected]>

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(-)
Signature · 6 lines
2.11.0

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