From: Greg Kroah-Hartman Date: Fri, 25 May 2012 06:02:29 +0000 (+0900) Subject: 3.0-stable patches X-Git-Tag: v3.0.33~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ef858434bdb1d3c9d5a6199c0f7f6b3bb95cbf2;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: nouveau-nouveau_set_bo_placement-takes-ttm-flags.patch --- diff --git a/queue-3.0/nouveau-nouveau_set_bo_placement-takes-ttm-flags.patch b/queue-3.0/nouveau-nouveau_set_bo_placement-takes-ttm-flags.patch new file mode 100644 index 00000000000..b24c3229194 --- /dev/null +++ b/queue-3.0/nouveau-nouveau_set_bo_placement-takes-ttm-flags.patch @@ -0,0 +1,30 @@ +From c284815debba2f14ee2fd07b1b4cc972ab116110 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Fri, 18 May 2012 15:31:12 +0100 +Subject: nouveau: nouveau_set_bo_placement takes TTM flags + +From: Dave Airlie + +commit c284815debba2f14ee2fd07b1b4cc972ab116110 upstream. + +This seems to be wrong to me, spotted while thinking about dma-buf. + +Reviewed-by: Ben Skeggs +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/nouveau/nouveau_bo.c ++++ b/drivers/gpu/drm/nouveau/nouveau_bo.c +@@ -1075,7 +1075,7 @@ nouveau_ttm_fault_reserve_notify(struct + + nvbo->placement.fpfn = 0; + nvbo->placement.lpfn = dev_priv->fb_mappable_pages; +- nouveau_bo_placement_set(nvbo, TTM_PL_VRAM, 0); ++ nouveau_bo_placement_set(nvbo, TTM_PL_FLAG_VRAM, 0); + return nouveau_bo_validate(nvbo, false, true, false); + } + diff --git a/queue-3.0/series b/queue-3.0/series index 21029573ee4..3fa6eec0168 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -46,3 +46,4 @@ usbcore-enable-usb2-lpm-if-port-suspend-fails.patch drm-i915-avoid-a-double-read-of-pch_iir-during-interrupt-handling.patch drm-i915-use-hw-scheduler-for-fixed-function-shaders.patch drm-i915-don-t-clobber-the-pipe-param-in-sanitize_modesetting.patch +nouveau-nouveau_set_bo_placement-takes-ttm-flags.patch