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

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 · 1 line

2.11.0

Make it easier to drop drmP.h includes.

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 include/drm/drm_legacy.h | 1 +
 1 file changed, 1 insertion(+)

include/drm/drm_legacy.h +0 -0

index 8fad66f88e4f..743d7e70c896 100644

include/drm/drm_legacy.h +0 -0

 /*
  * Legacy driver interfaces for the Direct Rendering Manager

Signature · 1 line

2.11.0

Make it easier to drop drmP.h includes.

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 include/drm/intel-gtt.h | 3 +++
 1 file changed, 3 insertions(+)

include/drm/intel-gtt.h +3 -0

index 2324c84a25c0..71d81923e6b0 100644
@@ -4,6 +4,9 @@
 #ifndef _DRM_INTEL_GTT_H
 #define	_DRM_INTEL_GTT_H
 
+#include <linux/agp_backend.h>
+#include <linux/kernel.h>
+
 void intel_gtt_get(u64 *gtt_total,
 		   phys_addr_t *mappable_base,
 		   resource_size_t *mappable_end);

Signature · 1 line

2.11.0

Make it easier to drop drmP.h includes.

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 include/drm/drm_file.h | 1 +
 1 file changed, 1 insertion(+)

include/drm/drm_file.h +0 -0

index 84ac79219e4c..6710b612e2f6 100644

include/drm/drm_file.h +0 -0

 #include <uapi/drm/drm.h>
 

Signature · 1 line

2.11.0

Make it easier to drop drmP.h includes.

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 include/drm/drm_hdcp.h | 2 ++
 1 file changed, 2 insertions(+)

include/drm/drm_hdcp.h +2 -0

index a6de09c5e47f..d6dfef8cff6a 100644
@@ -9,6 +9,8 @@
 #ifndef _DRM_HDCP_H_INCLUDED_
 #define _DRM_HDCP_H_INCLUDED_
 
+#include <linux/types.h>
+
 /* Period of hdcp checks (to ensure we're still authenticated) */
 #define DRM_HDCP_CHECK_PERIOD_MS		(128 * 16)
 

Signature · 1 line

2.11.0

Make it easier to drop drmP.h includes. Switch from "" to <> includes while at it.

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 include/drm/drm_syncobj.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

include/drm/drm_syncobj.h +0 -0

index 7c6ed845c70d..93884da3f9fe 100644

include/drm/drm_syncobj.h +0 -0

 /**
  * struct drm_syncobj - sync object.

Signature · 1 line

2.11.0

Quoted 15 lines · Jani Nikula

Make it easier to drop drmP.h includes.

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 include/drm/drm_legacy.h | 1 +
 1 file changed, 1 insertion(+)

include/drm/drm_legacy.h +0 -0

index 8fad66f88e4f..743d7e70c896 100644

include/drm/drm_legacy.h line 5

Quoted 4 lines

include/drm/drm_legacy.h +1 -0

@@ -2,6 +2,7 @@
 #define __DRM_DRM_LEGACY_H__
 
 #include <drm/drm_auth.h>
+#include <drm/drm_device.h>

From a quick look, shouldn't a

struct drm_device;

forward decl be enough? You might need a pile more forward decl, but that's all drm_device.h seems to pull in that drm_legacy.h needs.

-Daniel

Quoted 6 lines

include/drm/drm_legacy.h +0 -0

 /*
  * Legacy driver interfaces for the Direct Rendering Manager

Signature · 1 line

2.11.0

Signature · 3 lines

Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Needs just a few additional includes here and there.

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 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 -
 51 files changed, 3 insertions(+), 51 deletions(-)

drivers/gpu/drm/i915/dvo.h +0 -1

index 5e6a3013da49..16e0345b711f 100644
@@ -24,7 +24,6 @@
 #define _INTEL_DVO_H
 
 #include <linux/i2c.h>
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include "intel_drv.h"
 

drivers/gpu/drm/i915/i915_drv.c +0 -1

index caa055ac9472..88b72a8e350f 100644
@@ -41,7 +41,6 @@
 #include <linux/vt.h>
 #include <acpi/video.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/i915_drm.h>

drivers/gpu/drm/i915/i915_drv.h +1 -1

index d44255a8655e..c314eb4cda07 100644
@@ -46,7 +46,6 @@
 #include <linux/reservation.h>
 #include <linux/shmem_fs.h>
 
-#include <drm/drmP.h>
 #include <drm/intel-gtt.h>
 #include <drm/drm_legacy.h> /* for struct drm_dma_handle */
 #include <drm/drm_gem.h>

@@ -54,6 +53,7 @@
 #include <drm/drm_cache.h>
 #include <drm/drm_util.h>
 #include <drm/drm_dsc.h>
+#include <drm/drm_connector.h>
 
 #include "i915_fixed.h"
 #include "i915_params.h"

drivers/gpu/drm/i915/i915_gem.c +0 -1

index d92147ab4489..da59b4211150 100644
@@ -25,7 +25,6 @@
  *
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_vma_manager.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"

drivers/gpu/drm/i915/i915_gem_context.c +0 -1

index 5905b6d8f291..5933adbe3d99 100644
@@ -86,7 +86,6 @@
  */
 
 #include <linux/log2.h>
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 #include "i915_trace.h"

drivers/gpu/drm/i915/i915_gem_dmabuf.c +0 -1

index 82e2ca17a441..02f7298bfe57 100644
@@ -27,7 +27,6 @@
 #include <linux/dma-buf.h>
 #include <linux/reservation.h>
 
-#include <drm/drmP.h>
 
 #include "i915_drv.h"
 

drivers/gpu/drm/i915/i915_gem_evict.c +0 -1

index 02b83a5ed96c..f6855401f247 100644
@@ -26,7 +26,6 @@
  *
  */
 
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 
 #include "i915_drv.h"

drivers/gpu/drm/i915/i915_gem_execbuffer.c +0 -1

index 7314074d4680..e07a36fd3df5 100644
@@ -31,7 +31,6 @@
 #include <linux/sync_file.h>
 #include <linux/uaccess.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_syncobj.h>
 #include <drm/i915_drm.h>
 

drivers/gpu/drm/i915/i915_gem_fence_reg.c +0 -1

index 24df2e2a8fc1..d67c07cdd0b8 100644
@@ -21,7 +21,6 @@
  * IN THE SOFTWARE.
  */
 
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 

drivers/gpu/drm/i915/i915_gem_gtt.c +0 -1

index 4ed2f3e61347..d69ede138ff3 100644
@@ -33,7 +33,6 @@
 
 #include <asm/set_memory.h>
 
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 
 #include "i915_drv.h"

drivers/gpu/drm/i915/i915_gem_internal.c +0 -1

index 0d0144b2104c..fddde1033e74 100644
@@ -22,7 +22,6 @@
  *
  */
 
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 

drivers/gpu/drm/i915/i915_gem_object.h +2 -1

index a6dd7c46de0d..ff3da64470dd 100644
@@ -29,7 +29,8 @@
 
 #include <drm/drm_vma_manager.h>
 #include <drm/drm_gem.h>
-#include <drm/drmP.h>
+#include <drm/drm_file.h>
+#include <drm/drm_device.h>
 
 #include <drm/i915_drm.h>
 

drivers/gpu/drm/i915/i915_gem_shrinker.c +0 -1

index ea90d3a0d511..73430716c16e 100644
@@ -30,7 +30,6 @@
 #include <linux/pci.h>
 #include <linux/dma-buf.h>
 #include <linux/vmalloc.h>
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 
 #include "i915_drv.h"

drivers/gpu/drm/i915/i915_gem_stolen.c +0 -1

index 2f756a97689a..9df615eea2d8 100644
@@ -26,7 +26,6 @@
  *
  */
 
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 

drivers/gpu/drm/i915/i915_gem_tiling.c +0 -1

index 39319ff1679c..16cc9ddbce34 100644
@@ -27,7 +27,6 @@
 
 #include <linux/string.h>
 #include <linux/bitops.h>
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 

drivers/gpu/drm/i915/i915_gem_userptr.c +0 -1

index 2c9b284036d1..7cc3cdec87b8 100644
@@ -22,7 +22,6 @@
  *
  */
 
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 #include "i915_trace.h"

drivers/gpu/drm/i915/i915_ioc32.c +0 -1

index 0e5c580d117c..7c2de5d1914b 100644
@@ -28,7 +28,6 @@
  */
 #include <linux/compat.h>
 
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 

drivers/gpu/drm/i915/i915_irq.c +0 -1

index 0c7fc9890891..b1b8bbeb23f4 100644
@@ -31,7 +31,6 @@
 #include <linux/sysrq.h>
 #include <linux/slab.h>
 #include <linux/circ_buf.h>
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 #include "i915_trace.h"

