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

Commit 340b0e7c authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/pci: merge agp handling from nouveau drm 



This commit reinstates the pre-DEVINIT AGP fiddling that was broken in
an earlier commit.

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

drivers/gpu/drm/nouveau/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ nouveau-y += $(nvkm-y) 
ifdef CONFIG_X86

nouveau-$(CONFIG_ACPI) += nouveau_acpi.o

endif

nouveau-y += nouveau_agp.o

nouveau-$(CONFIG_DEBUG_FS) += nouveau_debugfs.o

nouveau-y += nouveau_drm.o

nouveau-y += nouveau_hwmon.o

drivers/gpu/drm/nouveau/include/nvif/device.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ u64 nvif_device_time(struct nvif_device *); 
#include <subdev/i2c.h>

#include <subdev/timer.h>

#include <subdev/therm.h>

#include <subdev/pci.h>



#define nvxx_device(a) ({                                                      \

	struct nvif_device *_device = (a);                                     \

drivers/gpu/drm/nouveau/include/nvif/os.h

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

#include <linux/clk.h>

#include <linux/regulator/consumer.h>

#include <linux/agp_backend.h>



#include <asm/unaligned.h>

drivers/gpu/drm/nouveau/include/nvkm/core/option.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


const char *nvkm_stropt(const char *optstr, const char *opt, int *len);

bool nvkm_boolopt(const char *optstr, const char *opt, bool value);

long nvkm_longopt(const char *optstr, const char *opt, long value);

int  nvkm_dbgopt(const char *optstr, const char *sub);



/* compares unterminated string 'str' with zero-terminated string 'cmp' */

drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h

+11 −0
Original line number Diff line number Diff line
@@ -7,6 +7,17 @@ struct nvkm_pci { 
	struct nvkm_subdev subdev;

	struct pci_dev *pdev;

	int irq;



	struct {

		struct agp_bridge_data *bridge;

		u32 mode;

		u64 base;

		u64 size;

		int mtrr;

		bool cma;

		bool acquired;

	} agp;



	bool msi;

};