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

Commit e2404e7c authored by Daniel Vetter's avatar Daniel Vetter Committed by Chris Wilson
Browse files

agp/intel: make intel-gtt.c into a real source file 



Now that the disentangling is complete, stop including intel-gtt.c
from intel-agp.c.

The linux build system _really_ doesn't allow .c source files with the
same name as the module. It fails with the following message when trying
to build such a bugger:

make[3]: Circular drivers/char/agp/intel-agp.o <- drivers/char/agp/intel-agp.o dependency dropped.

Instead of renameing intel-agp.c I've simply created a new module out
of intel-gtt.c. Renaming intel-agp.ko to something else is not an option
for it will surely kill someones boot process.

This also paves the way to use the gtt code without loading the agp
driver.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 02c026ce

drivers/char/agp/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ obj-$(CONFIG_AGP_HP_ZX1) += hp-agp.o 
obj-$(CONFIG_AGP_PARISC)	+= parisc-agp.o

obj-$(CONFIG_AGP_PARISC)	+= parisc-agp.o

obj-$(CONFIG_AGP_I460)		+= i460-agp.o

obj-$(CONFIG_AGP_I460)		+= i460-agp.o

obj-$(CONFIG_AGP_INTEL)		+= intel-agp.o

obj-$(CONFIG_AGP_INTEL)		+= intel-agp.o

obj-$(CONFIG_AGP_INTEL)		+= intel-gtt.o

obj-$(CONFIG_AGP_NVIDIA)	+= nvidia-agp.o

obj-$(CONFIG_AGP_NVIDIA)	+= nvidia-agp.o

obj-$(CONFIG_AGP_SGI_TIOCA)	+= sgi-agp.o

obj-$(CONFIG_AGP_SGI_TIOCA)	+= sgi-agp.o

obj-$(CONFIG_AGP_SIS)		+= sis-agp.o

obj-$(CONFIG_AGP_SIS)		+= sis-agp.o

drivers/char/agp/intel-agp.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -12,9 +12,6 @@ 
#include <asm/smp.h>

#include <asm/smp.h>

#include "agp.h"

#include "agp.h"

#include "intel-agp.h"

#include "intel-agp.h"

#include <linux/intel-gtt.h>



#include "intel-gtt.c"





int intel_agp_enabled;

int intel_agp_enabled;

EXPORT_SYMBOL(intel_agp_enabled);

EXPORT_SYMBOL(intel_agp_enabled);

drivers/char/agp/intel-agp.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -253,4 +253,7 @@ 
		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB || \

		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB || \

		IS_SNB)

		IS_SNB)





int intel_gmch_probe(struct pci_dev *pdev,

			       struct agp_bridge_data *bridge);

void intel_gmch_remove(struct pci_dev *pdev);

#endif
 
#endif

drivers/char/agp/intel-gtt.c

+18 −2
Original line number Original line Diff line number Diff line
@@ -15,6 +15,17 @@ 
 * /fairy-tale-mode off

 * /fairy-tale-mode off

 */

 */





#include <linux/module.h>

#include <linux/pci.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/pagemap.h>

#include <linux/agp_backend.h>

#include <asm/smp.h>

#include "agp.h"

#include "intel-agp.h"

#include <linux/intel-gtt.h>



/*

/*

 * If we have Intel graphics, we're not going to have anything other than

 * If we have Intel graphics, we're not going to have anything other than

 * an Intel IOMMU. So make the correct use of the PCI DMA API contingent

 * an Intel IOMMU. So make the correct use of the PCI DMA API contingent
@@ -1728,7 +1739,7 @@ static int find_gmch(u16 device) 
	return 1;

	return 1;

}

}





int __devinit intel_gmch_probe(struct pci_dev *pdev,

int intel_gmch_probe(struct pci_dev *pdev,

				      struct agp_bridge_data *bridge)

				      struct agp_bridge_data *bridge)

{

{

	int i, mask;

	int i, mask;
@@ -1766,9 +1777,14 @@ int __devinit intel_gmch_probe(struct pci_dev *pdev, 




	return 1;

	return 1;

}

}

EXPORT_SYMBOL(intel_gmch_probe);





void __devexit intel_gmch_remove(struct pci_dev *pdev)

void intel_gmch_remove(struct pci_dev *pdev)

{

{

	if (intel_private.pcidev)

	if (intel_private.pcidev)

		pci_dev_put(intel_private.pcidev);

		pci_dev_put(intel_private.pcidev);

}

}

EXPORT_SYMBOL(intel_gmch_remove);



MODULE_AUTHOR("Dave Jones <davej@redhat.com>");

MODULE_LICENSE("GPL and additional rights");