drm/gma500: drop use of drmP.h
Subsystems (3)
cover drm/gma500: drop use of drmP.h
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
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(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/4 drm/gma500: remove empty gma_drm.h header file
The header file gma_drm.h is empty so remove it and drop all uses of the file.
--- 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
drivers/gpu/drm/gma500/cdv_device.c +1 -1
@@ -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"
drivers/gpu/drm/gma500/gem.c +1 -1
@@ -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)
drivers/gpu/drm/gma500/intel_bios.c +1 -1
@@ -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"
drivers/gpu/drm/gma500/intel_gmbus.c +1 -1
@@ -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"
drivers/gpu/drm/gma500/mid_bios.c +1 -1
@@ -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"
drivers/gpu/drm/gma500/oaktrail_device.c +1 -1
@@ -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"
drivers/gpu/drm/gma500/psb_device.c +1 -1
@@ -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"
drivers/gpu/drm/gma500/psb_drv.h +1 -1
@@ -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"
drivers/gpu/drm/gma500/psb_intel_sdvo.c +1 -1
@@ -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"
include/drm/gma_drm.h deleted +0 -25
@@ -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
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/4 drm/gma500: drop drmP.h from header files
In reply to Sam RavnborgDrop 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
--- 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(-)
drivers/gpu/drm/gma500/framebuffer.h +0 -1
@@ -22,7 +22,6 @@#ifndef _FRAMEBUFFER_H_#define _FRAMEBUFFER_H_ -#include <drm/drmP.h> #include <drm/drm_fb_helper.h> #include "psb_drv.h"
drivers/gpu/drm/gma500/gtt.h +0 -1
@@ -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 */
drivers/gpu/drm/gma500/intel_bios.c +1 -0
@@ -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"
drivers/gpu/drm/gma500/intel_bios.h +1 -2
@@ -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$' */
drivers/gpu/drm/gma500/intel_i2c.c +2 -1
@@ -17,9 +17,10 @@* Authors: * Eric Anholt <[email protected]> */ +#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"
drivers/gpu/drm/gma500/mdfld_device.c +2 -0
@@ -17,6 +17,8 @@* **************************************************************************/ +#include <linux/delay.h> +#include "psb_drv.h" #include "mid_bios.h" #include "mdfld_output.h"
drivers/gpu/drm/gma500/mdfld_dsi_dpi.c +2 -0
@@ -25,6 +25,8 @@* Jackie Li<[email protected]> */ +#include <linux/delay.h> +#include "mdfld_dsi_dpi.h" #include "mdfld_output.h" #include "mdfld_dsi_pkg_sender.h"
drivers/gpu/drm/gma500/mdfld_dsi_output.c +3 -2
@@ -25,14 +25,15 @@* Jackie Li<[email protected]> */ -#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. */
drivers/gpu/drm/gma500/mdfld_dsi_output.h +1 -1
@@ -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>
drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c +2 -0
@@ -24,7 +24,9 @@* Jackie Li<[email protected]> */ +#include <linux/delay.h> #include <linux/freezer.h> +#include <video/mipi_display.h> #include "mdfld_dsi_output.h"
drivers/gpu/drm/gma500/mdfld_tmd_vid.c +2 -0
@@ -27,6 +27,8 @@* Scott Rowe <[email protected]> */ +#include <linux/delay.h> +#include "mdfld_dsi_dpi.h" #include "mdfld_dsi_pkg_sender.h"
drivers/gpu/drm/gma500/power.h +3 -1
@@ -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);
drivers/gpu/drm/gma500/psb_drv.h +1 -1
@@ -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"
drivers/gpu/drm/gma500/psb_irq.h +1 -1
@@ -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);
drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c +5 -3
@@ -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;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/4 drm/gma500: drop use of DRM_UDELAY wrapper
In reply to Sam RavnborgThe 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().
--- 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(-)
drivers/gpu/drm/gma500/mdfld_device.c +2 -2
@@ -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 ));
drivers/gpu/drm/gma500/oaktrail_device.c +1 -1
@@ -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 );
drivers/gpu/drm/gma500/oaktrail_hdmi.c +1 -1
@@ -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 );
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 4/4 drm/gma500: drop drmp.h include from all .c files
In reply to Sam RavnborgDrop 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.
--- 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(-)
drivers/gpu/drm/gma500/accel_2d.c +1 -1
@@ -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"
drivers/gpu/drm/gma500/cdv_device.c +2 -1
@@ -18,7 +18,8 @@**************************************************************************/ #include <linux/backlight.h> -#include <drm/drmP.h> +#include <linux/delay.h> +#include <drm/drm.h> #include "psb_drv.h"
drivers/gpu/drm/gma500/cdv_intel_crt.c +1 -1
@@ -24,8 +24,8 @@* Eric Anholt <[email protected]> */ +#include <linux/delay.h> #include <linux/i2c.h> -#include <drm/drmP.h> #include "intel_bios.h" #include "psb_drv.h"
drivers/gpu/drm/gma500/cdv_intel_display.c +3 -1
@@ -18,9 +18,11 @@* Eric Anholt <[email protected]> */ +#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"
drivers/gpu/drm/gma500/cdv_intel_dp.c +4 -3
@@ -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
drivers/gpu/drm/gma500/cdv_intel_hdmi.c +3 -2
@@ -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)
drivers/gpu/drm/gma500/cdv_intel_lvds.c +2 -3
@@ -20,16 +20,15 @@* Jesse Barnes <[email protected]> */ -#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" /**
drivers/gpu/drm/gma500/framebuffer.c +1 -1
@@ -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"
drivers/gpu/drm/gma500/gem.c +2 -1
@@ -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>
drivers/gpu/drm/gma500/gma_device.c +0 -1
@@ -13,7 +13,6 @@* **************************************************************************/ -#include <drm/drmP.h> #include "psb_drv.h" void gma_get_core_freq (struct drm_device *dev)
drivers/gpu/drm/gma500/gma_display.c +7 -1
@@ -19,7 +19,13 @@* Patrik Jakobsson <[email protected]> */ -#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"
drivers/gpu/drm/gma500/gtt.c +2 -1
@@ -19,9 +19,10 @@* Alan Cox <[email protected]> */ -#include <drm/drmP.h> #include <linux/shmem_fs.h> +#include <asm/set_memory.h> +#include "psb_drv.h" #include "blitter.h"
drivers/gpu/drm/gma500/intel_bios.c +0 -1
@@ -18,7 +18,6 @@* Eric Anholt <[email protected]> * */ -#include <drm/drmP.h> #include <drm/drm.h> #include <drm/drm_dp_helper.h>
drivers/gpu/drm/gma500/intel_gmbus.c +4 -3
@@ -26,10 +26,11 @@* Eric Anholt <[email protected]> * Chris Wilson <[email protected]> */ -#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"
drivers/gpu/drm/gma500/mdfld_intel_display.c +4 -1
@@ -18,10 +18,13 @@* Eric Anholt <[email protected]> */ +#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"
drivers/gpu/drm/gma500/mid_bios.c +0 -1
@@ -23,7 +23,6 @@* - Check ioremap failures */ -#include <drm/drmP.h> #include <drm/drm.h> #include "psb_drv.h"
drivers/gpu/drm/gma500/mmu.c +3 -1
@@ -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"
drivers/gpu/drm/gma500/oaktrail_crtc.c +3 -1
@@ -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"
drivers/gpu/drm/gma500/oaktrail_device.c +2 -1
@@ -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"
drivers/gpu/drm/gma500/oaktrail_hdmi.c +3 -1
@@ -24,8 +24,10 @@* Li Peng <[email protected]> */ -#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"
drivers/gpu/drm/gma500/oaktrail_lvds.c +2 -2
@@ -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
drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c +0 -1
@@ -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"
drivers/gpu/drm/gma500/psb_device.c +1 -1
@@ -18,7 +18,7 @@**************************************************************************/ #include <linux/backlight.h> -#include <drm/drmP.h> +#include <drm/drm.h> #include "psb_drv.h"
drivers/gpu/drm/gma500/psb_drv.c +17 -9
@@ -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);
drivers/gpu/drm/gma500/psb_intel_display.c +2 -1
@@ -18,10 +18,11 @@* Eric Anholt <[email protected]> */ +#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"
drivers/gpu/drm/gma500/psb_intel_lvds.c +1 -2
@@ -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
drivers/gpu/drm/gma500/psb_intel_modes.c +1 -1
@@ -18,7 +18,7 @@*/ #include <linux/i2c.h> -#include <drm/drmP.h> +#include "psb_intel_drv.h" /**
drivers/gpu/drm/gma500/psb_intel_sdvo.c +4 -4
@@ -25,11 +25,12 @@* Authors: * Eric Anholt <[email protected]> */ -#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)
drivers/gpu/drm/gma500/psb_irq.c +2 -1
@@ -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"
drivers/gpu/drm/gma500/psb_lid.c +2 -2
@@ -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) {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 10 lines · Sam Ravnborg
The following patchset remove use of the deprecated
drmP.hheader file in the gma500 driver.
As preparation an empty header file is removed and a dependency ondrm_os_linux.his 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:
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
Quoted 56 lines
Sam
Sam Ravnborg (4):
drm/gma500: remove emptygma_drm.hheader file drm/gma500: dropdrmP.hfrom header files drm/gma500: drop use ofDRM_UDELAYwrapper drm/gma500: dropdrmp.hinclude from all .c filesdrivers/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(-)
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patrik Jakobsson
maintainerQuoted 11 lines · Daniel Vetter
Quoted 9 lines · Sam Ravnborg
The following patchset remove use of the deprecated
drmP.hheader file in the gma500 driver.
As preparation an empty header file is removed and a dependency ondrm_os_linux.his 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.
Quoted 8 lines
Quoted 1 line
Patchset made on top of drm-misc-next
Nice series! On the entire pile:
Acked-by Daniel Vetter <[email protected]>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.
Quoted 63 lines
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
Quoted 47 lines
Sam
Sam Ravnborg (4):
drm/gma500: remove emptygma_drm.hheader file drm/gma500: dropdrmP.hfrom header files drm/gma500: drop use ofDRM_UDELAYwrapper drm/gma500: dropdrmp.hinclude from all .c filesdrivers/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 +--Quoted 9 lines
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(-)
Quoted 4 lines
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel