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
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(-)
Needs just a few additional includes here and there.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- 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(-)
diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h index 5e6a3013da49..16e0345b711f 100644 --- a/drivers/gpu/drm/i915/dvo.h +++ b/drivers/gpu/drm/i915/dvo.h @@ -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"
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index caa055ac9472..88b72a8e350f 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -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> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index d44255a8655e..c314eb4cda07 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -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" diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index d92147ab4489..da59b4211150 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -25,7 +25,6 @@ * */
-#include <drm/drmP.h> #include <drm/drm_vma_manager.h> #include <drm/i915_drm.h> #include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 5905b6d8f291..5933adbe3d99 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -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" diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c index 82e2ca17a441..02f7298bfe57 100644 --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -27,7 +27,6 @@ #include <linux/dma-buf.h> #include <linux/reservation.h>
-#include <drm/drmP.h>
#include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c index 02b83a5ed96c..f6855401f247 100644 --- a/drivers/gpu/drm/i915/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/i915_gem_evict.c @@ -26,7 +26,6 @@ * */
-#include <drm/drmP.h> #include <drm/i915_drm.h>
#include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 7314074d4680..e07a36fd3df5 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -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>
diff --git a/drivers/gpu/drm/i915/i915_gem_fence_reg.c b/drivers/gpu/drm/i915/i915_gem_fence_reg.c index 24df2e2a8fc1..d67c07cdd0b8 100644 --- a/drivers/gpu/drm/i915/i915_gem_fence_reg.c +++ b/drivers/gpu/drm/i915/i915_gem_fence_reg.c @@ -21,7 +21,6 @@ * IN THE SOFTWARE. */
-#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 4ed2f3e61347..d69ede138ff3 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -33,7 +33,6 @@
#include <asm/set_memory.h>
-#include <drm/drmP.h> #include <drm/i915_drm.h>
#include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/i915_gem_internal.c b/drivers/gpu/drm/i915/i915_gem_internal.c index 0d0144b2104c..fddde1033e74 100644 --- a/drivers/gpu/drm/i915/i915_gem_internal.c +++ b/drivers/gpu/drm/i915/i915_gem_internal.c @@ -22,7 +22,6 @@ * */
-#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_gem_object.h b/drivers/gpu/drm/i915/i915_gem_object.h index a6dd7c46de0d..ff3da64470dd 100644 --- a/drivers/gpu/drm/i915/i915_gem_object.h +++ b/drivers/gpu/drm/i915/i915_gem_object.h @@ -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>
diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c index ea90d3a0d511..73430716c16e 100644 --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c @@ -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" diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 2f756a97689a..9df615eea2d8 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -26,7 +26,6 @@ * */
-#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index 39319ff1679c..16cc9ddbce34 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c @@ -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"
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c index 2c9b284036d1..7cc3cdec87b8 100644 --- a/drivers/gpu/drm/i915/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c @@ -22,7 +22,6 @@ * */
-#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h" #include "i915_trace.h" diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c index 0e5c580d117c..7c2de5d1914b 100644 --- a/drivers/gpu/drm/i915/i915_ioc32.c +++ b/drivers/gpu/drm/i915/i915_ioc32.c @@ -28,7 +28,6 @@ */ #include <linux/compat.h>
-#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 0c7fc9890891..b1b8bbeb23f4 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -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" diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index f40ba5e429e0..f18afa2bac8d 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -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" diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index b50c6b829715..a1873c69798d 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -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" diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c index 6ba478e57b9b..9d142d038a7d 100644 --- a/drivers/gpu/drm/i915/intel_acpi.c +++ b/drivers/gpu/drm/i915/intel_acpi.c @@ -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... */ diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index fdfc7425e644..d8dbc9980281 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c index 0a73e6e65c20..683a75dad4fb 100644 --- a/drivers/gpu/drm/i915/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index 0571aa2846a7..202a58cf2d9f 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -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"
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 764d84d4109b..140c218128cb 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -26,7 +26,6 @@ */
#include <drm/drm_dp_helper.h> -#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/intel_connector.c b/drivers/gpu/drm/i915/intel_connector.c index 18e370f607bc..4f4ffd1c8fd3 100644 --- a/drivers/gpu/drm/i915/intel_connector.c +++ b/drivers/gpu/drm/i915/intel_connector.c @@ -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"
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 0a41e58d61de..951e9bae6921 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f0b480fba980..f55282747326 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 62fd11540942..d3cd40e656fe 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index f05427b74e34..4eae81671b0e 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -23,7 +23,6 @@ * */
-#include <drm/drmP.h> #include "i915_drv.h" #include "intel_drv.h" #include <drm/drm_atomic_helper.h> diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h index d968f1f13e09..fc7a09049f81 100644 --- a/drivers/gpu/drm/i915/intel_dsi.h +++ b/drivers/gpu/drm/i915/intel_dsi.h @@ -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" diff --git a/drivers/gpu/drm/i915/intel_dsi_vbt.c b/drivers/gpu/drm/i915/intel_dsi_vbt.c index a1a8b3790e61..6adffc6e096b 100644 --- a/drivers/gpu/drm/i915/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/intel_dsi_vbt.c @@ -24,7 +24,6 @@ * */
-#include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h> #include <drm/i915_drm.h> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c index 0042a7f69387..bc3c3cb57ec6 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index fb5bb5b32a60..a0c5046e170c 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/intel_frontbuffer.c index c3379bde266f..16f253deaf8d 100644 --- a/drivers/gpu/drm/i915/intel_frontbuffer.c +++ b/drivers/gpu/drm/i915/intel_frontbuffer.c @@ -60,7 +60,6 @@ * functions is deprecated and should be avoided. */
-#include <drm/drmP.h>
#include "intel_drv.h" #include "intel_frontbuffer.h" diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c index e000e54ad569..3fcb3b775948 100644 --- a/drivers/gpu/drm/i915/intel_hdcp.c +++ b/drivers/gpu/drm/i915/intel_hdcp.c @@ -6,7 +6,6 @@ * Sean Paul seanpaul@chromium.org */
-#include <drm/drmP.h> #include <drm/drm_hdcp.h> #include <linux/i2c.h> #include <linux/random.h> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 07e803a604bd..14a0c28fe7c1 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c index e24174d08fed..ae92d6560165 100644 --- a/drivers/gpu/drm/i915/intel_hotplug.c +++ b/drivers/gpu/drm/i915/intel_hotplug.c @@ -23,7 +23,6 @@
#include <linux/kernel.h>
-#include <drm/drmP.h> #include <drm/i915_drm.h>
#include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index 802d0394ccc4..c6159aff9dc8 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index b05d0561f99a..0cdad6e5730c 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index b85e195f7c8a..6adcc8d037bf 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_mocs.h b/drivers/gpu/drm/i915/intel_mocs.h index d89080d75b80..3d99d1271b2b 100644 --- a/drivers/gpu/drm/i915/intel_mocs.h +++ b/drivers/gpu/drm/i915/intel_mocs.h @@ -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); diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index b8f106d9ecf8..30ae96c5c97c 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index c153be043078..c81db81e4416 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c index dce39f06b682..0f6b2b4702e3 100644 --- a/drivers/gpu/drm/i915/intel_psr.c +++ b/drivers/gpu/drm/i915/intel_psr.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 65fd92eb071d..d893afe84281 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -29,7 +29,6 @@
#include <linux/log2.h>
-#include <drm/drmP.h> #include <drm/i915_drm.h>
#include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 5805ec1aba12..b08fed11219f 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index f70d2c607902..8f3982c03925 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 860f306a23ba..d7a414ce2774 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_vdsc.c b/drivers/gpu/drm/i915/intel_vdsc.c index c56ba0e04044..48537827616f 100644 --- a/drivers/gpu/drm/i915/intel_vdsc.c +++ b/drivers/gpu/drm/i915/intel_vdsc.c @@ -6,7 +6,6 @@ * Manasi Navare manasi.d.navare@intel.com */
-#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h" #include "intel_drv.h" diff --git a/drivers/gpu/drm/i915/vlv_dsi.c b/drivers/gpu/drm/i915/vlv_dsi.c index 361e962a7969..bb1287020f80 100644 --- a/drivers/gpu/drm/i915/vlv_dsi.c +++ b/drivers/gpu/drm/i915/vlv_dsi.c @@ -23,7 +23,6 @@ * Author: Jani Nikula jani.nikula@intel.com */
-#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h>
Make it easier to drop drmP.h includes.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- include/drm/drm_legacy.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 8fad66f88e4f..743d7e70c896 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -2,6 +2,7 @@ #define __DRM_DRM_LEGACY_H__
#include <drm/drm_auth.h> +#include <drm/drm_device.h>
/* * Legacy driver interfaces for the Direct Rendering Manager
On Thu, Dec 27, 2018 at 02:56:41PM +0200, Jani Nikula wrote:
Needs just a few additional includes here and there.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
lgtm, but didn't try to second-guess gcc :-)
Acked-by: Daniel Vetter daniel.vetter@ffwll.ch
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 :-)
Cheers, Daniel
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(-)
diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h index 5e6a3013da49..16e0345b711f 100644 --- a/drivers/gpu/drm/i915/dvo.h +++ b/drivers/gpu/drm/i915/dvo.h @@ -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"
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index caa055ac9472..88b72a8e350f 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -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> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index d44255a8655e..c314eb4cda07 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -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" diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index d92147ab4489..da59b4211150 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -25,7 +25,6 @@
*/
-#include <drm/drmP.h> #include <drm/drm_vma_manager.h> #include <drm/i915_drm.h> #include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 5905b6d8f291..5933adbe3d99 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -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" diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c index 82e2ca17a441..02f7298bfe57 100644 --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -27,7 +27,6 @@ #include <linux/dma-buf.h> #include <linux/reservation.h>
-#include <drm/drmP.h>
#include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c index 02b83a5ed96c..f6855401f247 100644 --- a/drivers/gpu/drm/i915/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/i915_gem_evict.c @@ -26,7 +26,6 @@
*/
-#include <drm/drmP.h> #include <drm/i915_drm.h>
#include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 7314074d4680..e07a36fd3df5 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -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>
diff --git a/drivers/gpu/drm/i915/i915_gem_fence_reg.c b/drivers/gpu/drm/i915/i915_gem_fence_reg.c index 24df2e2a8fc1..d67c07cdd0b8 100644 --- a/drivers/gpu/drm/i915/i915_gem_fence_reg.c +++ b/drivers/gpu/drm/i915/i915_gem_fence_reg.c @@ -21,7 +21,6 @@
- IN THE SOFTWARE.
*/
-#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 4ed2f3e61347..d69ede138ff3 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -33,7 +33,6 @@
#include <asm/set_memory.h>
-#include <drm/drmP.h> #include <drm/i915_drm.h>
#include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/i915_gem_internal.c b/drivers/gpu/drm/i915/i915_gem_internal.c index 0d0144b2104c..fddde1033e74 100644 --- a/drivers/gpu/drm/i915/i915_gem_internal.c +++ b/drivers/gpu/drm/i915/i915_gem_internal.c @@ -22,7 +22,6 @@
*/
-#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_gem_object.h b/drivers/gpu/drm/i915/i915_gem_object.h index a6dd7c46de0d..ff3da64470dd 100644 --- a/drivers/gpu/drm/i915/i915_gem_object.h +++ b/drivers/gpu/drm/i915/i915_gem_object.h @@ -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>
diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c index ea90d3a0d511..73430716c16e 100644 --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c @@ -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" diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 2f756a97689a..9df615eea2d8 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -26,7 +26,6 @@
*/
-#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index 39319ff1679c..16cc9ddbce34 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c @@ -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"
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c index 2c9b284036d1..7cc3cdec87b8 100644 --- a/drivers/gpu/drm/i915/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c @@ -22,7 +22,6 @@
*/
-#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h" #include "i915_trace.h" diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c index 0e5c580d117c..7c2de5d1914b 100644 --- a/drivers/gpu/drm/i915/i915_ioc32.c +++ b/drivers/gpu/drm/i915/i915_ioc32.c @@ -28,7 +28,6 @@ */ #include <linux/compat.h>
-#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 0c7fc9890891..b1b8bbeb23f4 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -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" diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index f40ba5e429e0..f18afa2bac8d 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -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" diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index b50c6b829715..a1873c69798d 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -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" diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c index 6ba478e57b9b..9d142d038a7d 100644 --- a/drivers/gpu/drm/i915/intel_acpi.c +++ b/drivers/gpu/drm/i915/intel_acpi.c @@ -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... */ diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index fdfc7425e644..d8dbc9980281 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c index 0a73e6e65c20..683a75dad4fb 100644 --- a/drivers/gpu/drm/i915/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index 0571aa2846a7..202a58cf2d9f 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -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"
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 764d84d4109b..140c218128cb 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -26,7 +26,6 @@ */
#include <drm/drm_dp_helper.h> -#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/intel_connector.c b/drivers/gpu/drm/i915/intel_connector.c index 18e370f607bc..4f4ffd1c8fd3 100644 --- a/drivers/gpu/drm/i915/intel_connector.c +++ b/drivers/gpu/drm/i915/intel_connector.c @@ -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"
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 0a41e58d61de..951e9bae6921 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f0b480fba980..f55282747326 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 62fd11540942..d3cd40e656fe 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index f05427b74e34..4eae81671b0e 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -23,7 +23,6 @@
*/
-#include <drm/drmP.h> #include "i915_drv.h" #include "intel_drv.h" #include <drm/drm_atomic_helper.h> diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h index d968f1f13e09..fc7a09049f81 100644 --- a/drivers/gpu/drm/i915/intel_dsi.h +++ b/drivers/gpu/drm/i915/intel_dsi.h @@ -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" diff --git a/drivers/gpu/drm/i915/intel_dsi_vbt.c b/drivers/gpu/drm/i915/intel_dsi_vbt.c index a1a8b3790e61..6adffc6e096b 100644 --- a/drivers/gpu/drm/i915/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/intel_dsi_vbt.c @@ -24,7 +24,6 @@
*/
-#include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h> #include <drm/i915_drm.h> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c index 0042a7f69387..bc3c3cb57ec6 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index fb5bb5b32a60..a0c5046e170c 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/intel_frontbuffer.c index c3379bde266f..16f253deaf8d 100644 --- a/drivers/gpu/drm/i915/intel_frontbuffer.c +++ b/drivers/gpu/drm/i915/intel_frontbuffer.c @@ -60,7 +60,6 @@
- functions is deprecated and should be avoided.
*/
-#include <drm/drmP.h>
#include "intel_drv.h" #include "intel_frontbuffer.h" diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c index e000e54ad569..3fcb3b775948 100644 --- a/drivers/gpu/drm/i915/intel_hdcp.c +++ b/drivers/gpu/drm/i915/intel_hdcp.c @@ -6,7 +6,6 @@
- Sean Paul seanpaul@chromium.org
*/
-#include <drm/drmP.h> #include <drm/drm_hdcp.h> #include <linux/i2c.h> #include <linux/random.h> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 07e803a604bd..14a0c28fe7c1 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c index e24174d08fed..ae92d6560165 100644 --- a/drivers/gpu/drm/i915/intel_hotplug.c +++ b/drivers/gpu/drm/i915/intel_hotplug.c @@ -23,7 +23,6 @@
#include <linux/kernel.h>
-#include <drm/drmP.h> #include <drm/i915_drm.h>
#include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index 802d0394ccc4..c6159aff9dc8 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index b05d0561f99a..0cdad6e5730c 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index b85e195f7c8a..6adcc8d037bf 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_mocs.h b/drivers/gpu/drm/i915/intel_mocs.h index d89080d75b80..3d99d1271b2b 100644 --- a/drivers/gpu/drm/i915/intel_mocs.h +++ b/drivers/gpu/drm/i915/intel_mocs.h @@ -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); diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index b8f106d9ecf8..30ae96c5c97c 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index c153be043078..c81db81e4416 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c index dce39f06b682..0f6b2b4702e3 100644 --- a/drivers/gpu/drm/i915/intel_psr.c +++ b/drivers/gpu/drm/i915/intel_psr.c @@ -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" diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 65fd92eb071d..d893afe84281 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -29,7 +29,6 @@
#include <linux/log2.h>
-#include <drm/drmP.h> #include <drm/i915_drm.h>
#include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 5805ec1aba12..b08fed11219f 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index f70d2c607902..8f3982c03925 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 860f306a23ba..d7a414ce2774 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -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> diff --git a/drivers/gpu/drm/i915/intel_vdsc.c b/drivers/gpu/drm/i915/intel_vdsc.c index c56ba0e04044..48537827616f 100644 --- a/drivers/gpu/drm/i915/intel_vdsc.c +++ b/drivers/gpu/drm/i915/intel_vdsc.c @@ -6,7 +6,6 @@
Manasi Navare <manasi.d.navare@intel.com>*/
-#include <drm/drmP.h> #include <drm/i915_drm.h> #include "i915_drv.h" #include "intel_drv.h" diff --git a/drivers/gpu/drm/i915/vlv_dsi.c b/drivers/gpu/drm/i915/vlv_dsi.c index 361e962a7969..bb1287020f80 100644 --- a/drivers/gpu/drm/i915/vlv_dsi.c +++ b/drivers/gpu/drm/i915/vlv_dsi.c @@ -23,7 +23,6 @@
- Author: Jani Nikula jani.nikula@intel.com
*/
-#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h>
#include <drm/drm_edid.h>
2.11.0
On Thu, Dec 27, 2018 at 02:56:36PM +0200, Jani Nikula wrote:
Make it easier to drop drmP.h includes.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
include/drm/drm_legacy.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 8fad66f88e4f..743d7e70c896 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -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
/*
- Legacy driver interfaces for the Direct Rendering Manager
-- 2.11.0
On Thu, 27 Dec 2018, Daniel Vetter daniel@ffwll.ch wrote:
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).
BR, Jani.
On Thu, Dec 27, 2018 at 05:04:20PM +0100, Daniel Vetter wrote:
On Thu, Dec 27, 2018 at 02:56:36PM +0200, Jani Nikula wrote:
Make it easier to drop drmP.h includes.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
include/drm/drm_legacy.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 8fad66f88e4f..743d7e70c896 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -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.
Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch with the forward decl (assuming it all works out). -Daniel
-Daniel
/*
- Legacy driver interfaces for the Direct Rendering Manager
-- 2.11.0
-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
On Thu, Dec 27, 2018 at 06:27:53PM +0200, Jani Nikula wrote:
On Thu, 27 Dec 2018, Daniel Vetter daniel@ffwll.ch wrote:
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).
In a reasonable project I'd urge you to send the fix, but given my last endevaour into touching linux/kernel.h I can't really recommend that :-/ -Daniel
On Thu, 27 Dec 2018, Daniel Vetter daniel@ffwll.ch wrote:
On Thu, Dec 27, 2018 at 05:04:20PM +0100, Daniel Vetter wrote:
On Thu, Dec 27, 2018 at 02:56:36PM +0200, Jani Nikula wrote:
Make it easier to drop drmP.h includes.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
include/drm/drm_legacy.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 8fad66f88e4f..743d7e70c896 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -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.
Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch 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.
-Daniel
-Daniel
/*
- Legacy driver interfaces for the Direct Rendering Manager
-- 2.11.0
-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
On Fri, Dec 28, 2018 at 10:23:00AM +0200, Jani Nikula wrote:
On Thu, 27 Dec 2018, Daniel Vetter daniel@ffwll.ch wrote:
On Thu, Dec 27, 2018 at 05:04:20PM +0100, Daniel Vetter wrote:
On Thu, Dec 27, 2018 at 02:56:36PM +0200, Jani Nikula wrote:
Make it easier to drop drmP.h includes.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
include/drm/drm_legacy.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 8fad66f88e4f..743d7e70c896 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -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.
Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch 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().
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 daniel.vetter@ffwll.ch on either your v1 or a patch that deinlines the offending function and just uses a forward decl.
Cheers, Daniel
BR, Jani.
-Daniel
-Daniel
/*
- Legacy driver interfaces for the Direct Rendering Manager
-- 2.11.0
-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
-- Jani Nikula, Intel Open Source Graphics Center
On Fri, 28 Dec 2018, Daniel Vetter daniel@ffwll.ch wrote:
On Fri, Dec 28, 2018 at 10:23:00AM +0200, Jani Nikula wrote:
On Thu, 27 Dec 2018, Daniel Vetter daniel@ffwll.ch wrote:
On Thu, Dec 27, 2018 at 05:04:20PM +0100, Daniel Vetter wrote:
On Thu, Dec 27, 2018 at 02:56:36PM +0200, Jani Nikula wrote:
Make it easier to drop drmP.h includes.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
include/drm/drm_legacy.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 8fad66f88e4f..743d7e70c896 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -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.
Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch 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().
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 daniel.vetter@ffwll.ch on either your v1 or a patch that deinlines the offending function and just uses a forward decl.
It'll still require drm_hashtab.h include, but less intrusive than drm_device.h I guess. Patch sent.
BR, Jani.
Cheers, Daniel
BR, Jani.
-Daniel
-Daniel
/*
- Legacy driver interfaces for the Direct Rendering Manager
-- 2.11.0
-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
-- 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 sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- drivers/gpu/drm/drm_bufs.c | 11 +++++++++++ include/drm/drm_legacy.h | 14 ++++---------- 2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index d7d10cabb9bb..a39ab2193bfe 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -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. diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 8fad66f88e4f..3e99ab69c122 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -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__ */
On Fri, Dec 28, 2018 at 03:04:46PM +0200, Jani Nikula wrote:
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 sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch
drivers/gpu/drm/drm_bufs.c | 11 +++++++++++ include/drm/drm_legacy.h | 14 ++++---------- 2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index d7d10cabb9bb..a39ab2193bfe 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -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.
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 8fad66f88e4f..3e99ab69c122 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -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__ */
2.11.0
Hi Jani,
Thank you for the patch.
On Friday, 28 December 2018 15:04:46 EET Jani Nikula wrote:
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)
It would be nice to explain why you de-inline the function (I assume because it's a bit too large).
Reviewed-by: Laurent Pinchart laurent.pinchart@ideasonboard.com
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
drivers/gpu/drm/drm_bufs.c | 11 +++++++++++ include/drm/drm_legacy.h | 14 ++++---------- 2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index d7d10cabb9bb..a39ab2193bfe 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -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.
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 8fad66f88e4f..3e99ab69c122 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -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__ */
Make it easier to drop drmP.h includes.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- include/drm/intel-gtt.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h index 2324c84a25c0..71d81923e6b0 100644 --- a/include/drm/intel-gtt.h +++ b/include/drm/intel-gtt.h @@ -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);
On Thu, Dec 27, 2018 at 02:56:37PM +0200, Jani Nikula wrote:
Make it easier to drop drmP.h includes.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
Makes sense.
Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch
include/drm/intel-gtt.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h index 2324c84a25c0..71d81923e6b0 100644 --- a/include/drm/intel-gtt.h +++ b/include/drm/intel-gtt.h @@ -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); -- 2.11.0
Make it easier to drop drmP.h includes.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- include/drm/drm_file.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h index 84ac79219e4c..6710b612e2f6 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -32,6 +32,7 @@
#include <linux/types.h> #include <linux/completion.h> +#include <linux/idr.h>
#include <uapi/drm/drm.h>
On Thu, Dec 27, 2018 at 02:56:38PM +0200, Jani Nikula wrote:
Make it easier to drop drmP.h includes.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
include/drm/drm_file.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h index 84ac79219e4c..6710b612e2f6 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -32,6 +32,7 @@
#include <linux/types.h> #include <linux/completion.h> +#include <linux/idr.h>
Yup, we embed the struct idr.
Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch
#include <uapi/drm/drm.h>
-- 2.11.0
Hi Jani,
Thank you for the patch.
On Thursday, 27 December 2018 14:56:38 EET Jani Nikula wrote:
Make it easier to drop drmP.h includes.
How about explaining why idr.h is needed ?
"drm_file.h embeds idr structures in DRM-specific structures. Include the corresponding header to make drm_file.h self-contained."
Reviewed-by: Laurent Pinchart laurent.pinchart@ideasonboard.com
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
include/drm/drm_file.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h index 84ac79219e4c..6710b612e2f6 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -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 sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- include/drm/drm_hdcp.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h index a6de09c5e47f..d6dfef8cff6a 100644 --- a/include/drm/drm_hdcp.h +++ b/include/drm/drm_hdcp.h @@ -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)
On Thu, Dec 27, 2018 at 02:56:39PM +0200, Jani Nikula wrote:
Make it easier to drop drmP.h includes.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch
include/drm/drm_hdcp.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h index a6de09c5e47f..d6dfef8cff6a 100644 --- a/include/drm/drm_hdcp.h +++ b/include/drm/drm_hdcp.h @@ -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)
-- 2.11.0
Hi Jani,
Thank you for the patch.
On Thursday, 27 December 2018 14:56:39 EET Jani Nikula wrote:
Make it easier to drop drmP.h includes.
Same comment as for the previous patches, let's explain the reason.
"drm_hdcp.h uses kernel integer types, make it self-contained by including linux/kernel.h. This prepares for dropping drmP.h from files including drm_hdcp.h."
Reviewed-by: Laurent Pinchart laurent.pinchart@ideasonboard.com
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
include/drm/drm_hdcp.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h index a6de09c5e47f..d6dfef8cff6a 100644 --- a/include/drm/drm_hdcp.h +++ b/include/drm/drm_hdcp.h @@ -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.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- include/drm/drm_syncobj.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h index 7c6ed845c70d..93884da3f9fe 100644 --- a/include/drm/drm_syncobj.h +++ b/include/drm/drm_syncobj.h @@ -26,7 +26,9 @@ #ifndef __DRM_SYNCOBJ_H__ #define __DRM_SYNCOBJ_H__
-#include "linux/dma-fence.h" +#include <linux/dma-fence.h> + +#include <drm/drm_file.h>
/** * struct drm_syncobj - sync object.
On Thu, Dec 27, 2018 at 02:56:40PM +0200, Jani Nikula wrote:
Make it easier to drop drmP.h includes. Switch from "" to <> includes while at it.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Signed-off-by: Jani Nikula jani.nikula@intel.com
include/drm/drm_syncobj.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h index 7c6ed845c70d..93884da3f9fe 100644 --- a/include/drm/drm_syncobj.h +++ b/include/drm/drm_syncobj.h @@ -26,7 +26,9 @@ #ifndef __DRM_SYNCOBJ_H__ #define __DRM_SYNCOBJ_H__
-#include "linux/dma-fence.h" +#include <linux/dma-fence.h>
+#include <drm/drm_file.h>
I think you need only a
struct drm_file;
pre-decl instead of the full include. With that:
Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch
/**
- struct drm_syncobj - sync object.
-- 2.11.0
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 sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch Signed-off-by: Jani Nikula jani.nikula@intel.com --- include/drm/drm_syncobj.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h index 7c6ed845c70d..0311c9fdbd2f 100644 --- a/include/drm/drm_syncobj.h +++ b/include/drm/drm_syncobj.h @@ -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.
Hi Jani,
Thank you for the patch.
On Friday, 28 December 2018 10:28:15 EET Jani Nikula wrote:
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)
Reviewed-by: Laurent Pinchart laurent.pinchart@ideasonboard.com
but with the same comments as for the previous patches.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Daniel Vetter daniel@ffwll.ch Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch Signed-off-by: Jani Nikula jani.nikula@intel.com
include/drm/drm_syncobj.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h index 7c6ed845c70d..0311c9fdbd2f 100644 --- a/include/drm/drm_syncobj.h +++ b/include/drm/drm_syncobj.h @@ -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.
On Thu, 27 Dec 2018, Jani Nikula jani.nikula@intel.com 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.
[1] https://patchwork.freedesktop.org/series/54464/
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
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(-)
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
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.
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
dri-devel@lists.freedesktop.org
-
Daniel Vetter -
Jani Nikula -
Laurent Pinchart -
Sam Ravnborg