diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2006-12-30 16:44:31 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2007-03-26 20:32:14 -0700 |
| commit | 28af734cb7f2e5e40f6524411f77eba0e3960a8d (patch) | |
| tree | 75f39d3aa8dc2fa56118d6dae8f42062c130b99b | |
| parent | c0459d7476f408806b1e7202b960ee0b3911774a (diff) | |
fbdevhw: Fix some issues with the previous commit.
Fix a TRACE_ENTER typo and only update the internal fbdev mode state cache
after actually setting a mode.
(cherry picked from commit c385bcf0bde38dd869f7065f859dd4b4126f5690)
| -rw-r--r-- | hw/xfree86/fbdevhw/fbdevhw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index 303ad14de..83b0dc156 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -496,7 +496,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool check) fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); struct fb_var_screeninfo req_var = fPtr->var, set_var; - TRACE_ENTER("ModeInit"); + TRACE_ENTER("SetMode"); xfree2fbdev_fblayout(pScrn, &req_var); xfree2fbdev_timing(mode, &req_var); @@ -528,7 +528,8 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool check) return FALSE; } - fPtr->var = set_var; + if (!check) + fPtr->var = set_var; return TRUE; } |