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

drm/nouveau/bios: parse freq ranges and timing id into ramcfg struct 



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

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

+9 −0
Original line number Diff line number Diff line
@@ -4,11 +4,18 @@ 
struct nouveau_bios;



struct nvbios_ramcfg {

	unsigned rammap_ver;

	unsigned rammap_hdr;

	unsigned rammap_min;

	unsigned rammap_max;

	unsigned rammap_11_08_01:1;

	unsigned rammap_11_08_0c:2;

	unsigned rammap_11_08_10:1;

	unsigned rammap_11_11_0c:2;



	unsigned ramcfg_ver;

	unsigned ramcfg_hdr;

	unsigned ramcfg_timing;

	unsigned ramcfg_11_01_01:1;

	unsigned ramcfg_11_01_02:1;

	unsigned ramcfg_11_01_04:1;
@@ -43,6 +50,8 @@ struct nvbios_ramcfg { 
	unsigned ramcfg_11_08_20:1;

	unsigned ramcfg_11_09:8;



	unsigned timing_ver;

	unsigned timing_hdr;

	unsigned timing[11];

	unsigned timing_20_2e_03:2;

	unsigned timing_20_2e_30:2;

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

+3 −2
Original line number Diff line number Diff line
@@ -8,9 +8,10 @@ u32 nvbios_rammapTe(struct nouveau_bios *, u8 *ver, u8 *hdr, 


u32 nvbios_rammapEe(struct nouveau_bios *, int idx,

		    u8 *ver, u8 *hdr, u8 *cnt, u8 *len);

u32 nvbios_rammapEp(struct nouveau_bios *, int idx,

		    u8 *ver, u8 *hdr, u8 *cnt, u8 *len,

		    struct nvbios_ramcfg *);

u32 nvbios_rammapEm(struct nouveau_bios *, u16 mhz,

		    u8 *ver, u8 *hdr, u8 *cnt, u8 *len);

u32 nvbios_rammapEp(struct nouveau_bios *, u16 mhz,

		    u8 *ver, u8 *hdr, u8 *cnt, u8 *len,

		    struct nvbios_ramcfg *);

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

+23 −16
Original line number Diff line number Diff line
@@ -75,28 +75,18 @@ nvbios_rammapEe(struct nouveau_bios *bios, int idx, 
}



u32

nvbios_rammapEm(struct nouveau_bios *bios, u16 khz,

		u8 *ver, u8 *hdr, u8 *cnt, u8 *len)

{

	int idx = 0;

	u32 data;

	while ((data = nvbios_rammapEe(bios, idx++, ver, hdr, cnt, len))) {

		if (khz >= nv_ro16(bios, data + 0x00) &&

		    khz <= nv_ro16(bios, data + 0x02))

			break;

	}

	return data;

}



u32

nvbios_rammapEp(struct nouveau_bios *bios, u16 khz,

nvbios_rammapEp(struct nouveau_bios *bios, int idx,

		u8 *ver, u8 *hdr, u8 *cnt, u8 *len,

		struct nvbios_ramcfg *p)

{

	u32 data = nvbios_rammapEm(bios, khz, ver, hdr, cnt, len);

	u32 data = nvbios_rammapEe(bios, idx, ver, hdr, cnt, len);

	memset(p, 0x00, sizeof(*p));

	p->rammap_ver = *ver;

	p->rammap_hdr = *hdr;

	switch (!!data * *ver) {

	case 0x11:

		p->rammap_min      =  nv_ro16(bios, data + 0x00);

		p->rammap_max      =  nv_ro16(bios, data + 0x02);

		p->rammap_11_08_01 = (nv_ro08(bios, data + 0x08) & 0x01) >> 0;

		p->rammap_11_08_0c = (nv_ro08(bios, data + 0x08) & 0x0c) >> 2;

		p->rammap_11_08_10 = (nv_ro08(bios, data + 0x08) & 0x10) >> 4;
@@ -109,6 +99,20 @@ nvbios_rammapEp(struct nouveau_bios *bios, u16 khz, 
	return data;

}



u32

nvbios_rammapEm(struct nouveau_bios *bios, u16 mhz,

		u8 *ver, u8 *hdr, u8 *cnt, u8 *len,

		struct nvbios_ramcfg *info)

{

	int idx = 0;

	u32 data;

	while ((data = nvbios_rammapEp(bios, idx++, ver, hdr, cnt, len, info))) {

		if (mhz >= info->rammap_min && mhz <= info->rammap_max)

			break;

	}

	return data;

}



u32

nvbios_rammapSe(struct nouveau_bios *bios, u32 data,

		u8 ever, u8 ehdr, u8 ecnt, u8 elen, int idx,
@@ -129,8 +133,11 @@ nvbios_rammapSp(struct nouveau_bios *bios, u32 data, 
		u8 *ver, u8 *hdr, struct nvbios_ramcfg *p)

{

	data = nvbios_rammapSe(bios, data, ever, ehdr, ecnt, elen, idx, ver, hdr);

	p->ramcfg_ver = *ver;

	p->ramcfg_hdr = *hdr;

	switch (!!data * *ver) {

	case 0x11:

		p->ramcfg_timing   =  nv_ro08(bios, data + 0x00);

		p->ramcfg_11_01_01 = (nv_ro08(bios, data + 0x01) & 0x01) >> 0;

		p->ramcfg_11_01_02 = (nv_ro08(bios, data + 0x01) & 0x02) >> 1;

		p->ramcfg_11_01_04 = (nv_ro08(bios, data + 0x01) & 0x04) >> 2;

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

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ nvbios_timingEp(struct nouveau_bios *bios, int idx, 
		struct nvbios_ramcfg *p)

{

	u16 data = nvbios_timingEe(bios, idx, ver, hdr, cnt, len), temp;

	p->timing_ver = *ver;

	p->timing_hdr = *hdr;

	switch (!!data * *ver) {

	case 0x20:

		p->timing[0] = nv_ro32(bios, data + 0x00);

drivers/gpu/drm/nouveau/core/subdev/fb/ramnva3.c

+2 −1
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ nva3_ram_calc(struct nouveau_fb *pfb, u32 freq) 
	struct nva3_ram *ram = (void *)pfb->ram;

	struct nva3_ramfuc *fuc = &ram->fuc;

	struct nva3_clock_info mclk;

	struct nvbios_ramcfg cfg;

	u8  ver, cnt, len, strap;

	u32 data;

	struct {
@@ -91,7 +92,7 @@ nva3_ram_calc(struct nouveau_fb *pfb, u32 freq) 


	/* lookup memory config data relevant to the target frequency */

	rammap.data = nvbios_rammapEm(bios, freq / 1000, &ver, &rammap.size,

				     &cnt, &ramcfg.size);

				     &cnt, &ramcfg.size, &cfg);

	if (!rammap.data || ver != 0x10 || rammap.size < 0x0e) {

		nv_error(pfb, "invalid/missing rammap entry\n");

		return -EINVAL;