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

Commit 50c40883 authored by Roy Spliet's avatar Roy Spliet Committed by Ben Skeggs
Browse files

drm/nouveau/fb/sddr2: Generate MR values 



V2: Always disable DLL reset

Signed-off-by: default avatarRoy Spliet <rspliet@eclipso.eu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 9c870007

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ nouveau-y += core/subdev/fb/ramnvc0.o 
nouveau-y += core/subdev/fb/ramnve0.o

nouveau-y += core/subdev/fb/ramgk20a.o

nouveau-y += core/subdev/fb/ramgm107.o

nouveau-y += core/subdev/fb/sddr2.o

nouveau-y += core/subdev/fb/sddr3.o

nouveau-y += core/subdev/fb/gddr5.o

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

drivers/gpu/drm/nouveau/core/subdev/fb/priv.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ extern struct nouveau_oclass nve0_ram_oclass; 
extern struct nouveau_oclass gk20a_ram_oclass;

extern struct nouveau_oclass gm107_ram_oclass;



int nouveau_sddr2_calc(struct nouveau_ram *ram);

int nouveau_sddr3_calc(struct nouveau_ram *ram);

int nouveau_gddr5_calc(struct nouveau_ram *ram, bool nuts);

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

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

 * Copyright 2014 Roy Spliet

 *

 * 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.

 *

 * Authors: Roy Spliet <rspliet@eclipso.eu>

 *          Ben Skeggs

 */



#include <subdev/bios.h>

#include "priv.h"



struct ramxlat {

	int id;

	u8 enc;

};



static inline int

ramxlat(const struct ramxlat *xlat, int id)

{

	while (xlat->id >= 0) {

		if (xlat->id == id)

			return xlat->enc;

		xlat++;

	}

	return -EINVAL;

}



static const struct ramxlat

ramddr2_cl[] = {

	{ 2, 2 }, { 3, 3 }, { 4, 4 }, { 5, 5 }, { 6, 6 },

	/* The following are available in some, but not all DDR2 docs */

	{ 7, 7 },

	{ -1 }

};



static const struct ramxlat

ramddr2_wr[] = {

	{ 2, 1 }, { 3, 2 }, { 4, 3 }, { 5, 4 }, { 6, 5 },

	/* The following are available in some, but not all DDR2 docs */

	{ 7, 6 },

	{ -1 }

};



int

nouveau_sddr2_calc(struct nouveau_ram *ram)

{

	struct nouveau_bios *bios = nouveau_bios(ram);

	int CL, WR, DLL = 0, ODT = 0;



	switch (!!ram->timing.data * ram->timing.version) {

	case 0x10:

		CL  =   nv_ro08(bios, ram->timing.data + 0x02);

		WR  =   nv_ro08(bios, ram->timing.data + 0x00);

		DLL = !(nv_ro08(bios, ram->ramcfg.data + 0x02) & 0x40);

		ODT =   nv_ro08(bios, ram->timing.data + 0x0e) & 0x03;

		break;

	case 0x20:

		CL  =  nv_ro08(bios, ram->timing.data + 0x04) & 0x1f;

		WR  =  nv_ro08(bios, ram->timing.data + 0x0a) & 0x7f;

		break;

	default:

		return -ENOSYS;

	}



	CL  = ramxlat(ramddr2_cl, CL);

	WR  = ramxlat(ramddr2_wr, WR);

	if (CL < 0 || WR < 0)

		return -EINVAL;



	ram->mr[0] &= ~0xf70;

	ram->mr[0] |= (WR & 0x07) << 9;

	ram->mr[0] |= (CL & 0x07) << 4;



	ram->mr[1] &= ~0x045;

	ram->mr[1] |= (ODT & 0x1) << 2;

	ram->mr[1] |= (ODT & 0x2) << 5;

	ram->mr[1] |= !DLL;

	return 0;

}