Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit feea39a8 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Rob Clark
Browse files

drm/msm: drop use of drmP.h 

Drop the deprecated drmP.h header file, and trim msm_drv.h
to the relevant include files.

This resulted in a suprisingly many edits as many files relied
on headers included via msm_drv.h.
But msm_drv.h is not supposed to carry include files it do not need, so
the individual files have to include what extra they needs.

v2:
- Rebased on top of https://gitlab.freedesktop.org/drm/msm.git

 msm-next

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Jordan Crouse <jcrouse@codeaurora.org>
Cc: Jeykumar Sankaran <jsanka@codeaurora.org>
Cc: Bruce Wang <bzwang@chromium.org>
Cc: Shayenne Moura <shayenneluzmoura@gmail.com>
Cc: Mamta Shukla <mamtashukla555@gmail.com>
Cc: Jonathan Marek <jonathan@marek.ca>
Cc: Carsten Behling <carsten.behling@googlemail.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Cc: Sibi Sankar <sibis@codeaurora.org>
Cc: Todor Tomov <todor.tomov@linaro.org>
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190804065551.GA5211@ravnborg.org
parent c7eb7c12

drivers/gpu/drm/msm/adreno/a5xx_debugfs.c

+3 −1
Original line number Diff line number Diff line
@@ -2,9 +2,11 @@ 
/* Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.

 */





#include <linux/types.h>

#include <linux/debugfs.h>



#include <drm/drm_debugfs.h>

#include <drm/drm_file.h>

#include <drm/drm_print.h>



#include "a5xx_gpu.h"

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

+2 −0
Original line number Diff line number Diff line
@@ -9,11 +9,13 @@ 
#include <linux/sort.h>

#include <linux/debugfs.h>

#include <linux/ktime.h>



#include <drm/drm_crtc.h>

#include <drm/drm_flip_work.h>

#include <drm/drm_mode.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_rect.h>

#include <drm/drm_vblank.h>



#include "dpu_kms.h"

#include "dpu_hw_lm.h"

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

+5 −3
Original line number Diff line number Diff line
@@ -6,14 +6,16 @@ 
 */



#define pr_fmt(fmt)	"[drm:%s:%d] " fmt, __func__, __LINE__

#include <linux/kthread.h>

#include <linux/debugfs.h>

#include <linux/kthread.h>

#include <linux/seq_file.h>



#include "msm_drv.h"

#include "dpu_kms.h"

#include <drm/drm_crtc.h>

#include <drm/drm_file.h>

#include <drm/drm_probe_helper.h>



#include "msm_drv.h"

#include "dpu_kms.h"

#include "dpu_hwio.h"

#include "dpu_hw_catalog.h"

#include "dpu_hw_intf.h"

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/bug.h>

#include <linux/bitmap.h>

#include <linux/err.h>

#include <drm/drmP.h>



/**

 * Max hardware block count: For ex: max 12 SSPP pipes or

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+4 −2
Original line number Diff line number Diff line
@@ -7,10 +7,12 @@ 


#define pr_fmt(fmt)	"[drm:%s:%d] " fmt, __func__, __LINE__



#include <drm/drm_crtc.h>

#include <linux/debugfs.h>

#include <linux/of_irq.h>

#include <linux/dma-buf.h>

#include <linux/of_irq.h>



#include <drm/drm_crtc.h>

#include <drm/drm_file.h>



#include "msm_drv.h"

#include "msm_mmu.h"