drivers/gpu/drm/i915/i915_suspend.c +0 -1

index f40ba5e429e0..f18afa2bac8d 100644
@@ -24,7 +24,6 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "intel_drv.h"
 #include "i915_reg.h"

drivers/gpu/drm/i915/i915_trace.h +0 -1

index b50c6b829715..a1873c69798d 100644
@@ -6,7 +6,6 @@
 #include <linux/types.h>
 #include <linux/tracepoint.h>
 
-#include <drm/drmP.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
 #include "intel_ringbuffer.h"

drivers/gpu/drm/i915/intel_acpi.c +0 -1

index 6ba478e57b9b..9d142d038a7d 100644
@@ -6,7 +6,6 @@
  */
 #include <linux/pci.h>
 #include <linux/acpi.h>
-#include <drm/drmP.h>
 #include "i915_drv.h"
 
 #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */

drivers/gpu/drm/i915/intel_atomic.c +0 -1

index fdfc7425e644..d8dbc9980281 100644
@@ -29,7 +29,6 @@
  * See intel_atomic_plane.c for the plane-specific atomic functionality.
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_plane_helper.h>

drivers/gpu/drm/i915/intel_atomic_plane.c +0 -1

index 0a73e6e65c20..683a75dad4fb 100644
@@ -31,7 +31,6 @@
  * prepare/check/commit/cleanup steps.
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_plane_helper.h>
 #include "intel_drv.h"

drivers/gpu/drm/i915/intel_audio.c +0 -1

index 0571aa2846a7..202a58cf2d9f 100644
@@ -27,7 +27,6 @@
 #include <drm/intel_lpe_audio.h>
 #include "intel_drv.h"
 
-#include <drm/drmP.h>
 #include <drm/drm_edid.h>
 #include "i915_drv.h"
 

drivers/gpu/drm/i915/intel_bios.c +0 -1

index 764d84d4109b..140c218128cb 100644
@@ -26,7 +26,6 @@
  */
 
 #include <drm/drm_dp_helper.h>
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 

drivers/gpu/drm/i915/intel_connector.c +0 -1

index 18e370f607bc..4f4ffd1c8fd3 100644
@@ -27,7 +27,6 @@
 #include <linux/i2c.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
-#include <drm/drmP.h>
 #include "intel_drv.h"
 #include "i915_drv.h"
 

drivers/gpu/drm/i915/intel_crt.c +0 -1

index 0a41e58d61de..951e9bae6921 100644
@@ -27,7 +27,6 @@
 #include <linux/dmi.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>

drivers/gpu/drm/i915/intel_display.c +0 -1

index f0b480fba980..f55282747326 100644
@@ -31,7 +31,6 @@
 #include <linux/slab.h>
 #include <linux/vgaarb.h>
 #include <drm/drm_edid.h>
-#include <drm/drmP.h>
 #include "intel_drv.h"
 #include "intel_frontbuffer.h"
 #include <drm/i915_drm.h>

drivers/gpu/drm/i915/intel_dp.c +0 -1

index 62fd11540942..d3cd40e656fe 100644
@@ -32,7 +32,6 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <asm/byteorder.h>
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>

drivers/gpu/drm/i915/intel_dp_mst.c +0 -1

index f05427b74e34..4eae81671b0e 100644
@@ -23,7 +23,6 @@
  *
  */
 
-#include <drm/drmP.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
 #include <drm/drm_atomic_helper.h>

drivers/gpu/drm/i915/intel_dsi.h +0 -1

index d968f1f13e09..fc7a09049f81 100644
@@ -24,7 +24,6 @@
 #ifndef _INTEL_DSI_H
 #define _INTEL_DSI_H
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_mipi_dsi.h>
 #include "intel_drv.h"

drivers/gpu/drm/i915/intel_dsi_vbt.c +0 -1

index a1a8b3790e61..6adffc6e096b 100644
@@ -24,7 +24,6 @@
  *
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
 #include <drm/i915_drm.h>

drivers/gpu/drm/i915/intel_dvo.c +0 -1

index 0042a7f69387..bc3c3cb57ec6 100644
@@ -26,7 +26,6 @@
  */
 #include <linux/i2c.h>
 #include <linux/slab.h>
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include "intel_drv.h"

drivers/gpu/drm/i915/intel_fbdev.c +0 -1

