search for: bios_wr32

...l not met after %dms, " - "skiping following opcodes\n", offset, 20 * retries); + "skipping following opcodes\n", offset, 20 * retries); iexec->execute = false; } @@ -1851,7 +1859,7 @@ init_reset(struct nvbios *bios, uint16_t offset, struct init_exec *iexec) bios_wr32(bios, NV_PBUS_PCI_NV_19, 0); bios_wr32(bios, reg, value1); - BIOS_USLEEP(10); + bios_usleep(10); bios_wr32(bios, reg, value2); bios_wr32(bios, NV_PBUS_PCI_NV_19, pci_nv_19); @@ -2233,8 +2241,7 @@ init_time(struct nvbios *bios, uint16_t offset, struct init_exec *iexec) BIOSLOG(bios, &quo...

--- drivers/gpu/drm/nouveau/nouveau_bios.c | 47 ++++++++++++++----------------- 1 files changed, 21 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index 5eec5ed..04ac564 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -181,43 +181,42 @@ struct methods { const char

...; > + "skipping following opcodes\n", > >> > offset, 20 * retries); iexec->execute = false; > >> > } > >> > > >> > @@ -1851,7 +1859,7 @@ init_reset(struct nvbios *bios, > >> > uint16_t offset, struct init_exec *iexec) bios_wr32(bios, > >> > NV_PBUS_PCI_NV_19, 0); bios_wr32(bios, reg, value1); > >> > > >> > - BIOS_USLEEP(10); > >> > + bios_usleep(10); > > > > With the old BIOS_USLEEP, this delay would vanish. > > an error in the ddx -> drm conversion...

...903e72b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -2126,7 +2126,8 @@ init_reset(struct nvbios *bios, uint16_t offset, struct init_exec *iexec) /* no iexec->execute check by design */ pci_nv_19 = bios_rd32(bios, NV_PBUS_PCI_NV_19); - bios_wr32(bios, NV_PBUS_PCI_NV_19, 0); + bios_wr32(bios, NV_PBUS_PCI_NV_19, pci_nv_19 & ~0xf00); + bios_wr32(bios, reg, value1); udelay(10); -- 1.6.4.4

It seems it was only locking up in the context of nouveau_hw_save_vga_fonts, when it actually did something (because the console wasn't already in graphics mode). Signed-off-by: Francisco Jerez <currojerez at riseup.net> --- drivers/gpu/drm/nouveau/nouveau_hw.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.c

This patch series adds TV-out modesetting support to the KMS implementation. I've tried to test it on all the hardware I've got at hand (that is nv11, nv17, nv34, nv35, nv40, nv4b) with every possible output combination; I believe it has reached a mergeable state, however it depends on some commits from drm-next that haven't got into Linus' tree yet, if you agree to merge this