Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23ef59ef authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Extract drm_pci.h 



Just another step in finally making drmP.h obsolete.

Reviewed-by: default avatarGustavo Padovan <gustavo.padovan@collabora.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170308141257.12119-5-daniel.vetter@ffwll.ch
parent d891b9c7

drivers/gpu/drm/drm_pci.c

+7 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/slab.h>

#include <linux/dma-mapping.h>

#include <linux/export.h>

#include <drm/drm_pci.h>

#include <drm/drmP.h>

#include "drm_internal.h"

#include "drm_legacy.h"
@@ -36,6 +37,9 @@ 
 * @size: size of block to allocate

 * @align: alignment of block

 *

 * FIXME: This is a needless abstraction of the Linux dma-api and should be

 * removed.

 *

 * Return: A handle to the allocated memory block on success or NULL on

 * failure.

 */
@@ -104,6 +108,9 @@ void __drm_legacy_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) 
 * drm_pci_free - Free a PCI consistent memory block

 * @dev: DRM device

 * @dmah: handle to memory block

 *

 * FIXME: This is a needless abstraction of the Linux dma-api and should be

 * removed.

 */

void drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)

{

include/drm/drmP.h

+4 −39
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include <linux/miscdevice.h>

#include <linux/mm.h>

#include <linux/mutex.h>

#include <linux/pci.h>

#include <linux/platform_device.h>

#include <linux/poll.h>

#include <linux/ratelimit.h>
@@ -77,6 +76,7 @@ 
#include <drm/drm_sarea.h>

#include <drm/drm_drv.h>

#include <drm/drm_prime.h>

#include <drm/drm_pci.h>



struct module;
@@ -85,7 +85,6 @@ struct drm_device; 
struct drm_agp_head;

struct drm_local_map;

struct drm_device_dma;

struct drm_dma_handle;

struct drm_gem_object;

struct drm_master;

struct drm_vblank_crtc;
@@ -96,6 +95,9 @@ struct videomode; 
struct reservation_object;

struct dma_buf_attachment;



struct pci_dev;

struct pci_controller;



/*

 * The following categories are defined:

 *
@@ -739,49 +741,12 @@ static inline int drm_debugfs_remove_files(const struct drm_info_list *files, 
}

#endif





extern struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size,

					    size_t align);

extern void drm_pci_free(struct drm_device *dev, struct drm_dma_handle * dmah);



			       /* sysfs support (drm_sysfs.c) */

extern void drm_sysfs_hotplug_event(struct drm_device *dev);





/*@}*/



extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver);

extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);

#ifdef CONFIG_PCI

extern int drm_get_pci_dev(struct pci_dev *pdev,

			   const struct pci_device_id *ent,

			   struct drm_driver *driver);

extern int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master);

#else

static inline int drm_get_pci_dev(struct pci_dev *pdev,

				  const struct pci_device_id *ent,

				  struct drm_driver *driver)

{

	return -ENOSYS;

}



static inline int drm_pci_set_busid(struct drm_device *dev,

				    struct drm_master *master)

{

	return -ENOSYS;

}

#endif



#define DRM_PCIE_SPEED_25 1

#define DRM_PCIE_SPEED_50 2

#define DRM_PCIE_SPEED_80 4



extern int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *speed_mask);

extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw);



/* platform section */

extern int drm_platform_init(struct drm_driver *driver, struct platform_device *platform_device);



/* returns true if currently okay to sleep */

static __inline__ bool drm_can_sleep(void)

{

include/drm/drm_pci.h

0 → 100644
+78 −0
Original line number Diff line number Diff line 
/*

 * Internal Header for the Direct Rendering Manager

 *

 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.

 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.

 * Copyright (c) 2009-2010, Code Aurora Forum.

 * All rights reserved.

 *

 * Author: Rickard E. (Rik) Faith <faith@valinux.com>

 * Author: Gareth Hughes <gareth@valinux.com>

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice (including the next

 * paragraph) shall be included in all copies or substantial portions of the

 * Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */



#ifndef _DRM_PCI_H_

#define _DRM_PCI_H_



#include <linux/pci.h>



struct drm_dma_handle;

struct drm_device;

struct drm_driver;

struct drm_master;



extern struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size,

					    size_t align);

extern void drm_pci_free(struct drm_device *dev, struct drm_dma_handle * dmah);



extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver);

extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);

#ifdef CONFIG_PCI

extern int drm_get_pci_dev(struct pci_dev *pdev,

			   const struct pci_device_id *ent,

			   struct drm_driver *driver);

extern int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master);

#else

static inline int drm_get_pci_dev(struct pci_dev *pdev,

				  const struct pci_device_id *ent,

				  struct drm_driver *driver)

{

	return -ENOSYS;

}



static inline int drm_pci_set_busid(struct drm_device *dev,

				    struct drm_master *master)

{

	return -ENOSYS;

}

#endif



#define DRM_PCIE_SPEED_25 1

#define DRM_PCIE_SPEED_50 2

#define DRM_PCIE_SPEED_80 4



extern int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *speed_mask);

extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw);



/* platform section */

extern int drm_platform_init(struct drm_driver *driver, struct platform_device *platform_device);



#endif /* _DRM_PCI_H_ */