From 47497abc1e38081564db429329a3ba16198c1521 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 7 Nov 2007 23:10:24 +1000 Subject: i915: oops disable TTM is backwards --- shared-core/i915_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 541b4ccb..5bc3c490 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -1402,7 +1402,7 @@ int i915_driver_device_is_agp(struct drm_device * dev) int i915_driver_firstopen(struct drm_device *dev) { #ifdef I915_HAVE_BUFFER - if (!IS_I9XX(dev)) + if (IS_I9XX(dev)) drm_bo_driver_init(dev); #endif return 0; -- cgit v1.2.3 From c20370e0969e41bbf735daf932e37ac5ec959213 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Wed, 7 Nov 2007 18:07:10 +0100 Subject: Don't overwrite TTM page flags. --- linux-core/drm_ttm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-core/drm_ttm.c b/linux-core/drm_ttm.c index 8a44070d..1a61ef62 100644 --- a/linux-core/drm_ttm.c +++ b/linux-core/drm_ttm.c @@ -264,7 +264,7 @@ int drm_ttm_set_user(struct drm_ttm *ttm, ttm->user_mm = mm; ttm->dummy_read_page = dummy_read_page; - ttm->page_flags = DRM_TTM_PAGE_USER | + ttm->page_flags |= DRM_TTM_PAGE_USER | ((write) ? DRM_TTM_PAGE_USER_WRITE : 0); -- cgit v1.2.3