diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-02-10 18:43:39 +0100 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2010-02-13 14:29:40 +0100 |
| commit | 9b4118d6d1fa488db86cd7d2875beea9cdefb096 (patch) | |
| tree | 257c06933999315ac7fa589d895f5423f8395c47 | |
| parent | f7deabfec0dcec4f203f85cd8494a70fe8fa6ebb (diff) | |
Revert "kms: work around some bong hits with dpms"
This reverts commit 98c9e4edb58374f18249e5c9c53b392fb8b4a1d1. AFAIK
it's no longer needed.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| -rw-r--r-- | src/drmmode_display.c | 3 | ||||
| -rw-r--r-- | src/nv_driver.c | 2 | ||||
| -rw-r--r-- | src/nv_type.h | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index a797efe..3796236 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -652,9 +652,6 @@ drmmode_output_dpms(xf86OutputPtr output, int mode) drmmode_ptr drmmode = drmmode_output->drmmode; int mode_id = -1, i; - if (!NVPTR(output->scrn)->allow_dpms) - return; - for (i = 0; i < koutput->count_props; i++) { props = drmModeGetProperty(drmmode->fd, koutput->props[i]); if (props && (props->flags && DRM_MODE_PROP_ENUM)) { diff --git a/src/nv_driver.c b/src/nv_driver.c index 24a1d15..8b0d906 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -331,10 +331,8 @@ NVEnterVT(int scrnIndex, int flags) if (ret) ErrorF("Unable to get master: %d\n", ret); - pNv->allow_dpms = FALSE; if (!xf86SetDesiredModes(pScrn)) return FALSE; - pNv->allow_dpms = TRUE; if (pNv->overlayAdaptor && pNv->Architecture != NV_ARCH_04) NV10WriteOverlayParameters(pScrn); diff --git a/src/nv_type.h b/src/nv_type.h index 989812b..18ea3bb 100644 --- a/src/nv_type.h +++ b/src/nv_type.h @@ -69,7 +69,6 @@ typedef struct _NVRec { drmVersionPtr pKernelDRMVersion; void *drmmode; /* for KMS */ - Bool allow_dpms; /* DRM interface */ struct nouveau_device *dev; |