* [PATCH v1 1/4] drm/gma500: remove empty gma_drm.h header file
2019-05-19 13:51 [PATCH v1 0/4] drm/gma500: drop use of drmP.h Sam Ravnborg
@ 2019-05-19 13:51 ` Sam Ravnborg
2019-05-19 13:51 ` [PATCH v1 2/4] drm/gma500: drop drmP.h from header files Sam Ravnborg
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Sam Ravnborg @ 2019-05-19 13:51 UTC (permalink / raw)
To: dri-devel; +Cc: David Airlie, Sam Ravnborg
The header file gma_drm.h is empty so remove it and
drop all uses of the file.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
---
drivers/gpu/drm/gma500/cdv_device.c | 2 +-
drivers/gpu/drm/gma500/gem.c | 2 +-
drivers/gpu/drm/gma500/intel_bios.c | 2 +-
drivers/gpu/drm/gma500/intel_gmbus.c | 2 +-
drivers/gpu/drm/gma500/mid_bios.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_device.c | 2 +-
drivers/gpu/drm/gma500/psb_device.c | 2 +-
drivers/gpu/drm/gma500/psb_drv.h | 2 +-
drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +-
include/drm/gma_drm.h | 25 ------------------------
10 files changed, 9 insertions(+), 34 deletions(-)
delete mode 100644 include/drm/gma_drm.h
diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
index 34b85767e4da..6ba605ac7123 100644
--- a/drivers/gpu/drm/gma500/cdv_device.c
+++ b/drivers/gpu/drm/gma500/cdv_device.c
@@ -20,7 +20,7 @@
#include <linux/backlight.h>
#include <drm/drmP.h>
#include <drm/drm.h>
-#include <drm/gma_drm.h>
+
#include "psb_drv.h"
#include "psb_reg.h"
#include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
index 576f1b272f23..cfc5b559c77b 100644
--- a/drivers/gpu/drm/gma500/gem.c
+++ b/drivers/gpu/drm/gma500/gem.c
@@ -25,8 +25,8 @@
#include <drm/drmP.h>
#include <drm/drm.h>
-#include <drm/gma_drm.h>
#include <drm/drm_vma_manager.h>
+
#include "psb_drv.h"
void psb_gem_free_object(struct drm_gem_object *obj)
diff --git a/drivers/gpu/drm/gma500/intel_bios.c b/drivers/gpu/drm/gma500/intel_bios.c
index 63bde4e86c6a..45c17c6f58f8 100644
--- a/drivers/gpu/drm/gma500/intel_bios.c
+++ b/drivers/gpu/drm/gma500/intel_bios.c
@@ -20,7 +20,7 @@
*/
#include <drm/drmP.h>
#include <drm/drm.h>
-#include <drm/gma_drm.h>
+
#include "psb_drv.h"
#include "psb_intel_drv.h"
#include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/intel_gmbus.c b/drivers/gpu/drm/gma500/intel_gmbus.c
index e7e22187c539..b1bf314ab150 100644
--- a/drivers/gpu/drm/gma500/intel_gmbus.c
+++ b/drivers/gpu/drm/gma500/intel_gmbus.c
@@ -30,8 +30,8 @@
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
#include <drm/drmP.h>
+
#include "psb_intel_drv.h"
-#include <drm/gma_drm.h>
#include "psb_drv.h"
#include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c
index 237041a37532..e00778b002ec 100644
--- a/drivers/gpu/drm/gma500/mid_bios.c
+++ b/drivers/gpu/drm/gma500/mid_bios.c
@@ -25,7 +25,7 @@
#include <drm/drmP.h>
#include <drm/drm.h>
-#include <drm/gma_drm.h>
+
#include "psb_drv.h"
#include "mid_bios.h"
diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c
index ba30b43a3412..f0872e2c22d5 100644
--- a/drivers/gpu/drm/gma500/oaktrail_device.c
+++ b/drivers/gpu/drm/gma500/oaktrail_device.c
@@ -22,7 +22,7 @@
#include <linux/dmi.h>
#include <drm/drmP.h>
#include <drm/drm.h>
-#include <drm/gma_drm.h>
+
#include "psb_drv.h"
#include "psb_reg.h"
#include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c
index dc0f8527570c..9fd418985d70 100644
--- a/drivers/gpu/drm/gma500/psb_device.c
+++ b/drivers/gpu/drm/gma500/psb_device.c
@@ -20,7 +20,7 @@
#include <linux/backlight.h>
#include <drm/drmP.h>
#include <drm/drm.h>
-#include <drm/gma_drm.h>
+
#include "psb_drv.h"
#include "psb_reg.h"
#include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index 941b238bdcc9..fbccf2abdad7 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -24,7 +24,7 @@
#include <linux/mm_types.h>
#include <drm/drmP.h>
-#include <drm/gma_drm.h>
+
#include "psb_reg.h"
#include "psb_intel_drv.h"
#include "gma_display.h"
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index dd3cec0e3190..5090ef5f348d 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -32,8 +32,8 @@
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
#include <drm/drm_edid.h>
+
#include "psb_intel_drv.h"
-#include <drm/gma_drm.h>
#include "psb_drv.h"
#include "psb_intel_sdvo_regs.h"
#include "psb_intel_reg.h"
diff --git a/include/drm/gma_drm.h b/include/drm/gma_drm.h
deleted file mode 100644
index 87ac5e6ca551..000000000000
--- a/include/drm/gma_drm.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2007-2011, Intel Corporation.
- * All Rights Reserved.
- * Copyright (c) 2008, Tungsten Graphics Inc. Cedar Park, TX., USA.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-#ifndef _GMA_DRM_H_
-#define _GMA_DRM_H_
-
-#endif
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v1 2/4] drm/gma500: drop drmP.h from header files
2019-05-19 13:51 [PATCH v1 0/4] drm/gma500: drop use of drmP.h Sam Ravnborg
2019-05-19 13:51 ` [PATCH v1 1/4] drm/gma500: remove empty gma_drm.h header file Sam Ravnborg
@ 2019-05-19 13:51 ` Sam Ravnborg
2019-05-19 13:51 ` [PATCH v1 3/4] drm/gma500: drop use of DRM_UDELAY wrapper Sam Ravnborg
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Sam Ravnborg @ 2019-05-19 13:51 UTC (permalink / raw)
To: dri-devel; +Cc: David Airlie, Sam Ravnborg
Drop use of drmp.h from all header files in drm/gma500.
Fix fallout in all files.
In some cases moved include lines and sorted them too.
With drmP.h removed from all header files it can now be removed from
each .c file without any further dependencies
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
---
drivers/gpu/drm/gma500/framebuffer.h | 1 -
drivers/gpu/drm/gma500/gtt.h | 1 -
drivers/gpu/drm/gma500/intel_bios.c | 1 +
drivers/gpu/drm/gma500/intel_bios.h | 3 +--
drivers/gpu/drm/gma500/intel_i2c.c | 3 ++-
drivers/gpu/drm/gma500/mdfld_device.c | 2 ++
drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 2 ++
drivers/gpu/drm/gma500/mdfld_dsi_output.c | 5 +++--
drivers/gpu/drm/gma500/mdfld_dsi_output.h | 2 +-
drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 2 ++
drivers/gpu/drm/gma500/mdfld_tmd_vid.c | 2 ++
drivers/gpu/drm/gma500/power.h | 4 +++-
drivers/gpu/drm/gma500/psb_drv.h | 2 +-
drivers/gpu/drm/gma500/psb_irq.h | 2 +-
drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 8 +++++---
15 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/gma500/framebuffer.h b/drivers/gpu/drm/gma500/framebuffer.h
index e8e6357f033b..b54477aec95f 100644
--- a/drivers/gpu/drm/gma500/framebuffer.h
+++ b/drivers/gpu/drm/gma500/framebuffer.h
@@ -22,7 +22,6 @@
#ifndef _FRAMEBUFFER_H_
#define _FRAMEBUFFER_H_
-#include <drm/drmP.h>
#include <drm/drm_fb_helper.h>
#include "psb_drv.h"
diff --git a/drivers/gpu/drm/gma500/gtt.h b/drivers/gpu/drm/gma500/gtt.h
index cb0c3a2a1fd4..c9449aabc58f 100644
--- a/drivers/gpu/drm/gma500/gtt.h
+++ b/drivers/gpu/drm/gma500/gtt.h
@@ -20,7 +20,6 @@
#ifndef _PSB_GTT_H_
#define _PSB_GTT_H_
-#include <drm/drmP.h>
#include <drm/drm_gem.h>
/* This wants cleaning up with respect to the psb_dev and un-needed stuff */
diff --git a/drivers/gpu/drm/gma500/intel_bios.c b/drivers/gpu/drm/gma500/intel_bios.c
index 45c17c6f58f8..9c67d08a55ea 100644
--- a/drivers/gpu/drm/gma500/intel_bios.c
+++ b/drivers/gpu/drm/gma500/intel_bios.c
@@ -20,6 +20,7 @@
*/
#include <drm/drmP.h>
#include <drm/drm.h>
+#include <drm/drm_dp_helper.h>
#include "psb_drv.h"
#include "psb_intel_drv.h"
diff --git a/drivers/gpu/drm/gma500/intel_bios.h b/drivers/gpu/drm/gma500/intel_bios.h
index e0ccf1d19a4d..bb3b813d1e68 100644
--- a/drivers/gpu/drm/gma500/intel_bios.h
+++ b/drivers/gpu/drm/gma500/intel_bios.h
@@ -22,8 +22,7 @@
#ifndef _INTEL_BIOS_H_
#define _INTEL_BIOS_H_
-#include <drm/drmP.h>
-#include <drm/drm_dp_helper.h>
+struct drm_device;
struct vbt_header {
u8 signature[20]; /**< Always starts with 'VBT$' */
diff --git a/drivers/gpu/drm/gma500/intel_i2c.c b/drivers/gpu/drm/gma500/intel_i2c.c
index 98a28c209555..147b556deeb0 100644
--- a/drivers/gpu/drm/gma500/intel_i2c.c
+++ b/drivers/gpu/drm/gma500/intel_i2c.c
@@ -17,9 +17,10 @@
* Authors:
* Eric Anholt <eric@anholt.net>
*/
+#include <linux/delay.h>
#include <linux/export.h>
-#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
+#include <linux/i2c.h>
#include "psb_drv.h"
#include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/mdfld_device.c b/drivers/gpu/drm/gma500/mdfld_device.c
index e2ab858122f9..585ec2e46166 100644
--- a/drivers/gpu/drm/gma500/mdfld_device.c
+++ b/drivers/gpu/drm/gma500/mdfld_device.c
@@ -17,6 +17,8 @@
*
**************************************************************************/
+#include <linux/delay.h>
+
#include "psb_drv.h"
#include "mid_bios.h"
#include "mdfld_output.h"
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
index d0bf5a1e94e8..832bae24fd72 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
@@ -25,6 +25,8 @@
* Jackie Li<yaodong.li@intel.com>
*/
+#include <linux/delay.h>
+
#include "mdfld_dsi_dpi.h"
#include "mdfld_output.h"
#include "mdfld_dsi_pkg_sender.h"
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
index fe020926ea4f..9ca982e77fa5 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_output.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
@@ -25,14 +25,15 @@
* Jackie Li<yaodong.li@intel.com>
*/
-#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/moduleparam.h>
+#include <linux/pm_runtime.h>
#include "mdfld_dsi_output.h"
#include "mdfld_dsi_dpi.h"
#include "mdfld_output.h"
#include "mdfld_dsi_pkg_sender.h"
#include "tc35876x-dsi-lvds.h"
-#include <linux/pm_runtime.h>
#include <asm/intel_scu_ipc.h>
/* get the LABC from command line. */
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.h b/drivers/gpu/drm/gma500/mdfld_dsi_output.h
index 5b646c1f0c3e..68d14451e303 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_output.h
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.h
@@ -29,7 +29,7 @@
#define __MDFLD_DSI_OUTPUT_H__
#include <linux/backlight.h>
-#include <drm/drmP.h>
+
#include <drm/drm.h>
#include <drm/drm_crtc.h>
#include <drm/drm_edid.h>
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c b/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c
index c50534c923df..003e96a20139 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c
@@ -24,7 +24,9 @@
* Jackie Li<yaodong.li@intel.com>
*/
+#include <linux/delay.h>
#include <linux/freezer.h>
+
#include <video/mipi_display.h>
#include "mdfld_dsi_output.h"
diff --git a/drivers/gpu/drm/gma500/mdfld_tmd_vid.c b/drivers/gpu/drm/gma500/mdfld_tmd_vid.c
index dc0c6c3d3d29..49c92debb7b2 100644
--- a/drivers/gpu/drm/gma500/mdfld_tmd_vid.c
+++ b/drivers/gpu/drm/gma500/mdfld_tmd_vid.c
@@ -27,6 +27,8 @@
* Scott Rowe <scott.m.rowe@intel.com>
*/
+#include <linux/delay.h>
+
#include "mdfld_dsi_dpi.h"
#include "mdfld_dsi_pkg_sender.h"
diff --git a/drivers/gpu/drm/gma500/power.h b/drivers/gpu/drm/gma500/power.h
index 56d8708bd41c..0c89c4d6ec20 100644
--- a/drivers/gpu/drm/gma500/power.h
+++ b/drivers/gpu/drm/gma500/power.h
@@ -31,7 +31,9 @@
#define _PSB_POWERMGMT_H_
#include <linux/pci.h>
-#include <drm/drmP.h>
+
+struct device;
+struct drm_device;
void gma_power_init(struct drm_device *dev);
void gma_power_uninit(struct drm_device *dev);
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index fbccf2abdad7..d7ccc1880ce4 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -23,7 +23,7 @@
#include <linux/kref.h>
#include <linux/mm_types.h>
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
#include "psb_reg.h"
#include "psb_intel_drv.h"
diff --git a/drivers/gpu/drm/gma500/psb_irq.h b/drivers/gpu/drm/gma500/psb_irq.h
index e6a81a8c9f35..f28fc4dbeb67 100644
--- a/drivers/gpu/drm/gma500/psb_irq.h
+++ b/drivers/gpu/drm/gma500/psb_irq.h
@@ -24,7 +24,7 @@
#ifndef _PSB_IRQ_H_
#define _PSB_IRQ_H_
-#include <drm/drmP.h>
+struct drm_device;
bool sysirq_init(struct drm_device *dev);
void sysirq_uninit(struct drm_device *dev);
diff --git a/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c b/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c
index 37c997e24b9e..9b78c2aca5da 100644
--- a/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c
+++ b/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c
@@ -22,13 +22,15 @@
*
*/
+#include <linux/delay.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_data/tc35876x.h>
+
#include "mdfld_dsi_dpi.h"
#include "mdfld_output.h"
#include "mdfld_dsi_pkg_sender.h"
#include "tc35876x-dsi-lvds.h"
-#include <linux/platform_data/tc35876x.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
#include <asm/intel_scu_ipc.h>
static struct i2c_client *tc35876x_client;
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v1 3/4] drm/gma500: drop use of DRM_UDELAY wrapper
2019-05-19 13:51 [PATCH v1 0/4] drm/gma500: drop use of drmP.h Sam Ravnborg
2019-05-19 13:51 ` [PATCH v1 1/4] drm/gma500: remove empty gma_drm.h header file Sam Ravnborg
2019-05-19 13:51 ` [PATCH v1 2/4] drm/gma500: drop drmP.h from header files Sam Ravnborg
@ 2019-05-19 13:51 ` Sam Ravnborg
2019-05-19 13:51 ` [PATCH v1 4/4] drm/gma500: drop drmp.h include from all .c files Sam Ravnborg
2019-05-20 18:41 ` [PATCH v1 0/4] drm/gma500: drop use of drmP.h Daniel Vetter
4 siblings, 0 replies; 7+ messages in thread
From: Sam Ravnborg @ 2019-05-19 13:51 UTC (permalink / raw)
To: dri-devel; +Cc: David Airlie, Sam Ravnborg
The DRM_UDELAY wrapper from drm_os_linux.h is used in a few places,
all other places calls udelay() with no wrapper.
There is no reason to continue to use this wrapper - so drop it
and direct call udelay().
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
---
drivers/gpu/drm/gma500/mdfld_device.c | 4 ++--
drivers/gpu/drm/gma500/oaktrail_device.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/gma500/mdfld_device.c b/drivers/gpu/drm/gma500/mdfld_device.c
index 585ec2e46166..edb9b1bbd6c6 100644
--- a/drivers/gpu/drm/gma500/mdfld_device.c
+++ b/drivers/gpu/drm/gma500/mdfld_device.c
@@ -344,7 +344,7 @@ static int mdfld_restore_display_registers(struct drm_device *dev, int pipenum)
if (pipenum == 1) {
/* restore palette (gamma) */
- /*DRM_UDELAY(50000); */
+ /* udelay(50000); */
for (i = 0; i < 256; i++)
PSB_WVDC32(pipe->palette[i], map->palette + (i << 2));
@@ -406,7 +406,7 @@ static int mdfld_restore_display_registers(struct drm_device *dev, int pipenum)
PSB_WVDC32(pipe->conf, map->conf);
/* restore palette (gamma) */
- /*DRM_UDELAY(50000); */
+ /* udelay(50000); */
for (i = 0; i < 256; i++)
PSB_WVDC32(pipe->palette[i], map->palette + (i << 2));
diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c
index f0872e2c22d5..2d8afbb51a77 100644
--- a/drivers/gpu/drm/gma500/oaktrail_device.c
+++ b/drivers/gpu/drm/gma500/oaktrail_device.c
@@ -327,7 +327,7 @@ static int oaktrail_restore_display_registers(struct drm_device *dev)
/* Actually enable it */
PSB_WVDC32(p->dpll, MRST_DPLL_A);
- DRM_UDELAY(150);
+ udelay(150);
/* Restore mode */
PSB_WVDC32(p->htotal, HTOTAL_A);
diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
index c6d72de1c054..797329028439 100644
--- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c
+++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
@@ -815,7 +815,7 @@ void oaktrail_hdmi_restore(struct drm_device *dev)
PSB_WVDC32(hdmi_dev->saveDPLL_ADJUST, DPLL_ADJUST);
PSB_WVDC32(hdmi_dev->saveDPLL_UPDATE, DPLL_UPDATE);
PSB_WVDC32(hdmi_dev->saveDPLL_CLK_ENABLE, DPLL_CLK_ENABLE);
- DRM_UDELAY(150);
+ udelay(150);
/* pipe */
PSB_WVDC32(pipeb->src, PIPEBSRC);
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v1 4/4] drm/gma500: drop drmp.h include from all .c files
2019-05-19 13:51 [PATCH v1 0/4] drm/gma500: drop use of drmP.h Sam Ravnborg
` (2 preceding siblings ...)
2019-05-19 13:51 ` [PATCH v1 3/4] drm/gma500: drop use of DRM_UDELAY wrapper Sam Ravnborg
@ 2019-05-19 13:51 ` Sam Ravnborg
2019-05-20 18:41 ` [PATCH v1 0/4] drm/gma500: drop use of drmP.h Daniel Vetter
4 siblings, 0 replies; 7+ messages in thread
From: Sam Ravnborg @ 2019-05-19 13:51 UTC (permalink / raw)
To: dri-devel; +Cc: David Airlie, Sam Ravnborg
Drop remaining uses of the deprecated drmP.h in gma500
Replaced drmp.h with forward declarations or include files
as relevant.
Sorted include files and in some cases moved relevant
includes together.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
---
drivers/gpu/drm/gma500/accel_2d.c | 2 +-
drivers/gpu/drm/gma500/cdv_device.c | 3 ++-
drivers/gpu/drm/gma500/cdv_intel_crt.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_display.c | 4 ++-
drivers/gpu/drm/gma500/cdv_intel_dp.c | 7 +++---
drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 5 ++--
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 5 ++--
drivers/gpu/drm/gma500/framebuffer.c | 2 +-
drivers/gpu/drm/gma500/gem.c | 3 ++-
drivers/gpu/drm/gma500/gma_device.c | 1 -
drivers/gpu/drm/gma500/gma_display.c | 8 +++++-
drivers/gpu/drm/gma500/gtt.c | 3 ++-
drivers/gpu/drm/gma500/intel_bios.c | 1 -
drivers/gpu/drm/gma500/intel_gmbus.c | 7 +++---
drivers/gpu/drm/gma500/mdfld_intel_display.c | 5 +++-
drivers/gpu/drm/gma500/mid_bios.c | 1 -
drivers/gpu/drm/gma500/mmu.c | 4 ++-
drivers/gpu/drm/gma500/oaktrail_crtc.c | 4 ++-
drivers/gpu/drm/gma500/oaktrail_device.c | 3 ++-
drivers/gpu/drm/gma500/oaktrail_hdmi.c | 4 ++-
drivers/gpu/drm/gma500/oaktrail_lvds.c | 4 +--
drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 1 -
drivers/gpu/drm/gma500/psb_device.c | 2 +-
drivers/gpu/drm/gma500/psb_drv.c | 26 +++++++++++++-------
drivers/gpu/drm/gma500/psb_intel_display.c | 3 ++-
drivers/gpu/drm/gma500/psb_intel_lvds.c | 3 +--
drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +-
drivers/gpu/drm/gma500/psb_intel_sdvo.c | 8 +++---
drivers/gpu/drm/gma500/psb_irq.c | 3 ++-
drivers/gpu/drm/gma500/psb_lid.c | 4 +--
30 files changed, 79 insertions(+), 51 deletions(-)
diff --git a/drivers/gpu/drm/gma500/accel_2d.c b/drivers/gpu/drm/gma500/accel_2d.c
index 204c8e452eb7..424289e49f5d 100644
--- a/drivers/gpu/drm/gma500/accel_2d.c
+++ b/drivers/gpu/drm/gma500/accel_2d.c
@@ -31,9 +31,9 @@
#include <linux/init.h>
#include <linux/console.h>
-#include <drm/drmP.h>
#include <drm/drm.h>
#include <drm/drm_crtc.h>
+#include <drm/drm_fourcc.h>
#include "psb_drv.h"
#include "psb_reg.h"
diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
index 6ba605ac7123..6384eab68af8 100644
--- a/drivers/gpu/drm/gma500/cdv_device.c
+++ b/drivers/gpu/drm/gma500/cdv_device.c
@@ -18,7 +18,8 @@
**************************************************************************/
#include <linux/backlight.h>
-#include <drm/drmP.h>
+#include <linux/delay.h>
+
#include <drm/drm.h>
#include "psb_drv.h"
diff --git a/drivers/gpu/drm/gma500/cdv_intel_crt.c b/drivers/gpu/drm/gma500/cdv_intel_crt.c
index cb5a14b7ec7f..4c4a97cb50ce 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_crt.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_crt.c
@@ -24,8 +24,8 @@
* Eric Anholt <eric@anholt.net>
*/
+#include <linux/delay.h>
#include <linux/i2c.h>
-#include <drm/drmP.h>
#include "intel_bios.h"
#include "psb_drv.h"
diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c
index 17db4b4749d5..d24289676fc7 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_display.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_display.c
@@ -18,9 +18,11 @@
* Eric Anholt <eric@anholt.net>
*/
+#include <linux/delay.h>
#include <linux/i2c.h>
-#include <drm/drmP.h>
+#include <drm/drm_crtc.h>
+
#include "framebuffer.h"
#include "psb_drv.h"
#include "psb_intel_drv.h"
diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index 90ed20083009..400097b4385c 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -26,16 +26,17 @@
*/
#include <linux/i2c.h>
-#include <linux/slab.h>
#include <linux/module.h>
-#include <drm/drmP.h>
+#include <linux/slab.h>
+
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
+#include <drm/drm_dp_helper.h>
+
#include "psb_drv.h"
#include "psb_intel_drv.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
diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
index 4e4e4a66eaee..7aae144f4472 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
@@ -27,15 +27,16 @@
* 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_crtc.h>
#include <drm/drm_edid.h>
+
#include "psb_intel_drv.h"
#include "psb_drv.h"
#include "psb_intel_reg.h"
#include "cdv_device.h"
-#include <linux/pm_runtime.h>
/* hdmi control bits */
#define HDMI_NULL_PACKETS_DURING_VSYNC (1 << 9)
diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
index de9531caaca0..a3337302a229 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
@@ -20,16 +20,15 @@
* Jesse Barnes <jesse.barnes@intel.com>
*/
-#include <linux/i2c.h>
#include <linux/dmi.h>
-#include <drm/drmP.h>
+#include <linux/i2c.h>
+#include <linux/pm_runtime.h>
#include "intel_bios.h"
#include "psb_drv.h"
#include "psb_intel_drv.h"
#include "psb_intel_reg.h"
#include "power.h"
-#include <linux/pm_runtime.h>
#include "cdv_device.h"
/**
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index a9d3a4a30ab8..e36ad7171658 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -29,10 +29,10 @@
#include <linux/init.h>
#include <linux/console.h>
-#include <drm/drmP.h>
#include <drm/drm.h>
#include <drm/drm_crtc.h>
#include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
#include <drm/drm_gem_framebuffer_helper.h>
#include "psb_drv.h"
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
index cfc5b559c77b..49c8aa6bdfd0 100644
--- a/drivers/gpu/drm/gma500/gem.c
+++ b/drivers/gpu/drm/gma500/gem.c
@@ -23,7 +23,8 @@
* accelerated operations on a GEM object)
*/
-#include <drm/drmP.h>
+#include <linux/pagemap.h>
+
#include <drm/drm.h>
#include <drm/drm_vma_manager.h>
diff --git a/drivers/gpu/drm/gma500/gma_device.c b/drivers/gpu/drm/gma500/gma_device.c
index a7fb6de4dd15..7d5287122030 100644
--- a/drivers/gpu/drm/gma500/gma_device.c
+++ b/drivers/gpu/drm/gma500/gma_device.c
@@ -13,7 +13,6 @@
*
**************************************************************************/
-#include <drm/drmP.h>
#include "psb_drv.h"
void gma_get_core_freq(struct drm_device *dev)
diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
index 09c1161a7ac6..9e85ad5f35fd 100644
--- a/drivers/gpu/drm/gma500/gma_display.c
+++ b/drivers/gpu/drm/gma500/gma_display.c
@@ -19,7 +19,13 @@
* 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 "gma_display.h"
#include "psb_intel_drv.h"
#include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c
index 3949b0990916..9f758a878b7e 100644
--- a/drivers/gpu/drm/gma500/gtt.c
+++ b/drivers/gpu/drm/gma500/gtt.c
@@ -19,9 +19,10 @@
* Alan Cox <alan@linux.intel.com>
*/
-#include <drm/drmP.h>
#include <linux/shmem_fs.h>
+
#include <asm/set_memory.h>
+
#include "psb_drv.h"
#include "blitter.h"
diff --git a/drivers/gpu/drm/gma500/intel_bios.c b/drivers/gpu/drm/gma500/intel_bios.c
index 9c67d08a55ea..e47122ef77f3 100644
--- a/drivers/gpu/drm/gma500/intel_bios.c
+++ b/drivers/gpu/drm/gma500/intel_bios.c
@@ -18,7 +18,6 @@
* Eric Anholt <eric@anholt.net>
*
*/
-#include <drm/drmP.h>
#include <drm/drm.h>
#include <drm/drm_dp_helper.h>
diff --git a/drivers/gpu/drm/gma500/intel_gmbus.c b/drivers/gpu/drm/gma500/intel_gmbus.c
index b1bf314ab150..9d456fb3fa68 100644
--- a/drivers/gpu/drm/gma500/intel_gmbus.c
+++ b/drivers/gpu/drm/gma500/intel_gmbus.c
@@ -26,10 +26,11 @@
* Eric Anholt <eric@anholt.net>
* 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 <drm/drmP.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
#include "psb_intel_drv.h"
#include "psb_drv.h"
diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c
index 2b9fa0163dea..611d1fabd7a8 100644
--- a/drivers/gpu/drm/gma500/mdfld_intel_display.c
+++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c
@@ -18,10 +18,13 @@
* Eric Anholt <eric@anholt.net>
*/
+#include <linux/delay.h>
#include <linux/i2c.h>
#include <linux/pm_runtime.h>
-#include <drm/drmP.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_fourcc.h>
+
#include "psb_intel_reg.h"
#include "gma_display.h"
#include "framebuffer.h"
diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c
index e00778b002ec..92da361aec17 100644
--- a/drivers/gpu/drm/gma500/mid_bios.c
+++ b/drivers/gpu/drm/gma500/mid_bios.c
@@ -23,7 +23,6 @@
* - Check ioremap failures
*/
-#include <drm/drmP.h>
#include <drm/drm.h>
#include "psb_drv.h"
diff --git a/drivers/gpu/drm/gma500/mmu.c b/drivers/gpu/drm/gma500/mmu.c
index ccb161c73a59..d86fdea4234e 100644
--- a/drivers/gpu/drm/gma500/mmu.c
+++ b/drivers/gpu/drm/gma500/mmu.c
@@ -15,7 +15,9 @@
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*
**************************************************************************/
-#include <drm/drmP.h>
+
+#include <linux/highmem.h>
+
#include "psb_drv.h"
#include "psb_reg.h"
#include "mmu.h"
diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c
index 1b7fd6a9d8a5..f6fc4fbf6510 100644
--- a/drivers/gpu/drm/gma500/oaktrail_crtc.c
+++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c
@@ -15,10 +15,12 @@
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include <linux/delay.h>
#include <linux/i2c.h>
#include <linux/pm_runtime.h>
-#include <drm/drmP.h>
+#include <drm/drm_fourcc.h>
+
#include "framebuffer.h"
#include "psb_drv.h"
#include "psb_intel_drv.h"
diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c
index 2d8afbb51a77..bca9a4853c62 100644
--- a/drivers/gpu/drm/gma500/oaktrail_device.c
+++ b/drivers/gpu/drm/gma500/oaktrail_device.c
@@ -19,8 +19,9 @@
#include <linux/backlight.h>
#include <linux/module.h>
+#include <linux/delay.h>
#include <linux/dmi.h>
-#include <drm/drmP.h>
+
#include <drm/drm.h>
#include "psb_drv.h"
diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
index 797329028439..f7baaa0da351 100644
--- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c
+++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
@@ -24,8 +24,10 @@
* Li Peng <peng.li@intel.com>
*/
-#include <drm/drmP.h>
+#include <linux/delay.h>
+
#include <drm/drm.h>
+
#include "psb_intel_drv.h"
#include "psb_intel_reg.h"
#include "psb_drv.h"
diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c
index 83babb815a5d..570a81c85f57 100644
--- a/drivers/gpu/drm/gma500/oaktrail_lvds.c
+++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c
@@ -21,7 +21,8 @@
*/
#include <linux/i2c.h>
-#include <drm/drmP.h>
+#include <linux/pm_runtime.h>
+
#include <asm/intel-mid.h>
#include "intel_bios.h"
@@ -29,7 +30,6 @@
#include "psb_intel_drv.h"
#include "psb_intel_reg.h"
#include "power.h"
-#include <linux/pm_runtime.h>
/* The max/min PWM frequency in BPCR[31:17] - */
/* The smallest number is 1 (not 0) that can fit in the
diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c b/drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c
index f913a62eee5f..edaf5f8b7b3c 100644
--- a/drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c
+++ b/drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c
@@ -33,7 +33,6 @@
#include <linux/io.h>
#include <linux/delay.h>
-#include <drm/drmP.h>
#include "psb_drv.h"
#include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c
index 9fd418985d70..957f9c52e2b7 100644
--- a/drivers/gpu/drm/gma500/psb_device.c
+++ b/drivers/gpu/drm/gma500/psb_device.c
@@ -18,7 +18,7 @@
**************************************************************************/
#include <linux/backlight.h>
-#include <drm/drmP.h>
+
#include <drm/drm.h>
#include "psb_drv.h"
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index eefaf4daff2b..e94ea8d9b46d 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -19,23 +19,31 @@
*
**************************************************************************/
-#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 <acpi/video.h>
+#include <asm/set_memory.h>
+
#include <drm/drm.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 "psb_drv.h"
#include "framebuffer.h"
#include "psb_reg.h"
#include "psb_intel_reg.h"
#include "intel_bios.h"
#include "mid_bios.h"
-#include <drm/drm_pciids.h>
#include "power.h"
-#include <linux/cpu.h>
-#include <linux/notifier.h>
-#include <linux/spinlock.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 int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
diff --git a/drivers/gpu/drm/gma500/psb_intel_display.c b/drivers/gpu/drm/gma500/psb_intel_display.c
index 8762efaef283..130852bb4b4e 100644
--- a/drivers/gpu/drm/gma500/psb_intel_display.c
+++ b/drivers/gpu/drm/gma500/psb_intel_display.c
@@ -18,10 +18,11 @@
* Eric Anholt <eric@anholt.net>
*/
+#include <linux/delay.h>
#include <linux/i2c.h>
-#include <drm/drmP.h>
#include <drm/drm_plane_helper.h>
+
#include "framebuffer.h"
#include "psb_drv.h"
#include "psb_intel_drv.h"
diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c
index 8baf6325c6e4..f36ae8556b87 100644
--- a/drivers/gpu/drm/gma500/psb_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c
@@ -21,14 +21,13 @@
*/
#include <linux/i2c.h>
-#include <drm/drmP.h>
+#include <linux/pm_runtime.h>
#include "intel_bios.h"
#include "psb_drv.h"
#include "psb_intel_drv.h"
#include "psb_intel_reg.h"
#include "power.h"
-#include <linux/pm_runtime.h>
/*
* LVDS I2C backlight control macros
diff --git a/drivers/gpu/drm/gma500/psb_intel_modes.c b/drivers/gpu/drm/gma500/psb_intel_modes.c
index fb4da3cd6681..d00c6d428ede 100644
--- a/drivers/gpu/drm/gma500/psb_intel_modes.c
+++ b/drivers/gpu/drm/gma500/psb_intel_modes.c
@@ -18,7 +18,7 @@
*/
#include <linux/i2c.h>
-#include <drm/drmP.h>
+
#include "psb_intel_drv.h"
/**
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index 5090ef5f348d..ab91a1bc0d06 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -25,11 +25,12 @@
* Authors:
* Eric Anholt <eric@anholt.net>
*/
-#include <linux/module.h>
+#include <linux/delay.h>
#include <linux/i2c.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/delay.h>
-#include <drm/drmP.h>
+
#include <drm/drm_crtc.h>
#include <drm/drm_edid.h>
@@ -37,7 +38,6 @@
#include "psb_drv.h"
#include "psb_intel_sdvo_regs.h"
#include "psb_intel_reg.h"
-#include <linux/kernel.h>
#define SDVO_TMDS_MASK (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1)
#define SDVO_RGB_MASK (SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1)
diff --git a/drivers/gpu/drm/gma500/psb_irq.c b/drivers/gpu/drm/gma500/psb_irq.c
index 78eb10902809..81f807d462b6 100644
--- a/drivers/gpu/drm/gma500/psb_irq.c
+++ b/drivers/gpu/drm/gma500/psb_irq.c
@@ -22,7 +22,8 @@
/*
*/
-#include <drm/drmP.h>
+#include <drm/drm_vblank.h>
+
#include "psb_drv.h"
#include "psb_reg.h"
#include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/psb_lid.c b/drivers/gpu/drm/gma500/psb_lid.c
index be6dda58fcae..6289d5ca8955 100644
--- a/drivers/gpu/drm/gma500/psb_lid.c
+++ b/drivers/gpu/drm/gma500/psb_lid.c
@@ -17,11 +17,11 @@
* Authors: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
**************************************************************************/
-#include <drm/drmP.h>
+#include <linux/spinlock.h>
+
#include "psb_drv.h"
#include "psb_reg.h"
#include "psb_intel_reg.h"
-#include <linux/spinlock.h>
static void psb_lid_timer_func(struct timer_list *t)
{
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v1 0/4] drm/gma500: drop use of drmP.h
2019-05-19 13:51 [PATCH v1 0/4] drm/gma500: drop use of drmP.h Sam Ravnborg
` (3 preceding siblings ...)
2019-05-19 13:51 ` [PATCH v1 4/4] drm/gma500: drop drmp.h include from all .c files Sam Ravnborg
@ 2019-05-20 18:41 ` Daniel Vetter
2019-05-20 21:38 ` Patrik Jakobsson
4 siblings, 1 reply; 7+ messages in thread
From: Daniel Vetter @ 2019-05-20 18:41 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: David Airlie, dri-devel
On Sun, May 19, 2019 at 03:51:05PM +0200, Sam Ravnborg wrote:
> The following patchset remove use of the deprecated drmP.h
> header file in the gma500 driver.
> As preparation an empty header file is removed and a dependency on
> drm_os_linux.h is dropped.
> The list of include files are sorted and is some cases divided
> up in blocks of linux/* drm/* etc.
>
> Build tested with allmodconfig and allyesconfig for x86, arm, alpha and more.
>
> Patchset made on top of drm-misc-next
Nice series! On the entire pile:
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Since gma500 is defacto unmaintained I think that's good enough, as long
as you don't break anything. Maybe wait a bit before merging it all.
Aside, I entirely forgot about drm_os_linux.h. That's another file we
should kill with fire I think :-) Probably best done macro-by-macro or so
...
Cheers, Daniel
>
> Sam
>
> Sam Ravnborg (4):
> drm/gma500: remove empty gma_drm.h header file
> drm/gma500: drop drmP.h from header files
> drm/gma500: drop use of DRM_UDELAY wrapper
> drm/gma500: drop drmp.h include from all .c files
>
> drivers/gpu/drm/gma500/accel_2d.c | 2 +-
> drivers/gpu/drm/gma500/cdv_device.c | 5 +++--
> drivers/gpu/drm/gma500/cdv_intel_crt.c | 2 +-
> drivers/gpu/drm/gma500/cdv_intel_display.c | 4 +++-
> drivers/gpu/drm/gma500/cdv_intel_dp.c | 7 ++++---
> drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 5 +++--
> drivers/gpu/drm/gma500/cdv_intel_lvds.c | 5 ++---
> drivers/gpu/drm/gma500/framebuffer.c | 2 +-
> drivers/gpu/drm/gma500/framebuffer.h | 1 -
> drivers/gpu/drm/gma500/gem.c | 5 +++--
> drivers/gpu/drm/gma500/gma_device.c | 1 -
> drivers/gpu/drm/gma500/gma_display.c | 8 +++++++-
> drivers/gpu/drm/gma500/gtt.c | 3 ++-
> drivers/gpu/drm/gma500/gtt.h | 1 -
> drivers/gpu/drm/gma500/intel_bios.c | 4 ++--
> drivers/gpu/drm/gma500/intel_bios.h | 3 +--
> drivers/gpu/drm/gma500/intel_gmbus.c | 9 +++++----
> drivers/gpu/drm/gma500/intel_i2c.c | 3 ++-
> drivers/gpu/drm/gma500/mdfld_device.c | 6 ++++--
> drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 2 ++
> drivers/gpu/drm/gma500/mdfld_dsi_output.c | 5 +++--
> drivers/gpu/drm/gma500/mdfld_dsi_output.h | 2 +-
> drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 2 ++
> drivers/gpu/drm/gma500/mdfld_intel_display.c | 5 ++++-
> drivers/gpu/drm/gma500/mdfld_tmd_vid.c | 2 ++
> drivers/gpu/drm/gma500/mid_bios.c | 3 +--
> drivers/gpu/drm/gma500/mmu.c | 4 +++-
> drivers/gpu/drm/gma500/oaktrail_crtc.c | 4 +++-
> drivers/gpu/drm/gma500/oaktrail_device.c | 7 ++++---
> drivers/gpu/drm/gma500/oaktrail_hdmi.c | 6 ++++--
> drivers/gpu/drm/gma500/oaktrail_lvds.c | 4 ++--
> drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 1 -
> drivers/gpu/drm/gma500/power.h | 4 +++-
> drivers/gpu/drm/gma500/psb_device.c | 4 ++--
> drivers/gpu/drm/gma500/psb_drv.c | 26 +++++++++++++++++---------
> drivers/gpu/drm/gma500/psb_drv.h | 4 ++--
> drivers/gpu/drm/gma500/psb_intel_display.c | 3 ++-
> drivers/gpu/drm/gma500/psb_intel_lvds.c | 3 +--
> drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +-
> drivers/gpu/drm/gma500/psb_intel_sdvo.c | 10 +++++-----
> drivers/gpu/drm/gma500/psb_irq.c | 3 ++-
> drivers/gpu/drm/gma500/psb_irq.h | 2 +-
> drivers/gpu/drm/gma500/psb_lid.c | 4 ++--
> drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 8 +++++---
> include/drm/gma_drm.h | 25 -------------------------
> 45 files changed, 118 insertions(+), 103 deletions(-)
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v1 0/4] drm/gma500: drop use of drmP.h
2019-05-20 18:41 ` [PATCH v1 0/4] drm/gma500: drop use of drmP.h Daniel Vetter
@ 2019-05-20 21:38 ` Patrik Jakobsson
0 siblings, 0 replies; 7+ messages in thread
From: Patrik Jakobsson @ 2019-05-20 21:38 UTC (permalink / raw)
To: Daniel Vetter; +Cc: David Airlie, Sam Ravnborg, dri-devel
On Mon, May 20, 2019 at 8:41 PM Daniel Vetter <daniel@ffwll.ch> wrote:
>
> On Sun, May 19, 2019 at 03:51:05PM +0200, Sam Ravnborg wrote:
> > The following patchset remove use of the deprecated drmP.h
> > header file in the gma500 driver.
> > As preparation an empty header file is removed and a dependency on
> > drm_os_linux.h is dropped.
> > The list of include files are sorted and is some cases divided
> > up in blocks of linux/* drm/* etc.
> >
> > Build tested with allmodconfig and allyesconfig for x86, arm, alpha and more.
> >
> > Patchset made on top of drm-misc-next
>
> Nice series! On the entire pile:
>
> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Since gma500 is defacto unmaintained I think that's good enough, as long
> as you don't break anything. Maybe wait a bit before merging it all.
"Odd Fixes" is probably the correct status.
This looks good and runs fine. Thanks.
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
>
> Aside, I entirely forgot about drm_os_linux.h. That's another file we
> should kill with fire I think :-) Probably best done macro-by-macro or so
> ...
>
> Cheers, Daniel
> >
> > Sam
> >
> > Sam Ravnborg (4):
> > drm/gma500: remove empty gma_drm.h header file
> > drm/gma500: drop drmP.h from header files
> > drm/gma500: drop use of DRM_UDELAY wrapper
> > drm/gma500: drop drmp.h include from all .c files
> >
> > drivers/gpu/drm/gma500/accel_2d.c | 2 +-
> > drivers/gpu/drm/gma500/cdv_device.c | 5 +++--
> > drivers/gpu/drm/gma500/cdv_intel_crt.c | 2 +-
> > drivers/gpu/drm/gma500/cdv_intel_display.c | 4 +++-
> > drivers/gpu/drm/gma500/cdv_intel_dp.c | 7 ++++---
> > drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 5 +++--
> > drivers/gpu/drm/gma500/cdv_intel_lvds.c | 5 ++---
> > drivers/gpu/drm/gma500/framebuffer.c | 2 +-
> > drivers/gpu/drm/gma500/framebuffer.h | 1 -
> > drivers/gpu/drm/gma500/gem.c | 5 +++--
> > drivers/gpu/drm/gma500/gma_device.c | 1 -
> > drivers/gpu/drm/gma500/gma_display.c | 8 +++++++-
> > drivers/gpu/drm/gma500/gtt.c | 3 ++-
> > drivers/gpu/drm/gma500/gtt.h | 1 -
> > drivers/gpu/drm/gma500/intel_bios.c | 4 ++--
> > drivers/gpu/drm/gma500/intel_bios.h | 3 +--
> > drivers/gpu/drm/gma500/intel_gmbus.c | 9 +++++----
> > drivers/gpu/drm/gma500/intel_i2c.c | 3 ++-
> > drivers/gpu/drm/gma500/mdfld_device.c | 6 ++++--
> > drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 2 ++
> > drivers/gpu/drm/gma500/mdfld_dsi_output.c | 5 +++--
> > drivers/gpu/drm/gma500/mdfld_dsi_output.h | 2 +-
> > drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 2 ++
> > drivers/gpu/drm/gma500/mdfld_intel_display.c | 5 ++++-
> > drivers/gpu/drm/gma500/mdfld_tmd_vid.c | 2 ++
> > drivers/gpu/drm/gma500/mid_bios.c | 3 +--
> > drivers/gpu/drm/gma500/mmu.c | 4 +++-
> > drivers/gpu/drm/gma500/oaktrail_crtc.c | 4 +++-
> > drivers/gpu/drm/gma500/oaktrail_device.c | 7 ++++---
> > drivers/gpu/drm/gma500/oaktrail_hdmi.c | 6 ++++--
> > drivers/gpu/drm/gma500/oaktrail_lvds.c | 4 ++--
> > drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 1 -
> > drivers/gpu/drm/gma500/power.h | 4 +++-
> > drivers/gpu/drm/gma500/psb_device.c | 4 ++--
> > drivers/gpu/drm/gma500/psb_drv.c | 26 +++++++++++++++++---------
> > drivers/gpu/drm/gma500/psb_drv.h | 4 ++--
> > drivers/gpu/drm/gma500/psb_intel_display.c | 3 ++-
> > drivers/gpu/drm/gma500/psb_intel_lvds.c | 3 +--
> > drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +-
> > drivers/gpu/drm/gma500/psb_intel_sdvo.c | 10 +++++-----
> > drivers/gpu/drm/gma500/psb_irq.c | 3 ++-
> > drivers/gpu/drm/gma500/psb_irq.h | 2 +-
> > drivers/gpu/drm/gma500/psb_lid.c | 4 ++--
> > drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 8 +++++---
> > include/drm/gma_drm.h | 25 -------------------------
> > 45 files changed, 118 insertions(+), 103 deletions(-)
> >
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread