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

Commit de5899bd authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

drm/nouveau: Add module parameter to override the default AGP rate. 



Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 71d06186

drivers/gpu/drm/nouveau/nouveau_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ 


#include "drm_pciids.h"



MODULE_PARM_DESC(noagp, "Disable AGP");

int nouveau_noagp;

module_param_named(noagp, nouveau_noagp, int, 0400);

MODULE_PARM_DESC(agpmode, "AGP mode (0 to disable AGP)");

int nouveau_agpmode = -1;

module_param_named(agpmode, nouveau_agpmode, int, 0400);



MODULE_PARM_DESC(modeset, "Enable kernel modesetting");

static int nouveau_modeset = -1; /* kms */

drivers/gpu/drm/nouveau/nouveau_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ nouveau_bo_ref(struct nouveau_bo *ref, struct nouveau_bo **pnvbo) 
} while (0)



/* nouveau_drv.c */

extern int nouveau_noagp;

extern int nouveau_agpmode;

extern int nouveau_duallink;

extern int nouveau_uscript_lvds;

extern int nouveau_uscript_tmds;

drivers/gpu/drm/nouveau/nouveau_mem.c

+11 −1
Original line number Diff line number Diff line
@@ -430,6 +430,16 @@ get_agp_mode(struct drm_device *dev, unsigned long mode) 
	if (dev_priv->chipset == 0x18)

		mode &= ~PCI_AGP_COMMAND_FW;



	/*

	 * AGP mode set in the command line.

	 */

	if (nouveau_agpmode > 0) {

		bool agpv3 = mode & 0x8;

		int rate = agpv3 ? nouveau_agpmode / 4 : nouveau_agpmode;



		mode = (mode & ~0x7) | (rate & 0x7);

	}



	return mode;

}

#endif
@@ -613,7 +623,7 @@ nouveau_mem_gart_init(struct drm_device *dev) 
	dev_priv->gart_info.type = NOUVEAU_GART_NONE;



#if !defined(__powerpc__) && !defined(__ia64__)

	if (drm_device_is_agp(dev) && dev->agp && !nouveau_noagp) {

	if (drm_device_is_agp(dev) && dev->agp && nouveau_agpmode) {

		ret = nouveau_mem_init_agp(dev);

		if (ret)

			NV_ERROR(dev, "Error initialising AGP: %d\n", ret);