drm/msm: drop use of drmP.h
Subsystems (4)
PATCH v2 1/1 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
--- drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +++- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 +++++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 ++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 1 + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 1 + drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c | 1 + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 3 +++ drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 2 ++ drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 ++ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 3 +++ drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c | 1 + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 6 ++++++ drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 ++ drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 1 + drivers/gpu/drm/msm/dsi/dsi_host.c | 8 +++++--- drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 2 ++ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 ++ drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 2 +- drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 ++ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 1 + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 1 + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 2 ++ drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 2 ++ drivers/gpu/drm/msm/msm_atomic.c | 1 + drivers/gpu/drm/msm/msm_debugfs.c | 5 +++++ drivers/gpu/drm/msm/msm_drv.c | 10 +++++++++- drivers/gpu/drm/msm/msm_drv.h | 1 - drivers/gpu/drm/msm/msm_fb.c | 2 ++ drivers/gpu/drm/msm/msm_fbdev.c | 1 + drivers/gpu/drm/msm/msm_gem.c | 2 ++ drivers/gpu/drm/msm/msm_gem_prime.c | 6 ++++-- drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++++ drivers/gpu/drm/msm/msm_gpummu.c | 2 ++ drivers/gpu/drm/msm/msm_perf.c | 3 +++ drivers/gpu/drm/msm/msm_rd.c | 7 +++++-- drivers/gpu/drm/msm/msm_submitqueue.c | 2 ++ 40 files changed, 99 insertions(+), 18 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_debugfs.c +3 -1
@@ -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
@@ -20,11 +20,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
@@ -17,14 +17,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
@@ -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
@@ -18,10 +18,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"
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +2 -0
@@ -19,6 +19,8 @@#ifndef __DPU_KMS_H__#define __DPU_KMS_H__ +#include <drm/drm_drv.h> +#include "msm_drv.h" #include "msm_kms.h" #include "msm_mmu.h"
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +2 -1
@@ -21,8 +21,9 @@#include <linux/debugfs.h> #include <linux/dma-buf.h> -#include <drm/drm_damage_helper.h> #include <drm/drm_atomic_uapi.h> +#include <drm/drm_damage_helper.h> +#include <drm/drm_file.h> #include "msm_drv.h" #include "dpu_kms.h"
drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c +1 -0
@@ -5,6 +5,7 @@#define pr_fmt (fmt) "[drm:%s:%d] " fmt, __func__, __LINE__#include <linux/debugfs.h> +#include <linux/delay.h> #include "dpu_vbif.h" #include "dpu_hw_vbif.h"
drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +1 -0
@@ -19,6 +19,7 @@#include <drm/drm_flip_work.h> #include <drm/drm_mode.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "mdp4_kms.h"
drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c +1 -0
@@ -16,6 +16,7 @@*/ #include <drm/drm_print.h> +#include <drm/drm_vblank.h> #include "msm_drv.h" #include "mdp4_kms.h"
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +3 -0
@@ -15,6 +15,9 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> + +#include <drm/drm_vblank.h> #include "msm_drv.h" #include "msm_gem.h"
drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c +2 -0
@@ -16,6 +16,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> +#include <drm/drm_crtc.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +2 -0
@@ -16,6 +16,8 @@*/ #include <drm/drm_damage_helper.h> +#include <drm/drm_fourcc.h> +#include "mdp4_kms.h" #define DOWN_SCALE_MAX 8
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +3 -0
@@ -17,10 +17,13 @@*/ #include <linux/sort.h> +#include <drm/drm_mode.h> #include <drm/drm_crtc.h> #include <drm/drm_flip_work.h> +#include <drm/drm_fourcc.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "mdp5_kms.h"
drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c +1 -0
@@ -18,6 +18,7 @@#include <linux/irq.h> #include <drm/drm_print.h> +#include <drm/drm_vblank.h> #include "msm_drv.h" #include "mdp5_kms.h"
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +6 -0
@@ -16,9 +16,15 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> #include <linux/interconnect.h> #include <linux/of_irq.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_vblank.h> +#include "msm_drv.h" #include "msm_gem.h" #include "msm_mmu.h"
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +2 -0
@@ -17,7 +17,9 @@*/ #include <drm/drm_damage_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_print.h> +#include "mdp5_kms.h" struct mdp5_plane {
drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c +1 -0
@@ -16,6 +16,7 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <drm/drm_fourcc.h> #include <drm/drm_util.h> #include "mdp5_kms.h"
drivers/gpu/drm/msm/dsi/dsi_host.c +5 -3
@@ -5,19 +5,21 @@#include <linux/clk.h> #include <linux/delay.h> +#include <linux/dma-mapping.h> #include <linux/err.h> #include <linux/gpio.h> #include <linux/gpio/consumer.h> #include <linux/interrupt.h> +#include <linux/mfd/syscon.h> #include <linux/of_device.h> #include <linux/of_gpio.h> +#include <linux/of_graph.h> #include <linux/of_irq.h> #include <linux/pinctrl/consumer.h> -#include <linux/of_graph.h> +#include <linux/regmap.h> #include <linux/regulator/consumer.h> #include <linux/spinlock.h> -#include <linux/mfd/syscon.h> -#include <linux/regmap.h> +#include <video/mipi_display.h> #include "dsi.h"
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c +2 -0
@@ -3,6 +3,8 @@* Copyright (c) 2016, The Linux Foundation. All rights reserved. */ +#include <linux/delay.h> +#include "dsi_phy.h" #include "dsi.xml.h"
drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c +2 -0
@@ -3,6 +3,8 @@* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved. */ +#include <linux/delay.h> +#include "dsi_phy.h" #include "dsi.xml.h"
drivers/gpu/drm/msm/dsi/pll/dsi_pll.h +1 -1
@@ -6,8 +6,8 @@#ifndef __DSI_PLL_H__#define __DSI_PLL_H__ -#include <linux/clk.h> #include <linux/clk-provider.h> +#include <linux/delay.h> #include "dsi.h"
drivers/gpu/drm/msm/hdmi/hdmi_bridge.c +2 -0
@@ -15,6 +15,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> +#include "hdmi.h" struct hdmi_bridge {
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +1 -0
@@ -15,6 +15,7 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> #include <linux/gpio.h> #include <linux/pinctrl/consumer.h>
drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c +1 -0
@@ -4,6 +4,7 @@*/ #include <linux/clk-provider.h> +#include <linux/delay.h> #include "hdmi.h"
drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c +2 -0
@@ -15,6 +15,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> +#include "hdmi.h" static void hdmi_phy_8x60_powerup(struct hdmi_phy *phy,
drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c +2 -0
@@ -17,6 +17,8 @@*/ #include <linux/clk-provider.h> +#include <linux/delay.h> +#include "hdmi.h" struct hdmi_pll_8960 {
drivers/gpu/drm/msm/msm_atomic.c +1 -0
@@ -16,6 +16,7 @@*/ #include <drm/drm_atomic_uapi.h> +#include <drm/drm_vblank.h> #include "msm_drv.h" #include "msm_gem.h"
drivers/gpu/drm/msm/msm_debugfs.c +5 -0
@@ -16,7 +16,12 @@*/ #ifdef CONFIG_DEBUG_FS +#include <linux/debugfs.h> + +#include <drm/drm_debugfs.h> +#include <drm/drm_file.h> +#include "msm_drv.h" #include "msm_gpu.h" #include "msm_kms.h"
drivers/gpu/drm/msm/msm_drv.c +9 -1
@@ -16,9 +16,18 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/dma-mapping.h> #include <linux/kthread.h> +#include <linux/uaccess.h> #include <uapi/linux/sched/types.h> + +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_ioctl.h> +#include <drm/drm_irq.h> +#include <drm/drm_prime.h> #include <drm/drm_of.h> +#include <drm/drm_vblank.h> #include "msm_drv.h" #include "msm_debugfs.h"
@@ -28,7 +37,6 @@#include "msm_kms.h" #include "adreno/adreno_gpu.h" -/* * MSM driver version: * - 1.0.0 - initial interface
drivers/gpu/drm/msm/msm_drv.h +0 -1
@@ -36,7 +36,6 @@#include <linux/sizes.h> #include <linux/kthread.h> -#include <drm/drmP.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_plane_helper.h>
drivers/gpu/drm/msm/msm_fb.c +2 -0
@@ -17,6 +17,8 @@#include <drm/drm_crtc.h> #include <drm/drm_damage_helper.h> +#include <drm/drm_file.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/msm/msm_fbdev.c +1 -0
@@ -17,6 +17,7 @@#include <drm/drm_crtc.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include "msm_drv.h" #include "msm_kms.h"
drivers/gpu/drm/msm/msm_gem.c +2 -0
@@ -20,6 +20,8 @@#include <linux/dma-buf.h> #include <linux/pfn_t.h> +#include <drm/drm_prime.h> +#include "msm_drv.h" #include "msm_fence.h" #include "msm_gem.h"
drivers/gpu/drm/msm/msm_gem_prime.c +4 -2
@@ -15,11 +15,13 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/dma-buf.h> + +#include <drm/drm_prime.h> +#include "msm_drv.h" #include "msm_gem.h" -#include <linux/dma-buf.h> -struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj) {struct msm_gem_object *msm_obj =to_msm_bo (obj);
drivers/gpu/drm/msm/msm_gem_submit.c +4 -0
@@ -15,7 +15,11 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/file.h> #include <linux/sync_file.h> +#include <linux/uaccess.h> + +#include <drm/drm_file.h> #include "msm_drv.h" #include "msm_gpu.h"
drivers/gpu/drm/msm/msm_gpummu.c +2 -0
@@ -1,6 +1,8 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2018 The Linux Foundation. All rights reserved. */ +#include <linux/dma-mapping.h> +#include "msm_drv.h" #include "msm_mmu.h" #include "adreno/adreno_gpu.h"
drivers/gpu/drm/msm/msm_perf.c +3 -0
@@ -26,6 +26,9 @@#ifdef CONFIG_DEBUG_FS #include <linux/debugfs.h> +#include <linux/uaccess.h> + +#include <drm/drm_file.h> #include "msm_drv.h" #include "msm_gpu.h"
drivers/gpu/drm/msm/msm_rd.c +5 -2
@@ -42,11 +42,14 @@#ifdef CONFIG_DEBUG_FS -#include <linux/kfifo.h> -#include <linux/debugfs.h> #include <linux/circ_buf.h> +#include <linux/debugfs.h> +#include <linux/kfifo.h> +#include <linux/uaccess.h> #include <linux/wait.h> +#include <drm/drm_file.h> +#include "msm_drv.h" #include "msm_gpu.h" #include "msm_gem.h"
drivers/gpu/drm/msm/msm_submitqueue.c +2 -0
@@ -3,6 +3,8 @@*/ #include <linux/kref.h> +#include <linux/uaccess.h> +#include "msm_gpu.h" void msm_submitqueue_destroy (struct kref *kref)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
Acked-byQuoted 8 lines · Sam Ravnborg
Drop the deprecated
drmP.hheader file, and trimmsm_drv.hto the relevant include files.This resulted in a suprisingly many edits as many files relied on headers included via
msm_drv.h.
Butmsm_drv.his not supposed to carry include files it do not need, so the individual files have to include what extra they needs.
Quoted 4 lines
v2:
- Rebased on top of https://gitlab.freedesktop.org/drm/msm.git msm-nextSigned-off-by Sam Ravnborg <[email protected]>
Quoted 673 lines
Cc Rob Clark <[email protected]>Cc Sean Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Jordan Crouse <[email protected]>Cc Jeykumar Sankaran <[email protected]>Cc Bruce Wang <[email protected]>Cc Shayenne Moura <[email protected]>Cc Mamta Shukla <[email protected]>Cc Jonathan Marek <[email protected]>Cc Carsten Behling <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Paul Kocialkowski <[email protected]>Cc Sibi Sankar <[email protected]>Cc Todor Tomov <[email protected]>--- drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +++- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 +++++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 ++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 1 + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 1 + drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c | 1 + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 3 +++ drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 2 ++ drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 ++ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 3 +++ drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c | 1 + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 6 ++++++ drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 ++ drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 1 + drivers/gpu/drm/msm/dsi/dsi_host.c | 8 +++++--- drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 2 ++ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 ++ drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 2 +- drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 ++ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 1 + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 1 + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 2 ++ drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 2 ++ drivers/gpu/drm/msm/msm_atomic.c | 1 + drivers/gpu/drm/msm/msm_debugfs.c | 5 +++++ drivers/gpu/drm/msm/msm_drv.c | 10 +++++++++- drivers/gpu/drm/msm/msm_drv.h | 1 - drivers/gpu/drm/msm/msm_fb.c | 2 ++ drivers/gpu/drm/msm/msm_fbdev.c | 1 + drivers/gpu/drm/msm/msm_gem.c | 2 ++ drivers/gpu/drm/msm/msm_gem_prime.c | 6 ++++-- drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++++ drivers/gpu/drm/msm/msm_gpummu.c | 2 ++ drivers/gpu/drm/msm/msm_perf.c | 3 +++ drivers/gpu/drm/msm/msm_rd.c | 7 +++++-- drivers/gpu/drm/msm/msm_submitqueue.c | 2 ++ 40 files changed, 99 insertions(+), 18 deletions(-)drivers/gpu/drm/msm/adreno/a5xx_debugfs.c +3
-1@@ -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@@ -20,11 +20,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@@ -17,14 +17,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@@ -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@@ -18,10 +18,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" drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +2
-0@@ -19,6 +19,8 @@#ifndef __DPU_KMS_H__#define __DPU_KMS_H__ +#include <drm/drm_drv.h> +#include "msm_drv.h" #include "msm_kms.h" #include "msm_mmu.h" drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +2
-1@@ -21,8 +21,9 @@#include <linux/debugfs.h> #include <linux/dma-buf.h> -#include <drm/drm_damage_helper.h> #include <drm/drm_atomic_uapi.h> +#include <drm/drm_damage_helper.h> +#include <drm/drm_file.h> #include "msm_drv.h" #include "dpu_kms.h" drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c +1
-0@@ -5,6 +5,7 @@#define pr_fmt (fmt) "[drm:%s:%d] " fmt, __func__, __LINE__#include <linux/debugfs.h> +#include <linux/delay.h> #include "dpu_vbif.h" #include "dpu_hw_vbif.h" drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +1
-0@@ -19,6 +19,7 @@#include <drm/drm_flip_work.h> #include <drm/drm_mode.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "mdp4_kms.h" drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c +1
-0@@ -16,6 +16,7 @@*/ #include <drm/drm_print.h> +#include <drm/drm_vblank.h> #include "msm_drv.h" #include "mdp4_kms.h" drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +3
-0@@ -15,6 +15,9 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> + +#include <drm/drm_vblank.h> #include "msm_drv.h" #include "msm_gem.h" drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c +2
-0@@ -16,6 +16,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> +#include <drm/drm_crtc.h> #include <drm/drm_probe_helper.h> drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +2
-0@@ -16,6 +16,8 @@*/ #include <drm/drm_damage_helper.h> +#include <drm/drm_fourcc.h> +#include "mdp4_kms.h" #define DOWN_SCALE_MAX 8drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +3
-0@@ -17,10 +17,13 @@*/ #include <linux/sort.h> +#include <drm/drm_mode.h> #include <drm/drm_crtc.h> #include <drm/drm_flip_work.h> +#include <drm/drm_fourcc.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "mdp5_kms.h" drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c +1
-0@@ -18,6 +18,7 @@#include <linux/irq.h> #include <drm/drm_print.h> +#include <drm/drm_vblank.h> #include "msm_drv.h" #include "mdp5_kms.h" drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +6
-0@@ -16,9 +16,15 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> #include <linux/interconnect.h> #include <linux/of_irq.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_vblank.h> +#include "msm_drv.h" #include "msm_gem.h" #include "msm_mmu.h" drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +2
-0@@ -17,7 +17,9 @@*/ #include <drm/drm_damage_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_print.h> +#include "mdp5_kms.h" struct mdp5_plane {drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c +1
-0@@ -16,6 +16,7 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <drm/drm_fourcc.h> #include <drm/drm_util.h> #include "mdp5_kms.h" drivers/gpu/drm/msm/dsi/dsi_host.c +5
-3@@ -5,19 +5,21 @@#include <linux/clk.h> #include <linux/delay.h> +#include <linux/dma-mapping.h> #include <linux/err.h> #include <linux/gpio.h> #include <linux/gpio/consumer.h> #include <linux/interrupt.h> +#include <linux/mfd/syscon.h> #include <linux/of_device.h> #include <linux/of_gpio.h> +#include <linux/of_graph.h> #include <linux/of_irq.h> #include <linux/pinctrl/consumer.h> -#include <linux/of_graph.h> +#include <linux/regmap.h> #include <linux/regulator/consumer.h> #include <linux/spinlock.h> -#include <linux/mfd/syscon.h> -#include <linux/regmap.h> +#include <video/mipi_display.h> #include "dsi.h" drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c +2
-0@@ -3,6 +3,8 @@* Copyright (c) 2016, The Linux Foundation. All rights reserved. */ +#include <linux/delay.h> +#include "dsi_phy.h" #include "dsi.xml.h" drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c +2
-0@@ -3,6 +3,8 @@* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved. */ +#include <linux/delay.h> +#include "dsi_phy.h" #include "dsi.xml.h" drivers/gpu/drm/msm/dsi/pll/dsi_pll.h +1
-1@@ -6,8 +6,8 @@#ifndef __DSI_PLL_H__#define __DSI_PLL_H__ -#include <linux/clk.h> #include <linux/clk-provider.h> +#include <linux/delay.h> #include "dsi.h" drivers/gpu/drm/msm/hdmi/hdmi_bridge.c +2
-0@@ -15,6 +15,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> +#include "hdmi.h" struct hdmi_bridge {drivers/gpu/drm/msm/hdmi/hdmi_connector.c +1
-0@@ -15,6 +15,7 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> #include <linux/gpio.h> #include <linux/pinctrl/consumer.h> drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c +1
-0@@ -4,6 +4,7 @@*/ #include <linux/clk-provider.h> +#include <linux/delay.h> #include "hdmi.h" drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c +2
-0@@ -15,6 +15,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> +#include "hdmi.h" static void hdmi_phy_8x60_powerup(struct hdmi_phy *phy,drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c +2
-0@@ -17,6 +17,8 @@*/ #include <linux/clk-provider.h> +#include <linux/delay.h> +#include "hdmi.h" struct hdmi_pll_8960 {drivers/gpu/drm/msm/msm_atomic.c +1
-0@@ -16,6 +16,7 @@*/ #include <drm/drm_atomic_uapi.h> +#include <drm/drm_vblank.h> #include "msm_drv.h" #include "msm_gem.h" drivers/gpu/drm/msm/msm_debugfs.c +5
-0@@ -16,7 +16,12 @@*/ #ifdef CONFIG_DEBUG_FS +#include <linux/debugfs.h> + +#include <drm/drm_debugfs.h> +#include <drm/drm_file.h> +#include "msm_drv.h" #include "msm_gpu.h" #include "msm_kms.h" drivers/gpu/drm/msm/msm_drv.c +9
-1@@ -16,9 +16,18 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/dma-mapping.h> #include <linux/kthread.h> +#include <linux/uaccess.h> #include <uapi/linux/sched/types.h> + +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_ioctl.h> +#include <drm/drm_irq.h> +#include <drm/drm_prime.h> #include <drm/drm_of.h> +#include <drm/drm_vblank.h> #include "msm_drv.h" #include "msm_debugfs.h" @@ -28,7 +37,6 @@#include "msm_kms.h" #include "adreno/adreno_gpu.h" -/* * MSM driver version: * - 1.0.0 - initial interface drivers/gpu/drm/msm/msm_drv.h +0
-1@@ -36,7 +36,6 @@#include <linux/sizes.h> #include <linux/kthread.h> -#include <drm/drmP.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_plane_helper.h> drivers/gpu/drm/msm/msm_fb.c +2
-0@@ -17,6 +17,8 @@#include <drm/drm_crtc.h> #include <drm/drm_damage_helper.h> +#include <drm/drm_file.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_probe_helper.h> drivers/gpu/drm/msm/msm_fbdev.c +1
-0@@ -17,6 +17,7 @@#include <drm/drm_crtc.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include "msm_drv.h" #include "msm_kms.h" drivers/gpu/drm/msm/msm_gem.c +2
-0@@ -20,6 +20,8 @@#include <linux/dma-buf.h> #include <linux/pfn_t.h> +#include <drm/drm_prime.h> +#include "msm_drv.h" #include "msm_fence.h" #include "msm_gem.h" drivers/gpu/drm/msm/msm_gem_prime.c +4
-2@@ -15,11 +15,13 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/dma-buf.h> + +#include <drm/drm_prime.h> +#include "msm_drv.h" #include "msm_gem.h" -#include <linux/dma-buf.h> -struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj) {struct msm_gem_object *msm_obj =to_msm_bo (obj);drivers/gpu/drm/msm/msm_gem_submit.c +4
-0@@ -15,7 +15,11 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/file.h> #include <linux/sync_file.h> +#include <linux/uaccess.h> + +#include <drm/drm_file.h> #include "msm_drv.h" #include "msm_gpu.h" drivers/gpu/drm/msm/msm_gpummu.c +2
-0@@ -1,6 +1,8 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2018 The Linux Foundation. All rights reserved. */ +#include <linux/dma-mapping.h> +#include "msm_drv.h" #include "msm_mmu.h" #include "adreno/adreno_gpu.h" drivers/gpu/drm/msm/msm_perf.c +3
-0@@ -26,6 +26,9 @@#ifdef CONFIG_DEBUG_FS #include <linux/debugfs.h> +#include <linux/uaccess.h> + +#include <drm/drm_file.h> #include "msm_drv.h" #include "msm_gpu.h" drivers/gpu/drm/msm/msm_rd.c +5
-2@@ -42,11 +42,14 @@#ifdef CONFIG_DEBUG_FS -#include <linux/kfifo.h> -#include <linux/debugfs.h> #include <linux/circ_buf.h> +#include <linux/debugfs.h> +#include <linux/kfifo.h> +#include <linux/uaccess.h> #include <linux/wait.h> +#include <drm/drm_file.h> +#include "msm_drv.h" #include "msm_gpu.h" #include "msm_gem.h" drivers/gpu/drm/msm/msm_submitqueue.c +2
-0@@ -3,6 +3,8 @@*/ #include <linux/kref.h> +#include <linux/uaccess.h> +#include "msm_gpu.h" void msm_submitqueue_destroy (struct kref *kref)Signature · 1 line
2.20.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno