hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm: remove device_is_agp callback 

With that the drm_pci_device_is_agp function becomes trivial, so
inline that too. And while at it, move the drm_pci_agp_destroy
declaration into drm-internal.h, since it's not used by drivers.

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170125062657.19270-11-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2017-01-25 07:26:52 +01:00
parent 858b2c1bf8
commit 2ce0264d61
7 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/drm_internal.h
View File

@ -31,6 +31,7 @@ void drm_lastclose(struct drm_device *dev);
/* drm_pci.c */ /* drm_pci.c */
int drm_irq_by_busid(struct drm_device *dev, void *data, int drm_irq_by_busid(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
void drm_pci_agp_destroy(struct drm_device *dev);
/* drm_prime.c */ /* drm_prime.c */
int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data, int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data,

2
drivers/gpu/drm/drm_pci.c
View File

@ -191,7 +191,7 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
static void drm_pci_agp_init(struct drm_device *dev) static void drm_pci_agp_init(struct drm_device *dev)
{ {
if (drm_core_check_feature(dev, DRIVER_USE_AGP)) { if (drm_core_check_feature(dev, DRIVER_USE_AGP)) {
if (drm_pci_device_is_agp(dev)) if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))
dev->agp = drm_agp_init(dev); dev->agp = drm_agp_init(dev);
if (dev->agp) { if (dev->agp) {
dev->agp->agp_mtrr = arch_phys_wc_add( dev->agp->agp_mtrr = arch_phys_wc_add(

2
drivers/gpu/drm/nouveau/nouveau_abi16.c
View File

@ -199,7 +199,7 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)
if (!nvxx_device(device)->func->pci) if (!nvxx_device(device)->func->pci)
getparam->value = 3; getparam->value = 3;
else else
if (drm_pci_device_is_agp(dev)) if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))
getparam->value = 0; getparam->value = 0;
else else
if (!pci_is_pcie(dev->pdev)) if (!pci_is_pcie(dev->pdev))

3
drivers/gpu/drm/radeon/radeon_cs.c
View File

@ -121,7 +121,8 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
VRAM, also but everything into VRAM on AGP cards and older VRAM, also but everything into VRAM on AGP cards and older
IGP chips to avoid image corruptions */ IGP chips to avoid image corruptions */
if (p->ring == R600_RING_TYPE_UVD_INDEX && if (p->ring == R600_RING_TYPE_UVD_INDEX &&
(i == 0 || drm_pci_device_is_agp(p->rdev->ddev) || (i == 0 || pci_find_capability(p->rdev->ddev->pdev,
PCI_CAP_ID_AGP) ||
p->rdev->family == CHIP_RS780 || p->rdev->family == CHIP_RS780 ||
p->rdev->family == CHIP_RS880)) { p->rdev->family == CHIP_RS880)) {

2
drivers/gpu/drm/radeon/radeon_kms.c
View File

@ -105,7 +105,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
dev->dev_private = (void *)rdev; dev->dev_private = (void *)rdev;
/* update BUS flag */ /* update BUS flag */
if (drm_pci_device_is_agp(dev)) { if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP)) {
flags |= RADEON_IS_AGP; flags |= RADEON_IS_AGP;
} else if (pci_is_pcie(dev->pdev)) { } else if (pci_is_pcie(dev->pdev)) {
flags |= RADEON_IS_PCIE; flags |= RADEON_IS_PCIE;

15
include/drm/drmP.h
View File

@ -790,21 +790,6 @@ extern void drm_sysfs_hotplug_event(struct drm_device *dev);
/*@}*/ /*@}*/
/* PCI section */
static __inline__ int drm_pci_device_is_agp(struct drm_device *dev)
{
if (dev->driver->device_is_agp != NULL) {
int err = (*dev->driver->device_is_agp) (dev);
if (err != 2) {
return err;
}
}
return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP);
}
void drm_pci_agp_destroy(struct drm_device *dev);
extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver); 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); extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI

14
include/drm/drm_drv.h
View File

@ -150,20 +150,6 @@ struct drm_driver {
*/ */
void (*disable_vblank) (struct drm_device *dev, unsigned int pipe); void (*disable_vblank) (struct drm_device *dev, unsigned int pipe);
/**
* @device_is_agp:
*
* Called by drm_device_is_agp(). Typically used to determine if a card
* is really attached to AGP or not.
*
* Returns:
*
* One of three values is returned depending on whether or not the
* card is absolutely not AGP (return of 0), absolutely is AGP
* (return of 1), or may or may not be AGP (return of 2).
*/
int (*device_is_agp) (struct drm_device *dev);
/** /**
* @get_scanout_position: * @get_scanout_position:
* *