Commit 70790f4f authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/clock: pull in the implementation from all over the place 



Still missing the main bits we use to change performance levels, I'll get
to it after all the hard yakka has been finished.

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

drivers/gpu/drm/nouveau/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -23,11 +23,14 @@ nouveau-y += core/subdev/bios/bit.o 
nouveau-y += core/subdev/bios/dcb.o

nouveau-y += core/subdev/bios/gpio.o

nouveau-y += core/subdev/bios/i2c.o

nouveau-y += core/subdev/bios/pll.o

nouveau-y += core/subdev/clock/nv04.o

nouveau-y += core/subdev/clock/nv40.o

nouveau-y += core/subdev/clock/nv50.o

nouveau-y += core/subdev/clock/nva3.o

nouveau-y += core/subdev/clock/nvc0.o

nouveau-y += core/subdev/clock/pllnv04.o

nouveau-y += core/subdev/clock/pllnva3.o

nouveau-y += core/subdev/device/base.o

nouveau-y += core/subdev/device/nv04.o

nouveau-y += core/subdev/device/nv10.o
@@ -114,7 +117,6 @@ nouveau-y += nouveau_drm.o nouveau_compat.o \ 
             nv50_cursor.o nv50_display.o \

             nvd0_display.o \

             nv04_fbcon.o nv50_fbcon.o nvc0_fbcon.o \

	     nv50_calc.o \

	     nv04_pm.o nv40_pm.o nv50_pm.o nva3_pm.o nvc0_pm.o \

	     nouveau_prime.o

drivers/gpu/drm/nouveau/core/include/subdev/bios/pll.h

0 → 100644
+77 −0
Original line number Diff line number Diff line 
#ifndef __NVBIOS_PLL_H__

#define __NVBIOS_PLL_H__



/*XXX: kill me */

struct nouveau_pll_vals {

	union {

		struct {

#ifdef __BIG_ENDIAN

			uint8_t N1, M1, N2, M2;

#else

			uint8_t M1, N1, M2, N2;

#endif

		};

		struct {

			uint16_t NM1, NM2;

		} __attribute__((packed));

	};

	int log2P;



	int refclk;

};



struct nouveau_bios;



/* these match types in pll limits table version 0x40,

 * nouveau uses them on all chipsets internally where a

 * specific pll needs to be referenced, but the exact

 * register isn't known.

 */

enum nvbios_pll_type {

	PLL_CORE   = 0x01,

	PLL_SHADER = 0x02,

	PLL_UNK03  = 0x03,

	PLL_MEMORY = 0x04,

	PLL_VDEC   = 0x05,

	PLL_UNK40  = 0x40,

	PLL_UNK41  = 0x41,

	PLL_UNK42  = 0x42,

	PLL_VPLL0  = 0x80,

	PLL_VPLL1  = 0x81,

	PLL_MAX    = 0xff

};



struct nvbios_pll {

	enum nvbios_pll_type type;

	u32 reg;

	u32 refclk;



	u8 min_p;

	u8 max_p;

	u8 bias_p;



	/*

	 * for most pre nv50 cards setting a log2P of 7 (the common max_log2p

	 * value) is no different to 6 (at least for vplls) so allowing the MNP

	 * calc to use 7 causes the generated clock to be out by a factor of 2.

	 * however, max_log2p cannot be fixed-up during parsing as the

	 * unmodified max_log2p value is still needed for setting mplls, hence

	 * an additional max_usable_log2p member

	 */

	u8 max_p_usable;



	struct {

		u32 min_freq;

		u32 max_freq;

		u32 min_inputfreq;

		u32 max_inputfreq;

		u8  min_m;

		u8  max_m;

		u8  min_n;

		u8  max_n;

	} vco1, vco2;

};



int nvbios_pll_parse(struct nouveau_bios *, u32 type, struct nvbios_pll *);



#endif

drivers/gpu/drm/nouveau/core/include/subdev/clock.h

