| .. | .. |
|---|
| 24 | 24 | #include "ior.h" |
|---|
| 25 | 25 | |
|---|
| 26 | 26 | void |
|---|
| 27 | | -gf119_hda_eld(struct nvkm_ior *ior, u8 *data, u8 size) |
|---|
| 27 | +gf119_hda_device_entry(struct nvkm_ior *ior, int head) |
|---|
| 28 | 28 | { |
|---|
| 29 | 29 | struct nvkm_device *device = ior->disp->engine.subdev.device; |
|---|
| 30 | | - const u32 soff = 0x030 * ior->id; |
|---|
| 30 | + const u32 hoff = 0x800 * head; |
|---|
| 31 | + nvkm_mask(device, 0x616548 + hoff, 0x00000070, head << 4); |
|---|
| 32 | +} |
|---|
| 33 | + |
|---|
| 34 | +void |
|---|
| 35 | +gf119_hda_eld(struct nvkm_ior *ior, int head, u8 *data, u8 size) |
|---|
| 36 | +{ |
|---|
| 37 | + struct nvkm_device *device = ior->disp->engine.subdev.device; |
|---|
| 38 | + const u32 soff = 0x030 * ior->id + (head * 0x04); |
|---|
| 31 | 39 | int i; |
|---|
| 32 | 40 | |
|---|
| 33 | 41 | for (i = 0; i < size; i++) |
|---|
| .. | .. |
|---|
| 41 | 49 | gf119_hda_hpd(struct nvkm_ior *ior, int head, bool present) |
|---|
| 42 | 50 | { |
|---|
| 43 | 51 | struct nvkm_device *device = ior->disp->engine.subdev.device; |
|---|
| 44 | | - const u32 hoff = 0x800 * head; |
|---|
| 52 | + const u32 soff = 0x030 * ior->id + (head * 0x04); |
|---|
| 45 | 53 | u32 data = 0x80000000; |
|---|
| 46 | 54 | u32 mask = 0x80000001; |
|---|
| 47 | 55 | if (present) { |
|---|
| 48 | | - nvkm_mask(device, 0x616548 + hoff, 0x00000070, 0x00000000); |
|---|
| 56 | + ior->func->hda.device_entry(ior, head); |
|---|
| 49 | 57 | data |= 0x00000001; |
|---|
| 50 | 58 | } else { |
|---|
| 51 | 59 | mask |= 0x00000002; |
|---|
| 52 | 60 | } |
|---|
| 53 | | - nvkm_mask(device, 0x10ec10 + ior->id * 0x030, mask, data); |
|---|
| 61 | + nvkm_mask(device, 0x10ec10 + soff, mask, data); |
|---|
| 54 | 62 | } |
|---|