From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail333.us4.mandrillapp.com ([205.201.137.77]:45351 "EHLO mail333.us4.mandrillapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752972AbcCATt6 convert rfc822-to-8bit (ORCPT ); Tue, 1 Mar 2016 14:49:58 -0500 Received: from pmta03.dal05.mailchimp.com (127.0.0.1) by mail333.us4.mandrillapp.com id hqnp6c174no2 for ; Tue, 1 Mar 2016 19:49:55 +0000 (envelope-from ) From: Subject: Patch "drm/amdgpu: fix amdgpu_bo_pin_restricted VRAM placing v2" has been added to the 4.4-stable tree To: , , , , Cc: , Message-Id: <14568617935466@kroah.com> Date: Tue, 01 Mar 2016 19:49:55 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled drm/amdgpu: fix amdgpu_bo_pin_restricted VRAM placing v2 to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-amdgpu-fix-amdgpu_bo_pin_restricted-vram-placing-v2.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 78d0e182b6c1f5336f6e8cbb197f403276dabc7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Tue, 19 Jan 2016 12:48:14 +0100 Subject: drm/amdgpu: fix amdgpu_bo_pin_restricted VRAM placing v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Christian König commit 78d0e182b6c1f5336f6e8cbb197f403276dabc7f upstream. We could pin BOs into invisible VRAM otherwise. v2: make logic more readable as suggested by Michel Signed-off-by: Christian König Reviewed-by: Alex Deucher (v1) Reviewed-by: Rex Zhu (v1) Reviewed-by: Michel Dänzer Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -399,7 +399,8 @@ int amdgpu_bo_pin_restricted(struct amdg } if (fpfn > bo->placements[i].fpfn) bo->placements[i].fpfn = fpfn; - if (lpfn && lpfn < bo->placements[i].lpfn) + if (!bo->placements[i].lpfn || + (lpfn && lpfn < bo->placements[i].lpfn)) bo->placements[i].lpfn = lpfn; bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; } Patches currently in stable-queue which might be from christian.koenig@amd.com are queue-4.4/drm-amdgpu-use-post-decrement-in-error-handling.patch queue-4.4/drm-amdgpu-drop-topaz-support-from-gmc8-module.patch queue-4.4/drm-amdgpu-remove-exp-hardware-support-from-iceland.patch queue-4.4/drm-amdgpu-fix-issue-with-overlapping-userptrs.patch queue-4.4/drm-amdgpu-pull-topaz-gmc-bits-into-gmc_v7.patch queue-4.4/drm-amdgpu-the-vi-specific-exe-bit-should-only-apply-to-gmc-v8.0-above.patch queue-4.4/drm-amdgpu-move-gmc7-support-out-of-cik-dependency.patch queue-4.4/drm-amdgpu-iceland-use-ci-based-mc-ip.patch queue-4.4/drm-amdgpu-fix-off-by-one-errors-in-amdgpu_vm_bo_map.patch queue-4.4/drm-amdgpu-fix-amdgpu_bo_pin_restricted-vram-placing-v2.patch queue-4.4/drm-amdgpu-remove-unnecessary-forward-declaration.patch queue-4.4/drm-amdgpu-fix-tonga-smu-resume.patch queue-4.4/drm-amdgpu-don-t-load-mec2-on-topaz.patch queue-4.4/drm-amdgpu-pm-adjust-display-configuration-after-powerstate.patch queue-4.4/drm-amdgpu-hold-reference-to-fences-in-amdgpu_sa_bo_new-v2.patch queue-4.4/drm-amdgpu-fix-lost-sync_to-if-scheduler-is-enabled.patch