index fb5bb5b32a60..a0c5046e170c 100644
@@ -37,7 +37,6 @@
 #include <linux/init.h>
 #include <linux/vga_switcheroo.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_fb_helper.h>
 #include "intel_drv.h"

drivers/gpu/drm/i915/intel_frontbuffer.c +0 -1

index c3379bde266f..16f253deaf8d 100644
@@ -60,7 +60,6 @@
  * functions is deprecated and should be avoided.
  */
 
-#include <drm/drmP.h>
 
 #include "intel_drv.h"
 #include "intel_frontbuffer.h"

drivers/gpu/drm/i915/intel_hdcp.c +0 -1

index e000e54ad569..3fcb3b775948 100644
@@ -6,7 +6,6 @@
  * Sean Paul <[email protected]>
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_hdcp.h>
 #include <linux/i2c.h>
 #include <linux/random.h>

drivers/gpu/drm/i915/intel_hdmi.c +0 -1

index 07e803a604bd..14a0c28fe7c1 100644
@@ -30,7 +30,6 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/hdmi.h>
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>

drivers/gpu/drm/i915/intel_hotplug.c +0 -1

index e24174d08fed..ae92d6560165 100644
@@ -23,7 +23,6 @@
 
 #include <linux/kernel.h>
 
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 
 #include "i915_drv.h"

drivers/gpu/drm/i915/intel_i2c.c +0 -1

index 802d0394ccc4..c6159aff9dc8 100644
@@ -29,7 +29,6 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/export.h>
-#include <drm/drmP.h>
 #include <drm/drm_hdcp.h>
 #include "intel_drv.h"
 #include <drm/i915_drm.h>

drivers/gpu/drm/i915/intel_lrc.c +0 -1

index b05d0561f99a..0cdad6e5730c 100644
@@ -133,7 +133,6 @@
  */
 #include <linux/interrupt.h>
 
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 #include "i915_gem_render_state.h"

drivers/gpu/drm/i915/intel_lvds.c +0 -1

index b85e195f7c8a..6adcc8d037bf 100644
@@ -32,7 +32,6 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/vga_switcheroo.h>
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>

drivers/gpu/drm/i915/intel_mocs.h +0 -1

index d89080d75b80..3d99d1271b2b 100644
@@ -49,7 +49,6 @@
  * context handling keep the MOCS in step.
  */
 
-#include <drm/drmP.h>
 #include "i915_drv.h"
 
 int intel_rcs_context_init_mocs(struct i915_request *rq);

drivers/gpu/drm/i915/intel_opregion.c +0 -1

index b8f106d9ecf8..30ae96c5c97c 100644
@@ -30,7 +30,6 @@
 #include <linux/firmware.h>
 #include <acpi/video.h>
 
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 
 #include "intel_opregion.h"

drivers/gpu/drm/i915/intel_overlay.c +0 -1

index c153be043078..c81db81e4416 100644
@@ -25,7 +25,6 @@
  *
  * Derived from Xorg ddx, xf86-video-intel, src/i830_video.c
  */
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 #include "i915_reg.h"

drivers/gpu/drm/i915/intel_psr.c +0 -1

index dce39f06b682..0f6b2b4702e3 100644
@@ -51,7 +51,6 @@
  * must be correctly synchronized/cancelled when shutting down the pipe."
  */
 
-#include <drm/drmP.h>
 
 #include "intel_drv.h"
 #include "i915_drv.h"

drivers/gpu/drm/i915/intel_ringbuffer.c +0 -1

index 65fd92eb071d..d893afe84281 100644
@@ -29,7 +29,6 @@
 
 #include <linux/log2.h>
 
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 
 #include "i915_drv.h"

drivers/gpu/drm/i915/intel_sdvo.c +0 -1

index 5805ec1aba12..b08fed11219f 100644
@@ -29,7 +29,6 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/export.h>
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>

drivers/gpu/drm/i915/intel_sprite.c +0 -1

index f70d2c607902..8f3982c03925 100644
@@ -29,7 +29,6 @@
  * registers; newer ones are much simpler and we can use the new DRM plane
  * support.
  */
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_fourcc.h>

drivers/gpu/drm/i915/intel_tv.c +0 -1

index 860f306a23ba..d7a414ce2774 100644
@@ -30,7 +30,6 @@
  * Integrated TV-out support for the 915GM and 945GM.
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>

drivers/gpu/drm/i915/intel_vdsc.c +0 -1

