diff options
author | Roy Spliet <rspliet@eclipso.eu> | 2014-09-05 02:41:46 +0200 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2014-10-02 13:25:44 +1000 |
commit | 20b1e6f44c40bc0950d1c09497a1ac59bd5bf0ea (patch) | |
tree | 236e79b33821f9aec38af8283a17047185837732 | |
parent | 70cdb9991b5e339c886130186ba9a91db5b81ba6 (diff) | |
download | nouveau-20b1e6f44c40bc0950d1c09497a1ac59bd5bf0ea.tar.gz |
fb/sddr2: Generate MR values
V2: Always disable DLL reset
Signed-off-by: Roy Spliet <rspliet@eclipso.eu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drm/Kbuild | 1 | ||||
l--------- | drm/core/subdev/fb/sddr2.c | 1 | ||||
-rw-r--r-- | nvkm/subdev/fb/Makefile.am | 1 | ||||
-rw-r--r-- | nvkm/subdev/fb/priv.h | 1 | ||||
-rw-r--r-- | nvkm/subdev/fb/sddr2.c | 96 |
5 files changed, 100 insertions, 0 deletions
diff --git a/drm/Kbuild b/drm/Kbuild index 37ab09bea..f0647f634 100644 --- a/drm/Kbuild +++ b/drm/Kbuild @@ -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 diff --git a/drm/core/subdev/fb/sddr2.c b/drm/core/subdev/fb/sddr2.c new file mode 120000 index 000000000..fcc422251 --- /dev/null +++ b/drm/core/subdev/fb/sddr2.c @@ -0,0 +1 @@ +../../../../nvkm/subdev/fb/sddr2.c
\ No newline at end of file diff --git a/nvkm/subdev/fb/Makefile.am b/nvkm/subdev/fb/Makefile.am index bea364871..27e1e6e3f 100644 --- a/nvkm/subdev/fb/Makefile.am +++ b/nvkm/subdev/fb/Makefile.am @@ -27,6 +27,7 @@ libfb_la_SOURCES = base.c \ ramnve0.c \ ramgk20a.c \ ramgm107.c \ + sddr2.c \ sddr3.c \ gddr5.c diff --git a/nvkm/subdev/fb/priv.h b/nvkm/subdev/fb/priv.h index 82273f832..60322e906 100644 --- a/nvkm/subdev/fb/priv.h +++ b/nvkm/subdev/fb/priv.h @@ -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); diff --git a/nvkm/subdev/fb/sddr2.c b/nvkm/subdev/fb/sddr2.c new file mode 100644 index 000000000..b5b043238 --- /dev/null +++ b/nvkm/subdev/fb/sddr2.c @@ -0,0 +1,96 @@ +/* + * 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; +} |