search for: nvwritevgaseq

...537,33 @@ nouveau_hw_fix_bad_vpll(struct drm_device *dev, int head) * vga font save/restore */ +static void nouveau_vga_font_io(struct drm_device *dev, + void __iomem *iovram, + bool save, unsigned plane) +{ + struct drm_nouveau_private *dev_priv = dev->dev_private; + unsigned i; + + NVWriteVgaSeq(dev, 0, NV_VIO_SR_PLANE_MASK_INDEX, 1 << plane); + NVWriteVgaGr(dev, 0, NV_VIO_GX_READ_MAP_INDEX, plane); + for (i = 0; i < 16384; i++) { + if (save) { + dev_priv->saved_vga_font[plane][i] = + ioread32_native(iovram + i * 4); + } else { + iowrite32_native(dev_priv->saved_vg...

...2(x) le32_to_cpu(*(uint32_t *)&(x)) diff --git a/src/nv_crtc.c b/src/nv_crtc.c index b8524fb..1ffb267 100644 --- a/src/nv_crtc.c +++ b/src/nv_crtc.c @@ -212,7 +212,7 @@ nv_crtc_dpms(xf86CrtcPtr crtc, int mode) seq1 |= (NVReadVgaSeq(pNv, nv_crtc->head, NV_VIO_SR_CLOCK_INDEX) & ~0x20); NVWriteVgaSeq(pNv, nv_crtc->head, NV_VIO_SR_CLOCK_INDEX, seq1); crtc17 |= (NVReadVgaCrtc(pNv, nv_crtc->head, NV_CIO_CR_MODE_INDEX) & ~0x80); - usleep(10000); + nouveau_usleep(10000); NVWriteVgaCrtc(pNv, nv_crtc->head, NV_CIO_CR_MODE_INDEX, crtc17); NVVgaSeqReset(pNv, nv_crtc->head, false);...

...56.066579] [<f8154589>] ? drm_fb_helper_probe_connector_modes+0x2f/0x40 [drm_kms_helper] [ 956.066579] [<f8155a9b>] ? drm_fb_helper_initial_config+0x175/0x1a4 [drm_kms_helper] [ 956.066579] [<f889fec8>] ? NVWriteVgaCrtc+0x79/0x99 [nouveau] [ 956.066579] [<f885bd48>] ? NVWriteVgaSeq+0x22/0x38 [nouveau] [ 956.066579] [<f886af86>] ? nouveau_fbcon_init+0xda/0xe2 [nouveau] [ 956.066579] [<f88528ee>] ? nouveau_card_init+0x1247/0x1363 [nouveau] [ 956.066579] [<f8853049>] ? nouveau_load+0x577/0x5af [nouveau] [ 956.066579] [<f8120ef2>] ? drm_get_pci_dev...

...+ NV_DEBUG_KMS(crtc->dev, "\n"); if (!nv_crtc) return; diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c index a5fa517..e6b690e 100644 --- a/drivers/gpu/drm/nouveau/nv04_dac.c +++ b/drivers/gpu/drm/nouveau/nv04_dac.c @@ -205,7 +205,7 @@ out: NVWriteVgaSeq(dev, 0, NV_VIO_SR_CLOCK_INDEX, saved_seq1); if (blue == 0x18) { - NV_TRACE(dev, "Load detected on head A\n"); + NV_DEBUG_KMS(dev, "Load detected on head A\n"); return connector_status_connected; } @@ -350,13 +350,11 @@ static void nv04_dac_mode_set(struct drm_encode...

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