index c56ba0e04044..48537827616f 100644
@@ -6,7 +6,6 @@
  *         Manasi Navare <[email protected]>
  */
 
-#include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_drv.h"

drivers/gpu/drm/i915/vlv_dsi.c +0 -1

index 361e962a7969..bb1287020f80 100644
@@ -23,7 +23,6 @@
  * Author: Jani Nikula <[email protected]>
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>

Signature · 1 line

2.11.0

I guess next up would be to split up i915_drv.h and intel_drv.h and see how much our driver is a spaghetti mess where everything needs everything else :-)

Quoted 23 lines · Daniel Vetter

Quoted 15 lines · Jani Nikula

Make it easier to drop drmP.h includes.

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 include/drm/drm_legacy.h | 1 +
 1 file changed, 1 insertion(+)

include/drm/drm_legacy.h +0 -0

index 8fad66f88e4f..743d7e70c896 100644

include/drm/drm_legacy.h line 5

Quoted 4 lines

include/drm/drm_legacy.h +1 -0

@@ -2,6 +2,7 @@
 #define __DRM_DRM_LEGACY_H__
 
 #include <drm/drm_auth.h>
+#include <drm/drm_device.h>

From a quick look, shouldn't a

Quoted 4 lines

struct drm_device;

forward decl be enough? You might need a pile more forward decl, but that's all drm_device.h seems to pull in that drm_legacy.h needs.

Reviewed-by Daniel Vetter <[email protected]> with the forward decl

(assuming it all works out).

-Daniel

Quoted 12 lines

-Daniel

Quoted 6 lines

