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

Commit b694dfb2 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: fix build with CONFIG_AGP=n 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 61c2bb45

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −0
Original line number Diff line number Diff line
@@ -311,8 +311,10 @@ nouveau_bo_create_ttm_backend_entry(struct ttm_bo_device *bdev) 
	struct drm_device *dev = dev_priv->dev;



	switch (dev_priv->gart_info.type) {

#if __OS_HAS_AGP

	case NOUVEAU_GART_AGP:

		return ttm_agp_backend_init(bdev, dev->agp->bridge);

#endif

	case NOUVEAU_GART_SGDMA:

		return nouveau_sgdma_init_ttm(dev);

	default:

drivers/gpu/drm/nouveau/nouveau_mem.c

+4 −0
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ uint64_t nouveau_mem_fb_amount(struct drm_device *dev) 
	return 0;

}



#if __OS_HAS_AGP

static void nouveau_mem_reset_agp(struct drm_device *dev)

{

	uint32_t saved_pci_nv_1, saved_pci_nv_19, pmc_enable;
@@ -432,10 +433,12 @@ static void nouveau_mem_reset_agp(struct drm_device *dev) 
	nv_wr32(dev, NV04_PBUS_PCI_NV_19, saved_pci_nv_19);

	nv_wr32(dev, NV04_PBUS_PCI_NV_1, saved_pci_nv_1);

}

#endif



int

nouveau_mem_init_agp(struct drm_device *dev)

{

#if __OS_HAS_AGP

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct drm_agp_info info;

	struct drm_agp_mode mode;
@@ -471,6 +474,7 @@ nouveau_mem_init_agp(struct drm_device *dev) 
	dev_priv->gart_info.type	= NOUVEAU_GART_AGP;

	dev_priv->gart_info.aper_base	= info.aperture_base;

	dev_priv->gart_info.aper_size	= info.aperture_size;

#endif

	return 0;

}