diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-09-08 02:48:31 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-09-15 12:25:08 (GMT) |
| commit | d9b5f261db53db32d528698fa2330f6cda1a6292 (patch) | |
| tree | be838ea091fd2c831820bd58750eb2b06b32bef2 /drivers/gpu/drm/nouveau/core/include | |
| parent | 595d373f1e9c9ce0fc946457fdb488e8a58972cd (diff) | |
| download | linux-d9b5f261db53db32d528698fa2330f6cda1a6292.tar.xz | |
drm/nouveau/bios: parse freq ranges and timing id into ramcfg struct
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/include')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/include/subdev/bios/ramcfg.h | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/include/subdev/bios/rammap.h | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/bios/ramcfg.h b/drivers/gpu/drm/nouveau/core/include/subdev/bios/ramcfg.h index c086ac6..bae3ba2 100644 --- a/drivers/gpu/drm/nouveau/core/include/subdev/bios/ramcfg.h +++ b/drivers/gpu/drm/nouveau/core/include/subdev/bios/ramcfg.h @@ -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; diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/bios/rammap.h b/drivers/gpu/drm/nouveau/core/include/subdev/bios/rammap.h index 5bdf8e4..47e021d 100644 --- a/drivers/gpu/drm/nouveau/core/include/subdev/bios/rammap.h +++ b/drivers/gpu/drm/nouveau/core/include/subdev/bios/rammap.h @@ -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 *); |