+20 −1
Original line number Diff line number Diff line
@@ -4,9 +4,21 @@ 
#include <core/device.h>

#include <core/subdev.h>



struct nouveau_pll_vals;

struct nvbios_pll;



struct nouveau_clock {

	struct nouveau_subdev base;

	void (*pll_set)(struct nouveau_clock *, u32 type, u32 freq);



	int (*pll_set)(struct nouveau_clock *, u32 type, u32 freq);



	/*XXX: die, these are here *only* to support the completely

	 *     bat-shit insane what-was-nouveau_hw.c code

	 */

	int (*pll_calc)(struct nouveau_clock *, struct nvbios_pll *,

			int clk, struct nouveau_pll_vals *pv);

	int (*pll_prog)(struct nouveau_clock *, u32 reg1,

			struct nouveau_pll_vals *pv);

};



static inline struct nouveau_clock *
@@ -37,4 +49,11 @@ extern struct nouveau_oclass nv50_clock_oclass; 
extern struct nouveau_oclass nva3_clock_oclass;

extern struct nouveau_oclass nvc0_clock_oclass;



int nv04_clock_pll_set(struct nouveau_clock *, u32 type, u32 freq);

int nv04_clock_pll_calc(struct nouveau_clock *, struct nvbios_pll *,

			int clk, struct nouveau_pll_vals *);

int nv04_clock_pll_prog(struct nouveau_clock *, u32 reg1,

			struct nouveau_pll_vals *);





#endif

drivers/gpu/drm/nouveau/core/include/subdev/vga.h

+2 −0
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_VGA_H__

#define __NOUVEAU_VGA_H__



#include <core/os.h>



/* access to various legacy io ports */

u8   nv_rdport(void *obj, int head, u16 port);

void nv_wrport(void *obj, int head, u16 port, u8 value);

drivers/gpu/drm/nouveau/core/subdev/bios/pll.c

0 → 100644
+417 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2005-2006 Erik Waling

 * Copyright 2006 Stephane Marchesin

 * Copyright 2007-2009 Stuart Bennett

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

 * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#include <subdev/vga.h>

#include <subdev/bios.h>

#include <subdev/bios/bit.h>

#include <subdev/bios/bmp.h>

#include <subdev/bios/pll.h>



struct pll_mapping {

	u8  type;

	u32 reg;

};



static struct pll_mapping

nv04_pll_mapping[] = {

	{ PLL_CORE  , 0x680500 },

	{ PLL_MEMORY, 0x680504 },

	{ PLL_VPLL0 , 0x680508 },

	{ PLL_VPLL1 , 0x680520 },

	{}

};



static struct pll_mapping

nv40_pll_mapping[] = {

	{ PLL_CORE  , 0x004000 },

	{ PLL_MEMORY, 0x004020 },

	{ PLL_VPLL0 , 0x680508 },

	{ PLL_VPLL1 , 0x680520 },

	{}

};



static struct pll_mapping

nv50_pll_mapping[] = {

	{ PLL_CORE  , 0x004028 },

	{ PLL_SHADER, 0x004020 },

	{ PLL_UNK03 , 0x004000 },

	{ PLL_MEMORY, 0x004008 },

	{ PLL_UNK40 , 0x00e810 },

	{ PLL_UNK41 , 0x00e818 },

	{ PLL_UNK42 , 0x00e824 },

	{ PLL_VPLL0 , 0x614100 },

	{ PLL_VPLL1 , 0x614900 },

	{}

};



static struct pll_mapping

nv84_pll_mapping[] = {

	{ PLL_CORE  , 0x004028 },

	{ PLL_SHADER, 0x004020 },

	{ PLL_MEMORY, 0x004008 },

	{ PLL_VDEC  , 0x004030 },

	{ PLL_UNK41 , 0x00e818 },

	{ PLL_VPLL0 , 0x614100 },

	{ PLL_VPLL1 , 0x614900 },

	{}

};



static u16

pll_limits_table(struct nouveau_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len)

{

	struct bit_entry bit_C;



	if (!bit_entry(bios, 'C', &bit_C) && bit_C.length >= 10) {

		u16 data = nv_ro16(bios, bit_C.offset + 8);

		if (data) {

			*ver = nv_ro08(bios, data + 0);

			*hdr = nv_ro08(bios, data + 1);

			*len = nv_ro08(bios, data + 2);

			*cnt = nv_ro08(bios, data + 3);

			return data;

		}

	}



	if (bmp_version(bios) >= 0x0524) {

		u16 data = nv_ro16(bios, bios->bmp_offset + 142);

		if (data) {

			*ver = nv_ro08(bios, data + 0);

			*hdr = 1;

			*cnt = 1;

			*len = 0x18;

			return data;

		}

	}



	*ver = 0x00;

	return 0x0000;

}



static struct pll_mapping *

pll_map(struct nouveau_bios *bios)

{

	switch (nv_device(bios)->card_type) {

	case NV_04:

	case NV_10:

	case NV_20:

	case NV_30:

		return nv04_pll_mapping;

		break;

	case NV_40:

		return nv40_pll_mapping;

	case NV_50:

		if (nv_device(bios)->chipset == 0x50)

			return nv50_pll_mapping;

		else

		if (nv_device(bios)->chipset <  0xa3 ||

		    nv_device(bios)->chipset == 0xaa ||

		    nv_device(bios)->chipset == 0xac)

			return nv84_pll_mapping;

	default:

		return NULL;

	}

}



static u16

pll_map_reg(struct nouveau_bios *bios, u32 reg, u32 *type, u8 *ver, u8 *len)

{

	struct pll_mapping *map;

	u8  hdr, cnt;

	u16 data;



	data = pll_limits_table(bios, ver, &hdr, &cnt, len);

	if (data && *ver >= 0x30) {

		data += hdr;

		while (cnt--) {

			if (nv_ro32(bios, data + 3) == reg) {

				*type = nv_ro08(bios, data + 0);

				return data;

			}

			data += *len;

		}

		return 0x0000;

	}



	map = pll_map(bios);

	while (map->reg) {

		if (map->reg == reg && *ver >= 0x20) {

			u16 addr = (data += hdr);

			while (cnt--) {

				if (nv_ro32(bios, data) == map->reg) {

					*type = map->type;

					return data;

				}

				data += *len;

			}

			return addr;

		} else

		if (map->reg == reg) {

			*type = map->type;

			return data + 1;

		}

		map++;

	}



	return 0x0000;

}



static u16

pll_map_type(struct nouveau_bios *bios, u8 type, u32 *reg, u8 *ver, u8 *len)

{

	struct pll_mapping *map;

	u8  hdr, cnt;

	u16 data;



	data = pll_limits_table(bios, ver, &hdr, &cnt, len);

	if (data && *ver >= 0x30) {

		data += hdr;

		while (cnt--) {

			if (nv_ro08(bios, data + 0) == type) {

				*reg = nv_ro32(bios, data + 3);

				return data;

			}

			data += *len;

		}

		return 0x0000;

	}



	map = pll_map(bios);

	while (map->reg) {

		if (map->type == type && *ver >= 0x20) {

			u16 addr = (data += hdr);

			while (cnt--) {

				if (nv_ro32(bios, data) == map->reg) {

					*reg = map->reg;

					return data;

				}

				data += *len;

			}

			return addr;

		} else

		if (map->type == type) {

			*reg = map->reg;

			return data + 1;

		}

		map++;

	}



	return 0x0000;

}



int

nvbios_pll_parse(struct nouveau_bios *bios, u32 type, struct nvbios_pll *info)

{

	u8  ver, len;

	u32 reg = type;

	u16 data;



	if (type > PLL_MAX) {

		reg  = type;

		data = pll_map_reg(bios, reg, &type, &ver, &len);

	} else {

		data = pll_map_type(bios, type, &reg, &ver, &len);

	}



	if (ver && !data)

		return -ENOENT;



	memset(info, 0, sizeof(*info));

	info->type = type;

	info->reg = reg;



	switch (ver) {

	case 0x00:

		break;

	case 0x10:

	case 0x11:

		info->vco1.min_freq = nv_ro32(bios, data + 0);

		info->vco1.max_freq = nv_ro32(bios, data + 4);

		info->vco2.min_freq = nv_ro32(bios, data + 8);

		info->vco2.max_freq = nv_ro32(bios, data + 12);

		info->vco1.min_inputfreq = nv_ro32(bios, data + 16);

		info->vco2.min_inputfreq = nv_ro32(bios, data + 20);

		info->vco1.max_inputfreq = INT_MAX;

		info->vco2.max_inputfreq = INT_MAX;



		info->max_p = 0x7;

		info->max_p_usable = 0x6;



		/* these values taken from nv30/31/36 */

		switch (bios->version.chip) {

		case 0x36:

			info->vco1.min_n = 0x5;

			break;

		default:

			info->vco1.min_n = 0x1;

			break;

		}

		info->vco1.max_n = 0xff;

		info->vco1.min_m = 0x1;

		info->vco1.max_m = 0xd;



		/*

		 * On nv30, 31, 36 (i.e. all cards with two stage PLLs with this

		 * table version (apart from nv35)), N2 is compared to

		 * maxN2 (0x46) and 10 * maxM2 (0x4), so set maxN2 to 0x28 and

		 * save a comparison

		 */

		info->vco2.min_n = 0x4;

		switch (bios->version.chip) {

		case 0x30:

		case 0x35:

			info->vco2.max_n = 0x1f;

			break;

		default:

			info->vco2.max_n = 0x28;

			break;

		}

		info->vco2.min_m = 0x1;

		info->vco2.max_m = 0x4;

		break;

	case 0x20:

	case 0x21:

		info->vco1.min_freq = nv_ro16(bios, data + 4) * 1000;

		info->vco1.max_freq = nv_ro16(bios, data + 6) * 1000;

		info->vco2.min_freq = nv_ro16(bios, data + 8) * 1000;

		info->vco2.max_freq = nv_ro16(bios, data + 10) * 1000;

		info->vco1.min_inputfreq = nv_ro16(bios, data + 12) * 1000;

		info->vco2.min_inputfreq = nv_ro16(bios, data + 14) * 1000;

		info->vco1.max_inputfreq = nv_ro16(bios, data + 16) * 1000;

		info->vco2.max_inputfreq = nv_ro16(bios, data + 18) * 1000;

		info->vco1.min_n = nv_ro08(bios, data + 20);

		info->vco1.max_n = nv_ro08(bios, data + 21);

		info->vco1.min_m = nv_ro08(bios, data + 22);

		info->vco1.max_m = nv_ro08(bios, data + 23);

		info->vco2.min_n = nv_ro08(bios, data + 24);

		info->vco2.max_n = nv_ro08(bios, data + 25);

		info->vco2.min_m = nv_ro08(bios, data + 26);

		info->vco2.max_m = nv_ro08(bios, data + 27);



		info->max_p = nv_ro08(bios, data + 29);

		info->max_p_usable = info->max_p;

		if (bios->version.chip < 0x60)

			info->max_p_usable = 0x6;

		info->bias_p = nv_ro08(bios, data + 30);



		if (len > 0x22)

			info->refclk = nv_ro32(bios, data + 31);

		break;

	case 0x30:

		data = nv_ro16(bios, data + 1);



		info->vco1.min_freq = nv_ro16(bios, data + 0) * 1000;

		info->vco1.max_freq = nv_ro16(bios, data + 2) * 1000;

		info->vco2.min_freq = nv_ro16(bios, data + 4) * 1000;

		info->vco2.max_freq = nv_ro16(bios, data + 6) * 1000;

		info->vco1.min_inputfreq = nv_ro16(bios, data + 8) * 1000;

		info->vco2.min_inputfreq = nv_ro16(bios, data + 10) * 1000;

		info->vco1.max_inputfreq = nv_ro16(bios, data + 12) * 1000;

		info->vco2.max_inputfreq = nv_ro16(bios, data + 14) * 1000;

		info->vco1.min_n = nv_ro08(bios, data + 16);

		info->vco1.max_n = nv_ro08(bios, data + 17);

		info->vco1.min_m = nv_ro08(bios, data + 18);

		info->vco1.max_m = nv_ro08(bios, data + 19);

		info->vco2.min_n = nv_ro08(bios, data + 20);

		info->vco2.max_n = nv_ro08(bios, data + 21);

		info->vco2.min_m = nv_ro08(bios, data + 22);

		info->vco2.max_m = nv_ro08(bios, data + 23);

		info->max_p_usable = info->max_p = nv_ro08(bios, data + 25);

		info->bias_p = nv_ro08(bios, data + 27);

		info->refclk = nv_ro32(bios, data + 28);

		break;

	case 0x40:

		info->refclk = nv_ro16(bios, data + 9) * 1000;

		data = nv_ro16(bios, data + 1);



		info->vco1.min_freq = nv_ro16(bios, data + 0) * 1000;

		info->vco1.max_freq = nv_ro16(bios, data + 2) * 1000;

		info->vco1.min_inputfreq = nv_ro16(bios, data + 4) * 1000;

		info->vco1.max_inputfreq = nv_ro16(bios, data + 6) * 1000;

		info->vco1.min_m = nv_ro08(bios, data + 8);

		info->vco1.max_m = nv_ro08(bios, data + 9);

		info->vco1.min_n = nv_ro08(bios, data + 10);

		info->vco1.max_n = nv_ro08(bios, data + 11);

		info->min_p = nv_ro08(bios, data + 12);

		info->max_p = nv_ro08(bios, data + 13);

		break;

	default:

		nv_error(bios, "unknown pll limits version 0x%02x\n", ver);

		return -EINVAL;

	}



	if (!info->refclk) {

		info->refclk = nv_device(bios)->crystal;

		if (bios->version.chip == 0x51) {

			u32 sel_clk = nv_rd32(bios, 0x680524);

			if ((info->reg == 0x680508 && sel_clk & 0x20) ||

			    (info->reg == 0x680520 && sel_clk & 0x80)) {

				if (nv_rdvgac(bios, 0, 0x27) < 0xa3)

					info->refclk = 200000;

				else

					info->refclk = 25000;

			}

		}

	}



	/*

	 * By now any valid limit table ought to have set a max frequency for

	 * vco1, so if it's zero it's either a pre limit table bios, or one

	 * with an empty limit table (seen on nv18)

	 */

	if (!info->vco1.max_freq) {

		info->vco1.max_freq = nv_ro32(bios, bios->bmp_offset + 67);

		info->vco1.min_freq = nv_ro32(bios, bios->bmp_offset + 71);

		if (bmp_version(bios) < 0x0506) {

			info->vco1.max_freq = 256000;

			info->vco1.min_freq = 128000;

		}



		info->vco1.min_inputfreq = 0;

		info->vco1.max_inputfreq = INT_MAX;

		info->vco1.min_n = 0x1;

		info->vco1.max_n = 0xff;

		info->vco1.min_m = 0x1;



		if (nv_device(bios)->crystal == 13500) {

			/* nv05 does this, nv11 doesn't, nv10 unknown */

			if (bios->version.chip < 0x11)

				info->vco1.min_m = 0x7;

			info->vco1.max_m = 0xd;

		} else {

			if (bios->version.chip < 0x11)

				info->vco1.min_m = 0x8;

			info->vco1.max_m = 0xe;

		}



		if (bios->version.chip <  0x17 ||

		    bios->version.chip == 0x1a ||

		    bios->version.chip == 0x20)

			info->max_p = 4;

		else

			info->max_p = 5;

		info->max_p_usable = info->max_p;

	}



	return 0;

}