include/drm/drm_legacy.h +0 -0

 /*
  * Legacy driver interfaces for the Direct Rendering Manager

Signature · 1 line

2.11.0

Signature · 3 lines

Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Quoted 3 lines · Daniel Vetter

I guess next up would be to split up i915_drv.h and intel_drv.h and see how much our driver is a spaghetti mess where everything needs everything else :-)

In general this got me wondering how self-contained the header files really need to be. Turns out even <linux/kernel.h> isn't self-contained, it fails on do_div() for my config if <asm/div64.h> isn't included some other route. Didn't dig deep, but by the looks of it this is not a new breakage (if you can call it that).

Quoted 26 lines · Daniel Vetter

Quoted 25 lines · Daniel Vetter

Quoted 15 lines · Jani Nikula

Make it easier to drop drmP.h includes.

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 include/drm/drm_legacy.h | 1 +
 1 file changed, 1 insertion(+)

include/drm/drm_legacy.h +0 -0

index 8fad66f88e4f..743d7e70c896 100644

include/drm/drm_legacy.h line 5

Quoted 4 lines

include/drm/drm_legacy.h +1 -0

@@ -2,6 +2,7 @@
 #define __DRM_DRM_LEGACY_H__
 
 #include <drm/drm_auth.h>
+#include <drm/drm_device.h>

From a quick look, shouldn't a

struct drm_device;

Quoted 5 lines

Quoted 2 lines

forward decl be enough? You might need a pile more forward decl, but that's all drm_device.h seems to pull in that drm_legacy.h needs.

Reviewed-by Daniel Vetter <[email protected]> with the forward decl

(assuming it all works out).

The forward declaration is not enough, there's a &dev->maplist reference in the static inline drm_legacy_findmap().

BR,
Jani.

Quoted 14 lines

-Daniel

Quoted 12 lines

-Daniel

Quoted 6 lines

include/drm/drm_legacy.h +0 -0

 /*
  * Legacy driver interfaces for the Direct Rendering Manager

Signature · 1 line

2.11.0

Signature · 3 lines

Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Signature · 1 line

Jani Nikula, Intel Open Source Graphics Center

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

Quoted 33 lines · Jani Nikula

Quoted 31 lines · Daniel Vetter

Quoted 23 lines · Daniel Vetter

Quoted 15 lines · Jani Nikula

Make it easier to drop drmP.h includes.

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 include/drm/drm_legacy.h | 1 +
 1 file changed, 1 insertion(+)

include/drm/drm_legacy.h +0 -0

index 8fad66f88e4f..743d7e70c896 100644

include/drm/drm_legacy.h line 5

Quoted 4 lines

include/drm/drm_legacy.h +1 -0

@@ -2,6 +2,7 @@
 #define __DRM_DRM_LEGACY_H__
 
 #include <drm/drm_auth.h>
+#include <drm/drm_device.h>

From a quick look, shouldn't a

Quoted 4 lines

struct drm_device;

forward decl be enough? You might need a pile more forward decl, but that's all drm_device.h seems to pull in that drm_legacy.h needs.

Reviewed-by Daniel Vetter <[email protected]> with the forward decl

(assuming it all works out).

Quoted 2 lines

The forward declaration is not enough, there's a &dev->maplist reference in the static inline drm_legacy_findmap().

Missed that, despite that I tried checking for static inlines. And a static inline for a O(n) lookup ... tempted to just deinline that.

Reviewed-by Daniel Vetter <[email protected]> on either your v1 or a

patch that deinlines the offending function and just uses a forward decl.

Cheers, Daniel

Quoted 21 lines

BR,
Jani.

Quoted 14 lines

-Daniel

Quoted 12 lines

-Daniel

Quoted 6 lines

include/drm/drm_legacy.h +0 -0

 /*
  * Legacy driver interfaces for the Direct Rendering Manager

Signature · 1 line

2.11.0

Signature · 3 lines

Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Signature · 1 line

Jani Nikula, Intel Open Source Graphics Center

Also include drm_hashtab.h and add struct drm_device forward declaration in drm_legacy.h to make it more self-contained. Make it easier to drop drmP.h includes.

v2: avoid including drm_device.h by un-inlining (Daniel)

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 drivers/gpu/drm/drm_bufs.c | 11 +++++++++++
 include/drm/drm_legacy.h   | 14 ++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

drivers/gpu/drm/drm_bufs.c +11 -0

index d7d10cabb9bb..a39ab2193bfe 100644
@@ -377,6 +377,17 @@ int drm_legacy_addmap(struct drm_device *dev, resource_size_t offset,
 }
 EXPORT_SYMBOL(drm_legacy_addmap);
 
+struct drm_local_map *drm_legacy_findmap(struct drm_device *dev,
+					 unsigned int token)
+{
+	struct drm_map_list *_entry;
+	list_for_each_entry(_entry, &dev->maplist, head)
+		if (_entry->user_token == token)
+			return _entry->map;
+	return NULL;
+}
+EXPORT_SYMBOL(drm_legacy_findmap);
+
 /**
  * Ioctl to specify a range of memory that is available for mapping by a
  * non-root process.

include/drm/drm_legacy.h +4 -10

index 8fad66f88e4f..3e99ab69c122 100644
@@ -2,6 +2,9 @@
 #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

@@ -156,6 +159,7 @@ struct drm_map_list {
 int drm_legacy_addmap(struct drm_device *d, resource_size_t offset,
 		      unsigned int size, enum drm_map_type type,
 		      enum drm_map_flags flags, struct drm_local_map **map_p);
+struct drm_local_map *drm_legacy_findmap(struct drm_device *dev, unsigned int token);
 void drm_legacy_rmmap(struct drm_device *d, struct drm_local_map *map);
 int drm_legacy_rmmap_locked(struct drm_device *d, struct drm_local_map *map);
 void drm_legacy_master_rmmaps(struct drm_device *dev,

@@ -194,14 +198,4 @@ void drm_legacy_ioremap(struct drm_local_map *map, struct drm_device *dev);
 void drm_legacy_ioremap_wc(struct drm_local_map *map, struct drm_device *dev);
 void drm_legacy_ioremapfree(struct drm_local_map *map, struct drm_device *dev);
 
-static inline struct drm_local_map *drm_legacy_findmap(struct drm_device *dev,
-						       unsigned int token)
-{
-	struct drm_map_list *_entry;
-	list_for_each_entry(_entry, &dev->maplist, head)
-	    if (_entry->user_token == token)
-		return _entry->map;
-	return NULL;
-}
-
 #endif /* __DRM_DRM_LEGACY_H__ */

Signature · 1 line

2.11.0

Quoted 8 lines · Jani Nikula

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.

Quoted 2 lines

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.

Also include drm_hashtab.h and add struct drm_device forward declaration in drm_legacy.h to make it more self-contained. Make it easier to drop drmP.h includes.

v2: avoid including drm_device.h by un-inlining (Daniel)

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 drivers/gpu/drm/drm_bufs.c | 11 +++++++++++
 include/drm/drm_legacy.h   | 14 ++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

drivers/gpu/drm/drm_bufs.c +11 -0

