Author: kib
Date: Tue Jul 2 04:45:51 2013
New Revision: 252497
URL: http://svnweb.freebsd.org/changeset/base/252497
Log:
MFC r251961:
Disable wait for the retrace if KMS is activated.
Modified:
stable/9/sys/dev/drm2/i915/intel_fb.c
stable/9/sys/dev/syscons/scvgarndr.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/drm2/i915/intel_fb.c
==============================================================================
--- stable/9/sys/dev/drm2/i915/intel_fb.c Tue Jul 2 04:42:32 2013
(r252496)
+++ stable/9/sys/dev/drm2/i915/intel_fb.c Tue Jul 2 04:45:51 2013
(r252497)
@@ -207,6 +207,8 @@ static void intel_fbdev_destroy(struct d
}
}
+extern int sc_txtmouse_no_retrace_wait;
+
int intel_fbdev_init(struct drm_device *dev)
{
struct intel_fbdev *ifbdev;
@@ -229,6 +231,7 @@ int intel_fbdev_init(struct drm_device *
drm_fb_helper_single_add_all_connectors(&ifbdev->helper);
drm_fb_helper_initial_config(&ifbdev->helper, 32);
+ sc_txtmouse_no_retrace_wait = 1;
return 0;
}
Modified: stable/9/sys/dev/syscons/scvgarndr.c
==============================================================================
--- stable/9/sys/dev/syscons/scvgarndr.c Tue Jul 2 04:42:32 2013
(r252496)
+++ stable/9/sys/dev/syscons/scvgarndr.c Tue Jul 2 04:45:51 2013
(r252497)
@@ -395,6 +395,8 @@ vga_txtblink(scr_stat *scp, int at, int
{
}
+int sc_txtmouse_no_retrace_wait;
+
#ifndef SC_NO_CUTPASTE
static void
@@ -445,7 +447,9 @@ draw_txtmouse(scr_stat *scp, int x, int
#if 1
/* wait for vertical retrace to avoid jitter on some videocards */
crtc_addr = scp->sc->adp->va_crtc_addr;
- while (!(inb(crtc_addr + 6) & 0x08)) /* idle */ ;
+ while (!sc_txtmouse_no_retrace_wait &&
+ !(inb(crtc_addr + 6) & 0x08))
+ /* idle */ ;
#endif
c = scp->sc->mouse_char;
vidd_load_font(scp->sc->adp, 0, 32, 8, font_buf, c, 4);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
