Commit 0c7b178a authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Patrik Jakobsson

drm/gma500: drop drmp.h include from all .c files

Drop remaining uses of the deprecated drmP.h in gma500

Replaced drmp.h with forward declarations or include files
as relevant.

Moved all include files to blocks in following order:
\#include <linux/*>

\#include <asm/*>

\#include <drm/*>

\#include ""

And within each block sort the include files alphabetically.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190519195526.3422-6-sam@ravnborg.org
parent bc9f1007
...@@ -20,24 +20,24 @@ ...@@ -20,24 +20,24 @@
* *
**************************************************************************/ **************************************************************************/
#include <linux/module.h> #include <linux/console.h>
#include <linux/kernel.h> #include <linux/delay.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/string.h> #include <linux/init.h>
#include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/tty.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/string.h>
#include <linux/init.h> #include <linux/tty.h>
#include <linux/console.h>
#include <drm/drmP.h>
#include <drm/drm.h> #include <drm/drm.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_fourcc.h>
#include "framebuffer.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_reg.h" #include "psb_reg.h"
#include "framebuffer.h"
/** /**
* psb_spank - reset the 2D engine * psb_spank - reset the 2D engine
......
...@@ -18,15 +18,16 @@ ...@@ -18,15 +18,16 @@
**************************************************************************/ **************************************************************************/
#include <linux/backlight.h> #include <linux/backlight.h>
#include <drm/drmP.h> #include <linux/delay.h>
#include <drm/drm.h> #include <drm/drm.h>
#include "psb_drv.h"
#include "psb_reg.h"
#include "psb_intel_reg.h"
#include "intel_bios.h"
#include "cdv_device.h" #include "cdv_device.h"
#include "gma_device.h" #include "gma_device.h"
#include "intel_bios.h"
#include "psb_drv.h"
#include "psb_intel_reg.h"
#include "psb_reg.h"
#define VGA_SR_INDEX 0x3c4 #define VGA_SR_INDEX 0x3c4
#define VGA_SR_DATA 0x3c5 #define VGA_SR_DATA 0x3c5
......
...@@ -24,16 +24,16 @@ ...@@ -24,16 +24,16 @@
* Eric Anholt <eric@anholt.net> * Eric Anholt <eric@anholt.net>
*/ */
#include <linux/delay.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <drm/drmP.h> #include <linux/pm_runtime.h>
#include "cdv_device.h"
#include "intel_bios.h" #include "intel_bios.h"
#include "power.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_drv.h" #include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "power.h"
#include "cdv_device.h"
#include <linux/pm_runtime.h>
static void cdv_intel_crt_dpms(struct drm_encoder *encoder, int mode) static void cdv_intel_crt_dpms(struct drm_encoder *encoder, int mode)
......
...@@ -18,16 +18,18 @@ ...@@ -18,16 +18,18 @@
* Eric Anholt <eric@anholt.net> * Eric Anholt <eric@anholt.net>
*/ */
#include <linux/delay.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <drm/drmP.h> #include <drm/drm_crtc.h>
#include "cdv_device.h"
#include "framebuffer.h" #include "framebuffer.h"
#include "gma_display.h"
#include "power.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_drv.h" #include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "gma_display.h"
#include "power.h"
#include "cdv_device.h"
static bool cdv_intel_find_dp_pll(const struct gma_limit_t *limit, static bool cdv_intel_find_dp_pll(const struct gma_limit_t *limit,
struct drm_crtc *crtc, int target, struct drm_crtc *crtc, int target,
......
...@@ -26,16 +26,17 @@ ...@@ -26,16 +26,17 @@
*/ */
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/slab.h>
#include <linux/module.h> #include <linux/module.h>
#include <drm/drmP.h> #include <linux/slab.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_dp_helper.h>
#include "gma_display.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_drv.h" #include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "gma_display.h"
#include <drm/drm_dp_helper.h>
/** /**
* struct i2c_algo_dp_aux_data - driver interface structure for i2c over dp * struct i2c_algo_dp_aux_data - driver interface structure for i2c over dp
......
...@@ -27,15 +27,16 @@ ...@@ -27,15 +27,16 @@
* We should probably make this generic and share it with Medfield * We should probably make this generic and share it with Medfield
*/ */
#include <drm/drmP.h> #include <linux/pm_runtime.h>
#include <drm/drm.h> #include <drm/drm.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include "psb_intel_drv.h"
#include "cdv_device.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "cdv_device.h"
#include <linux/pm_runtime.h>
/* hdmi control bits */ /* hdmi control bits */
#define HDMI_NULL_PACKETS_DURING_VSYNC (1 << 9) #define HDMI_NULL_PACKETS_DURING_VSYNC (1 << 9)
......
...@@ -20,17 +20,16 @@ ...@@ -20,17 +20,16 @@
* Jesse Barnes <jesse.barnes@intel.com> * Jesse Barnes <jesse.barnes@intel.com>
*/ */
#include <linux/i2c.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <drm/drmP.h> #include <linux/i2c.h>
#include <linux/pm_runtime.h>
#include "cdv_device.h"
#include "intel_bios.h" #include "intel_bios.h"
#include "power.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_drv.h" #include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "power.h"
#include <linux/pm_runtime.h>
#include "cdv_device.h"
/** /**
* LVDS I2C backlight control macros * LVDS I2C backlight control macros
......
...@@ -17,29 +17,29 @@ ...@@ -17,29 +17,29 @@
* *
**************************************************************************/ **************************************************************************/
#include <linux/module.h> #include <linux/console.h>
#include <linux/kernel.h> #include <linux/delay.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/string.h> #include <linux/init.h>
#include <linux/pfn_t.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/tty.h> #include <linux/module.h>
#include <linux/pfn_t.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/string.h>
#include <linux/init.h> #include <linux/tty.h>
#include <linux/console.h>
#include <drm/drmP.h>
#include <drm/drm.h> #include <drm/drm.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
#include "psb_drv.h"
#include "psb_intel_reg.h"
#include "psb_intel_drv.h"
#include "framebuffer.h" #include "framebuffer.h"
#include "gtt.h" #include "gtt.h"
#include "psb_drv.h"
#include "psb_intel_drv.h"
#include "psb_intel_reg.h"
static const struct drm_framebuffer_funcs psb_fb_funcs = { static const struct drm_framebuffer_funcs psb_fb_funcs = {
.destroy = drm_gem_fb_destroy, .destroy = drm_gem_fb_destroy,
......
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
* accelerated operations on a GEM object) * accelerated operations on a GEM object)
*/ */
#include <drm/drmP.h> #include <linux/pagemap.h>
#include <drm/drm.h> #include <drm/drm.h>
#include <drm/drm_vma_manager.h> #include <drm/drm_vma_manager.h>
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
* *
**************************************************************************/ **************************************************************************/
#include <drm/drmP.h>
#include "psb_drv.h" #include "psb_drv.h"
void gma_get_core_freq(struct drm_device *dev) void gma_get_core_freq(struct drm_device *dev)
......
...@@ -19,12 +19,18 @@ ...@@ -19,12 +19,18 @@
* Patrik Jakobsson <patrik.r.jakobsson@gmail.com> * Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
*/ */
#include <drm/drmP.h> #include <linux/delay.h>
#include <linux/highmem.h>
#include <drm/drm_crtc.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_vblank.h>
#include "framebuffer.h"
#include "gma_display.h" #include "gma_display.h"
#include "psb_drv.h"
#include "psb_intel_drv.h" #include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "psb_drv.h"
#include "framebuffer.h"
/** /**
* Returns whether any output on the specified pipe is of the specified type * Returns whether any output on the specified pipe is of the specified type
......
...@@ -19,11 +19,12 @@ ...@@ -19,11 +19,12 @@
* Alan Cox <alan@linux.intel.com> * Alan Cox <alan@linux.intel.com>
*/ */
#include <drm/drmP.h>
#include <linux/shmem_fs.h> #include <linux/shmem_fs.h>
#include <asm/set_memory.h> #include <asm/set_memory.h>
#include "psb_drv.h"
#include "blitter.h" #include "blitter.h"
#include "psb_drv.h"
/* /*
......
...@@ -18,14 +18,13 @@ ...@@ -18,14 +18,13 @@
* Eric Anholt <eric@anholt.net> * Eric Anholt <eric@anholt.net>
* *
*/ */
#include <drm/drmP.h>
#include <drm/drm.h> #include <drm/drm.h>
#include <drm/drm_dp_helper.h> #include <drm/drm_dp_helper.h>
#include "intel_bios.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_drv.h" #include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "intel_bios.h"
#define SLAVE_ADDR1 0x70 #define SLAVE_ADDR1 0x70
#define SLAVE_ADDR2 0x72 #define SLAVE_ADDR2 0x72
......
...@@ -26,13 +26,14 @@ ...@@ -26,13 +26,14 @@
* Eric Anholt <eric@anholt.net> * Eric Anholt <eric@anholt.net>
* Chris Wilson <chris@chris-wilson.co.uk> * Chris Wilson <chris@chris-wilson.co.uk>
*/ */
#include <linux/module.h>
#include <linux/i2c.h> #include <linux/delay.h>
#include <linux/i2c-algo-bit.h> #include <linux/i2c-algo-bit.h>
#include <drm/drmP.h> #include <linux/i2c.h>
#include <linux/module.h>
#include "psb_intel_drv.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#define _wait_for(COND, MS, W) ({ \ #define _wait_for(COND, MS, W) ({ \
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
* Authors: * Authors:
* Eric Anholt <eric@anholt.net> * Eric Anholt <eric@anholt.net>
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/i2c-algo-bit.h> #include <linux/i2c-algo-bit.h>
......
...@@ -19,14 +19,14 @@ ...@@ -19,14 +19,14 @@
#include <linux/delay.h> #include <linux/delay.h>
#include "psb_drv.h" #include <asm/intel_scu_ipc.h>
#include "mid_bios.h"
#include "mdfld_output.h"
#include "mdfld_dsi_output.h" #include "mdfld_dsi_output.h"
#include "mdfld_output.h"
#include "mid_bios.h"
#include "psb_drv.h"
#include "tc35876x-dsi-lvds.h" #include "tc35876x-dsi-lvds.h"
#include <asm/intel_scu_ipc.h>
#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE #ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
#define MRST_BLC_MAX_PWM_REG_FREQ 0xFFFF #define MRST_BLC_MAX_PWM_REG_FREQ 0xFFFF
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include <linux/delay.h> #include <linux/delay.h>
#include "mdfld_dsi_dpi.h" #include "mdfld_dsi_dpi.h"
#include "mdfld_output.h"
#include "mdfld_dsi_pkg_sender.h" #include "mdfld_dsi_pkg_sender.h"
#include "mdfld_output.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "tc35876x-dsi-lvds.h" #include "tc35876x-dsi-lvds.h"
......
...@@ -29,12 +29,13 @@ ...@@ -29,12 +29,13 @@
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include "mdfld_dsi_output.h" #include <asm/intel_scu_ipc.h>
#include "mdfld_dsi_dpi.h" #include "mdfld_dsi_dpi.h"
#include "mdfld_output.h" #include "mdfld_dsi_output.h"
#include "mdfld_dsi_pkg_sender.h" #include "mdfld_dsi_pkg_sender.h"
#include "mdfld_output.h"
#include "tc35876x-dsi-lvds.h" #include "tc35876x-dsi-lvds.h"
#include <asm/intel_scu_ipc.h>
/* get the LABC from command line. */ /* get the LABC from command line. */
static int LABC_control = 1; static int LABC_control = 1;
......
...@@ -30,16 +30,16 @@ ...@@ -30,16 +30,16 @@
#include <linux/backlight.h> #include <linux/backlight.h>
#include <asm/intel-mid.h>
#include <drm/drm.h> #include <drm/drm.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include "mdfld_output.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_drv.h" #include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "mdfld_output.h"
#include <asm/intel-mid.h>
#define FLD_MASK(start, end) (((1 << ((start) - (end) + 1)) - 1) << (end)) #define FLD_MASK(start, end) (((1 << ((start) - (end) + 1)) - 1) << (end))
#define FLD_VAL(val, start, end) (((val) << (end)) & FLD_MASK(start, end)) #define FLD_VAL(val, start, end) (((val) << (end)) & FLD_MASK(start, end))
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
#include <video/mipi_display.h> #include <video/mipi_display.h>
#include "mdfld_dsi_dpi.h"
#include "mdfld_dsi_output.h" #include "mdfld_dsi_output.h"
#include "mdfld_dsi_pkg_sender.h" #include "mdfld_dsi_pkg_sender.h"
#include "mdfld_dsi_dpi.h"
#define MDFLD_DSI_READ_MAX_COUNT 5000 #define MDFLD_DSI_READ_MAX_COUNT 5000
......
...@@ -18,15 +18,18 @@ ...@@ -18,15 +18,18 @@
* Eric Anholt <eric@anholt.net> * Eric Anholt <eric@anholt.net>
*/ */
#include <linux/delay.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <drm/drmP.h> #include <drm/drm_crtc.h>
#include "psb_intel_reg.h" #include <drm/drm_fourcc.h>
#include "gma_display.h"
#include "framebuffer.h" #include "framebuffer.h"
#include "mdfld_output.h" #include "gma_display.h"
#include "mdfld_dsi_output.h" #include "mdfld_dsi_output.h"
#include "mdfld_output.h"
#include "psb_intel_reg.h"
/* Hardcoded currently */ /* Hardcoded currently */
static int ksel = KSEL_CRYSTAL_19; static int ksel = KSEL_CRYSTAL_19;
......
...@@ -23,11 +23,10 @@ ...@@ -23,11 +23,10 @@
* - Check ioremap failures * - Check ioremap failures
*/ */
#include <drm/drmP.h>
#include <drm/drm.h> #include <drm/drm.h>
#include "psb_drv.h"
#include "mid_bios.h" #include "mid_bios.h"
#include "psb_drv.h"
static void mid_get_fuse_settings(struct drm_device *dev) static void mid_get_fuse_settings(struct drm_device *dev)
{ {
......
...@@ -15,10 +15,12 @@ ...@@ -15,10 +15,12 @@
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
* *
**************************************************************************/ **************************************************************************/
#include <drm/drmP.h>
#include <linux/highmem.h>
#include "mmu.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_reg.h" #include "psb_reg.h"
#include "mmu.h"
/* /*
* Code for the SGX MMU: * Code for the SGX MMU:
......
...@@ -15,16 +15,18 @@ ...@@ -15,16 +15,18 @@
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include <linux/delay.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <drm/drmP.h> #include <drm/drm_fourcc.h>
#include "framebuffer.h" #include "framebuffer.h"
#include "gma_display.h"
#include "power.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_drv.h" #include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "gma_display.h"
#include "power.h"
#define MRST_LIMIT_LVDS_100L 0 #define MRST_LIMIT_LVDS_100L 0
#define MRST_LIMIT_LVDS_83 1 #define MRST_LIMIT_LVDS_83 1
......
...@@ -18,18 +18,20 @@ ...@@ -18,18 +18,20 @@
**************************************************************************/ **************************************************************************/
#include <linux/backlight.h> #include <linux/backlight.h>
#include <linux/module.h> #include <linux/delay.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <drm/drmP.h> #include <linux/module.h>
#include <drm/drm.h>
#include "psb_drv.h"
#include "psb_reg.h"
#include "psb_intel_reg.h"
#include <asm/intel-mid.h> #include <asm/intel-mid.h>
#include <asm/intel_scu_ipc.h> #include <asm/intel_scu_ipc.h>
#include "mid_bios.h"
#include <drm/drm.h>
#include "intel_bios.h" #include "intel_bios.h"
#include "mid_bios.h"
#include "psb_drv.h"
#include "psb_intel_reg.h"
#include "psb_reg.h"
static int oaktrail_output_init(struct drm_device *dev) static int oaktrail_output_init(struct drm_device *dev)
{ {
......
...@@ -24,11 +24,13 @@ ...@@ -24,11 +24,13 @@
* Li Peng <peng.li@intel.com> * Li Peng <peng.li@intel.com>
*/ */
#include <drm/drmP.h> #include <linux/delay.h>
#include <drm/drm.h> #include <drm/drm.h>
#include "psb_drv.h"
#include "psb_intel_drv.h" #include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "psb_drv.h"
#define HDMI_READ(reg) readl(hdmi_dev->regs + (reg)) #define HDMI_READ(reg) readl(hdmi_dev->regs + (reg))
#define HDMI_WRITE(reg, val) writel(val, hdmi_dev->regs + (reg)) #define HDMI_WRITE(reg, val) writel(val, hdmi_dev->regs + (reg))
......
...@@ -21,15 +21,15 @@ ...@@ -21,15 +21,15 @@
*/ */
#include <linux/i2c.h> #include <linux/i2c.h>
#include <drm/drmP.h> #include <linux/pm_runtime.h>
#include <asm/intel-mid.h> #include <asm/intel-mid.h>
#include "intel_bios.h" #include "intel_bios.h"
#include "power.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_drv.h" #include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "power.h"
#include <linux/pm_runtime.h>
/* The max/min PWM frequency in BPCR[31:17] - */ /* The max/min PWM frequency in BPCR[31:17] - */
/* The smallest number is 1 (not 0) that can fit in the /* The smallest number is 1 (not 0) that can fit in the
......
...@@ -23,17 +23,16 @@ ...@@ -23,17 +23,16 @@
* *
*/ */
#include <linux/delay.h>
#include <linux/i2c-algo-bit.h>
#include <linux/i2c.h>
#include <linux/init.h>
#include <linux/io.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
#include <linux/init.h>
#include <linux/io.h>
#include <linux/delay.h>
#include <drm/drmP.h>
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
......
...@@ -18,15 +18,15 @@ ...@@ -18,15 +18,15 @@
**************************************************************************/ **************************************************************************/
#include <linux/backlight.h> #include <linux/backlight.h>
#include <drm/drmP.h>
#include <drm/drm.h> #include <drm/drm.h>
#include "psb_drv.h" #include "gma_device.h"
#include "psb_reg.h"
#include "psb_intel_reg.h"
#include "intel_bios.h" #include "intel_bios.h"
#include "psb_device.h" #include "psb_device.h"
#include "gma_device.h" #include "psb_drv.h"
#include "psb_intel_reg.h"
#include "psb_reg.h"
static int psb_output_init(struct drm_device *dev) static int psb_output_init(struct drm_device *dev)
{ {
......
...@@ -19,23 +19,32 @@ ...@@ -19,23 +19,32 @@
* *
**************************************************************************/ **************************************************************************/
#include <drm/drmP.h> #include <linux/cpu.h>
#include <linux/module.h>
#include <linux/notifier.h>
#include <linux/pm_runtime.h>
#include <linux/spinlock.h>
#include <asm/set_memory.h>
#include <acpi/video.h>
#include <drm/drm.h> #include <drm/drm.h>
#include "psb_drv.h" #include <drm/drm_drv.h>
#include <drm/drm_file.h>
#include <drm/drm_ioctl.h>
#include <drm/drm_irq.h>
#include <drm/drm_pci.h>
#include <drm/drm_pciids.h>
#include <drm/drm_vblank.h>
#include "framebuffer.h" #include "framebuffer.h"
#include "psb_reg.h"
#include "psb_intel_reg.h"
#include "intel_bios.h" #include "intel_bios.h"
#include "mid_bios.h" #include "mid_bios.h"
#include <drm/drm_pciids.h>
#include "power.h" #include "power.h"
#include <linux/cpu.h> #include "psb_drv.h"
#include <linux/notifier.h> #include "psb_intel_reg.h"
#include <linux/spinlock.h> #include "psb_reg.h"
#include <linux/pm_runtime.h>
#include <acpi/video.h>
#include <linux/module.h>
#include <asm/set_memory.h>
static struct drm_driver driver; static struct drm_driver driver;
static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent); static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
......
...@@ -25,15 +25,15 @@ ...@@ -25,15 +25,15 @@
#include <drm/drm_device.h> #include <drm/drm_device.h>
#include "psb_reg.h"
#include "psb_intel_drv.h"
#include "gma_display.h" #include "gma_display.h"
#include "intel_bios.h"
#include "gtt.h" #include "gtt.h"
#include "power.h" #include "intel_bios.h"
#include "opregion.h"
#include "oaktrail.h"
#include "mmu.h" #include "mmu.h"
#include "oaktrail.h"
#include "opregion.h"
#include "power.h"
#include "psb_intel_drv.h"
#include "psb_reg.h"
#define DRIVER_AUTHOR "Alan Cox <alan@linux.intel.com> and others" #define DRIVER_AUTHOR "Alan Cox <alan@linux.intel.com> and others"
......
...@@ -18,16 +18,17 @@ ...@@ -18,16 +18,17 @@
* Eric Anholt <eric@anholt.net> * Eric Anholt <eric@anholt.net>
*/ */
#include <linux/delay.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <drm/drmP.h>
#include <drm/drm_plane_helper.h> #include <drm/drm_plane_helper.h>
#include "framebuffer.h" #include "framebuffer.h"
#include "gma_display.h"
#include "power.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_drv.h" #include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "gma_display.h"
#include "power.h"
#define INTEL_LIMIT_I9XX_SDVO_DAC 0 #define INTEL_LIMIT_I9XX_SDVO_DAC 0
#define INTEL_LIMIT_I9XX_LVDS 1 #define INTEL_LIMIT_I9XX_LVDS 1
......
...@@ -21,14 +21,13 @@ ...@@ -21,14 +21,13 @@
*/ */
#include <linux/i2c.h> #include <linux/i2c.h>
#include <drm/drmP.h> #include <linux/pm_runtime.h>
#include "intel_bios.h" #include "intel_bios.h"
#include "power.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_drv.h" #include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "power.h"
#include <linux/pm_runtime.h>
/* /*
* LVDS I2C backlight control macros * LVDS I2C backlight control macros
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include <linux/i2c.h> #include <linux/i2c.h>
#include <drm/drmP.h>
#include "psb_intel_drv.h" #include "psb_intel_drv.h"
/** /**
......
...@@ -25,19 +25,20 @@ ...@@ -25,19 +25,20 @@
* Authors: * Authors:
* Eric Anholt <eric@anholt.net> * Eric Anholt <eric@anholt.net>
*/ */
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h>
#include <drm/drmP.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include "psb_intel_drv.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_sdvo_regs.h" #include "psb_intel_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include <linux/kernel.h> #include "psb_intel_sdvo_regs.h"
#define SDVO_TMDS_MASK (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1) #define SDVO_TMDS_MASK (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1)
#define SDVO_RGB_MASK (SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1) #define SDVO_RGB_MASK (SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1)
......
...@@ -22,13 +22,14 @@ ...@@ -22,13 +22,14 @@
/* /*
*/ */
#include <drm/drmP.h> #include <drm/drm_vblank.h>
#include "mdfld_output.h"
#include "power.h"
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_reg.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "power.h"
#include "psb_irq.h" #include "psb_irq.h"
#include "mdfld_output.h" #include "psb_reg.h"
/* /*
* inline functions * inline functions
......
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
* Authors: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> * Authors: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
**************************************************************************/ **************************************************************************/
#include <drm/drmP.h> #include <linux/spinlock.h>
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_reg.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include <linux/spinlock.h> #include "psb_reg.h"
static void psb_lid_timer_func(struct timer_list *t) static void psb_lid_timer_func(struct timer_list *t)
{ {
......
...@@ -27,11 +27,12 @@ ...@@ -27,11 +27,12 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_data/tc35876x.h> #include <linux/platform_data/tc35876x.h>
#include <asm/intel_scu_ipc.h>
#include "mdfld_dsi_dpi.h" #include "mdfld_dsi_dpi.h"
#include "mdfld_output.h"
#include "mdfld_dsi_pkg_sender.h" #include "mdfld_dsi_pkg_sender.h"
#include "mdfld_output.h"
#include "tc35876x-dsi-lvds.h" #include "tc35876x-dsi-lvds.h"
#include <asm/intel_scu_ipc.h>
static struct i2c_client *tc35876x_client; static struct i2c_client *tc35876x_client;
static struct i2c_client *cmi_lcd_i2c_client; static struct i2c_client *cmi_lcd_i2c_client;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment