[PATCH v1 2/2] drm/savage: drop use of drmP.h

[Daniel Vetter]

On Wed, Jun 05, 2019 at 04:03:14PM +0200, Sam Ravnborg wrote:
> Drop use of the deprecated drmP.h header file.
> Replace it with the necessary includes of other headers.
> 
> Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
> Cc: David Airlie <airlied at linux.ie>
> Cc: Daniel Vetter <daniel at ffwll.ch>

Assuming it all compiles still, on the series:

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Since sis/savage are unmaintained I think you can just go ahead and push
those.
-Daniel

> ---
>  drivers/gpu/drm/savage/savage_bci.c   | 8 +++++++-
>  drivers/gpu/drm/savage/savage_drv.c   | 9 +++++----
>  drivers/gpu/drm/savage/savage_drv.h   | 4 ++++
>  drivers/gpu/drm/savage/savage_state.c | 9 ++++++++-
>  4 files changed, 24 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c
> index aa00cf117433..6889d6534eba 100644
> --- a/drivers/gpu/drm/savage/savage_bci.c
> +++ b/drivers/gpu/drm/savage/savage_bci.c
> @@ -24,9 +24,15 @@
>   */
>  
>  #include <linux/delay.h>
> +#include <linux/pci.h>
> +#include <linux/slab.h>
> +#include <linux/uaccess.h>
>  
> -#include <drm/drmP.h>
> +#include <drm/drm_device.h>
> +#include <drm/drm_file.h>
> +#include <drm/drm_print.h>
>  #include <drm/savage_drm.h>
> +
>  #include "savage_drv.h"
>  
>  /* Need a long timeout for shadow status updates can take a while
> diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c
> index 2bddeb8bf457..2966fcfd9548 100644
> --- a/drivers/gpu/drm/savage/savage_drv.c
> +++ b/drivers/gpu/drm/savage/savage_drv.c
> @@ -25,12 +25,13 @@
>  
>  #include <linux/module.h>
>  
> -#include <drm/drmP.h>
> -#include <drm/savage_drm.h>
> -#include "savage_drv.h"
> -
> +#include <drm/drm_drv.h>
> +#include <drm/drm_file.h>
> +#include <drm/drm_pci.h>
>  #include <drm/drm_pciids.h>
>  
> +#include "savage_drv.h"
> +
>  static struct pci_device_id pciidlist[] = {
>  	savage_PCI_IDS
>  };
> diff --git a/drivers/gpu/drm/savage/savage_drv.h b/drivers/gpu/drm/savage/savage_drv.h
> index 38aab625f12e..b0081bb64776 100644
> --- a/drivers/gpu/drm/savage/savage_drv.h
> +++ b/drivers/gpu/drm/savage/savage_drv.h
> @@ -26,7 +26,11 @@
>  #ifndef __SAVAGE_DRV_H__
>  #define __SAVAGE_DRV_H__
>  
> +#include <linux/io.h>
> +
> +#include <drm/drm_ioctl.h>
>  #include <drm/drm_legacy.h>
> +#include <drm/savage_drm.h>
>  
>  #define DRIVER_AUTHOR	"Felix Kuehling"
>  
> diff --git a/drivers/gpu/drm/savage/savage_state.c b/drivers/gpu/drm/savage/savage_state.c
> index ebb8b7d32b33..a2ac25c11c90 100644
> --- a/drivers/gpu/drm/savage/savage_state.c
> +++ b/drivers/gpu/drm/savage/savage_state.c
> @@ -22,8 +22,15 @@
>   * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
>   * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>   */
> -#include <drm/drmP.h>
> +
> +#include <linux/slab.h>
> +#include <linux/uaccess.h>
> +
> +#include <drm/drm_device.h>
> +#include <drm/drm_file.h>
> +#include <drm/drm_print.h>
>  #include <drm/savage_drm.h>
> +
>  #include "savage_drv.h"
>  
>  void savage_emit_clip_rect_s3d(drm_savage_private_t * dev_priv,
> -- 
> 2.20.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch