-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
yaml --- r: 329635 b: refs/heads/master c: d38ac52 h: refs/heads/master i: 329633: a1e98c6 329631: 3e7e9f0 v: v3
- Loading branch information
Ben Skeggs
committed
Oct 3, 2012
1 parent
3283892
commit 6f6be48
Showing
17 changed files
with
953 additions
and
756 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| --- | ||
| refs/heads/master: 08c770969a45361277d556f9fd3e2d70da42be65 | ||
| refs/heads/master: d38ac5217ab43cf61e8ebe6d7114fb2d1ca9a3a4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #ifndef __NVBIOS_MXM_H__ | ||
| #define __NVBIOS_MXM_H__ | ||
|
|
||
| u16 mxm_table(struct nouveau_bios *, u8 *ver, u8 *hdr); | ||
|
|
||
| u8 mxm_sor_map(struct nouveau_bios *, u8 conn); | ||
| u8 mxm_ddc_map(struct nouveau_bios *, u8 port); | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| #ifndef __NOUVEAU_MXM_H__ | ||
| #define __NOUVEAU_MXM_H__ | ||
|
|
||
| #include <core/subdev.h> | ||
| #include <core/device.h> | ||
|
|
||
| #define MXM_SANITISE_DCB 0x00000001 | ||
|
|
||
| struct nouveau_mxm { | ||
| struct nouveau_subdev base; | ||
| u32 action; | ||
| u8 *mxms; | ||
| }; | ||
|
|
||
| static inline struct nouveau_mxm * | ||
| nouveau_mxm(void *obj) | ||
| { | ||
| return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_MXM]; | ||
| } | ||
|
|
||
| #define nouveau_mxm_create(p,e,o,d) \ | ||
| nouveau_mxm_create_((p), (e), (o), sizeof(**d), (void **)d) | ||
| #define nouveau_mxm_init(p) \ | ||
| nouveau_subdev_init(&(p)->base) | ||
| #define nouveau_mxm_fini(p,s) \ | ||
| nouveau_subdev_fini(&(p)->base, (s)) | ||
| int nouveau_mxm_create_(struct nouveau_object *, struct nouveau_object *, | ||
| struct nouveau_oclass *, int, void **); | ||
| void nouveau_mxm_destroy(struct nouveau_mxm *); | ||
|
|
||
| #define _nouveau_mxm_dtor _nouveau_subdev_dtor | ||
| #define _nouveau_mxm_init _nouveau_subdev_init | ||
| #define _nouveau_mxm_fini _nouveau_subdev_fini | ||
|
|
||
| extern struct nouveau_oclass nv50_mxm_oclass; | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,8 +19,6 @@ | |
|
|
||
| #include <asm/unaligned.h> | ||
|
|
||
| #include <asm/unaligned.h> | ||
|
|
||
| static inline int | ||
| ffsll(u64 mask) | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| /* | ||
| * Copyright 2012 Red Hat Inc. | ||
| * | ||
| * 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: Ben Skeggs | ||
| */ | ||
|
|
||
| #include <subdev/bios.h> | ||
| #include <subdev/bios/bit.h> | ||
| #include <subdev/bios/mxm.h> | ||
|
|
||
| u16 | ||
| mxm_table(struct nouveau_bios *bios, u8 *ver, u8 *hdr) | ||
| { | ||
| struct bit_entry x; | ||
|
|
||
| if (bit_entry(bios, 'x', &x)) { | ||
| nv_debug(bios, "BIT 'x' table not present\n"); | ||
| return 0x0000; | ||
| } | ||
|
|
||
| *ver = x.version; | ||
| *hdr = x.length; | ||
| if (*ver != 1 || *hdr < 3) { | ||
| nv_warn(bios, "BIT 'x' table %d/%d unknown\n", *ver, *hdr); | ||
| return 0x0000; | ||
| } | ||
|
|
||
| return x.offset; | ||
| } | ||
|
|
||
| /* These map MXM v2.x digital connection values to the appropriate SOR/link, | ||
| * hopefully they're correct for all boards within the same chipset... | ||
| * | ||
| * MXM v3.x VBIOS are nicer and provide pointers to these tables. | ||
| */ | ||
| static u8 nv84_sor_map[16] = { | ||
| 0x00, 0x12, 0x22, 0x11, 0x32, 0x31, 0x11, 0x31, | ||
| 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 | ||
| }; | ||
|
|
||
| static u8 nv92_sor_map[16] = { | ||
| 0x00, 0x12, 0x22, 0x11, 0x32, 0x31, 0x11, 0x31, | ||
| 0x11, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 | ||
| }; | ||
|
|
||
| static u8 nv94_sor_map[16] = { | ||
| 0x00, 0x14, 0x24, 0x11, 0x34, 0x31, 0x11, 0x31, | ||
| 0x11, 0x31, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 | ||
| }; | ||
|
|
||
| static u8 nv98_sor_map[16] = { | ||
| 0x00, 0x14, 0x12, 0x11, 0x00, 0x31, 0x11, 0x31, | ||
| 0x11, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 | ||
| }; | ||
|
|
||
| u8 | ||
| mxm_sor_map(struct nouveau_bios *bios, u8 conn) | ||
| { | ||
| u8 ver, hdr; | ||
| u16 mxm = mxm_table(bios, &ver, &hdr); | ||
| if (mxm && hdr >= 6) { | ||
| u16 map = nv_ro16(bios, mxm + 4); | ||
| if (map) { | ||
| ver = nv_ro08(bios, map); | ||
| if (ver == 0x10) { | ||
| if (conn < nv_ro08(bios, map + 3)) { | ||
| map += nv_ro08(bios, map + 1); | ||
| map += conn; | ||
| return nv_ro08(bios, map); | ||
| } | ||
|
|
||
| return 0x00; | ||
| } | ||
|
|
||
| nv_warn(bios, "unknown sor map v%02x\n", ver); | ||
| } | ||
| } | ||
|
|
||
| if (bios->version.chip == 0x84 || bios->version.chip == 0x86) | ||
| return nv84_sor_map[conn]; | ||
| if (bios->version.chip == 0x92) | ||
| return nv92_sor_map[conn]; | ||
| if (bios->version.chip == 0x94 || bios->version.chip == 0x96) | ||
| return nv94_sor_map[conn]; | ||
| if (bios->version.chip == 0x98) | ||
| return nv98_sor_map[conn]; | ||
|
|
||
| nv_warn(bios, "missing sor map\n"); | ||
| return 0x00; | ||
| } | ||
|
|
||
| u8 | ||
| mxm_ddc_map(struct nouveau_bios *bios, u8 port) | ||
| { | ||
| u8 ver, hdr; | ||
| u16 mxm = mxm_table(bios, &ver, &hdr); | ||
| if (mxm && hdr >= 8) { | ||
| u16 map = nv_ro16(bios, mxm + 6); | ||
| if (map) { | ||
| ver = nv_ro08(bios, map); | ||
| if (ver == 0x10) { | ||
| if (port < nv_ro08(bios, map + 3)) { | ||
| map += nv_ro08(bios, map + 1); | ||
| map += port; | ||
| return nv_ro08(bios, map); | ||
| } | ||
|
|
||
| return 0x00; | ||
| } | ||
|
|
||
| nv_warn(bios, "unknown ddc map v%02x\n", ver); | ||
| } | ||
| } | ||
|
|
||
| /* v2.x: directly write port as dcb i2cidx */ | ||
| return (port << 4) | port; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.