index d7d10cabb9bb..a39ab2193bfe 100644
@@ -377,6 +377,17 @@ int drm_legacy_addmap(struct drm_device *dev,
 resource_size_t offset, }
 EXPORT_SYMBOL(drm_legacy_addmap);
 
+struct drm_local_map *drm_legacy_findmap(struct drm_device *dev,
+					 unsigned int token)
+{
+	struct drm_map_list *_entry;
+	list_for_each_entry(_entry, &dev->maplist, head)
+		if (_entry->user_token == token)
+			return _entry->map;
+	return NULL;
+}
+EXPORT_SYMBOL(drm_legacy_findmap);
+
 /**
  * Ioctl to specify a range of memory that is available for mapping by a
  * non-root process.

include/drm/drm_legacy.h +4 -0

index 8fad66f88e4f..3e99ab69c122 100644
@@ -2,6 +2,9 @@
 #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

@@ -156,6 +159,7 @@ struct drm_map_list {
 int drm_legacy_addmap(struct drm_device *d, resource_size_t offset,
 		      unsigned int size, enum drm_map_type type,
 		      enum drm_map_flags flags, struct drm_local_map **map_p);
+struct drm_local_map *drm_legacy_findmap(struct drm_device *dev, unsigned

int token); void drm_legacy_rmmap(struct drm_device *d, struct drm_local_map *map); int drm_legacy_rmmap_locked(struct drm_device *d, struct drm_local_map *map); void drm_legacy_master_rmmaps(struct drm_device *dev,

include/drm/drm_legacy.h +0 -0

@@ -194,14 +198,4 @@ void drm_legacy_ioremap(struct drm_local_map *map,

struct drm_device *dev); void drm_legacy_ioremap_wc(struct drm_local_map *map, struct drm_device *dev); void drm_legacy_ioremapfree(struct drm_local_map *map, struct drm_device *dev);

-static inline struct drm_local_map *drm_legacy_findmap(struct drm_device
*dev, - unsigned int token)

include/drm/drm_legacy.h +0 -8

-{
-	struct drm_map_list *_entry;
-	list_for_each_entry(_entry, &dev->maplist, head)
-	    if (_entry->user_token == token)
-		return _entry->map;
-	return NULL;
-}
-
 #endif /* __DRM_DRM_LEGACY_H__ */

Make it easier to drop drmP.h includes.

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 include/drm/drm_file.h | 1 +
 1 file changed, 1 insertion(+)

include/drm/drm_file.h +1 -0

index 84ac79219e4c..6710b612e2f6 100644
@@ -32,6 +32,7 @@
 
 #include <linux/types.h>
 #include <linux/completion.h>
+#include <linux/idr.h>
 
 #include <uapi/drm/drm.h>

Make it easier to drop drmP.h includes.

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 include/drm/drm_hdcp.h | 2 ++
 1 file changed, 2 insertions(+)

include/drm/drm_hdcp.h +2 -0

index a6de09c5e47f..d6dfef8cff6a 100644
@@ -9,6 +9,8 @@
 #ifndef _DRM_HDCP_H_INCLUDED_
 #define _DRM_HDCP_H_INCLUDED_
 
+#include <linux/types.h>
+
 /* Period of hdcp checks (to ensure we're still authenticated) */
 #define DRM_HDCP_CHECK_PERIOD_MS		(128 * 16)

Make it easier to drop drmP.h includes. Switch from "" to <> includes while at it.

v2: forward declare instead of including drm_file.h (Daniel)

Cc Sam Ravnborg <[email protected]>

Cc Daniel Vetter <[email protected]>

Cc Laurent Pinchart <[email protected]>

Reviewed-by Daniel Vetter <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 include/drm/drm_syncobj.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

include/drm/drm_syncobj.h +3 -1

index 7c6ed845c70d..0311c9fdbd2f 100644
@@ -26,7 +26,9 @@
 #ifndef __DRM_SYNCOBJ_H__
 #define __DRM_SYNCOBJ_H__
 
-#include "linux/dma-fence.h"
+#include <linux/dma-fence.h>
+
+struct drm_file;
 
 /**
  * struct drm_syncobj - sync object.

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.

Quoted 3 lines · Jani Nikula

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?

Hi Jani,

Quoted 5 lines · On Wednesday, 2 January 2019 09:47:58 EET Jani Nikula wrote:

Quoted 3 lines · Jani Nikula

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.

Quoted 3 lines

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