| From 34229577679bd7bf47cda1f393a2d086db242d8d Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= <marcheu@chromium.org> |
| Date: Tue, 22 Apr 2014 11:33:29 -0700 |
| Subject: [PATCH] Revert "uxa: Prevent laggy applications by throttling after |
| rendering" |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| This reverts commit 2715a455f7bfbecd7a6977184dc6180a09d06e1f. |
| |
| Sometimes we send no commands but still expect a seqno which causes X to |
| get stuck. |
| |
| BUG=chromium:333777 |
| TEST=run sanAngeles on lumpy |
| |
| Signed-off-by: Stéphane Marchesin <marcheu@chromium.org> |
| --- |
| src/uxa/intel_uxa.c | 7 ------- |
| 1 file changed, 7 deletions(-) |
| |
| diff --git a/src/uxa/intel_uxa.c b/src/uxa/intel_uxa.c |
| index 84ed551..d5a3211 100644 |
| --- a/src/uxa/intel_uxa.c |
| +++ b/src/uxa/intel_uxa.c |
| @@ -33,7 +33,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| |
| #include "xorg-server.h" |
| #include <xf86.h> |
| -#include <xf86drm.h> |
| #include <xaarop.h> |
| #include <string.h> |
| #include <errno.h> |
| @@ -1018,11 +1017,6 @@ static void intel_flush_rendering(intel_screen_private *intel) |
| intel->needs_flush = 0; |
| } |
| |
| -static void intel_throttle(intel_screen_private *intel) |
| -{ |
| - drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE); |
| -} |
| - |
| void intel_uxa_block_handler(intel_screen_private *intel) |
| { |
| /* Emit a flush of the rendering cache, or on the 965 |
| @@ -1031,7 +1025,6 @@ void intel_uxa_block_handler(intel_screen_private *intel) |
| */ |
| intel_glamor_flush(intel); |
| intel_flush_rendering(intel); |
| - intel_throttle(intel); |
| } |
| |
| static PixmapPtr |
| -- |
| 1.9.1.423.g4596e3a |
| |
