From patchwork Wed May 9 06:45:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10388185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BE48760170 for ; Wed, 9 May 2018 06:48:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F8C227D0C for ; Wed, 9 May 2018 06:48:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 942382818E; Wed, 9 May 2018 06:48:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 048BC27D0C for ; Wed, 9 May 2018 06:48:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A47816EC63; Wed, 9 May 2018 06:48:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0061.outbound.protection.outlook.com [104.47.40.61]) by gabe.freedesktop.org (Postfix) with ESMTPS id 391AF6EC62; Wed, 9 May 2018 06:48:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=YW30YZspbcLcEdSVceD5UyG485xcWAWFqr4Xx6pSS3Q=; b=0+dUAGpW/d3FnTHtnoAriRlzfL+XsI3XCzdFlCNdVYqrw8zh87pxWO7cJf7X7PJX6Pk35I4sbO4GRFgL+kpBPq6DMoLcJDY8nMEQIb0bi5G7i4d1EDRHb5iEkuFwe3bQqxrOo55vnYlgu8h1Wm58OZlaTw82WD5p3n9+KRA8VS4= Received: from DM3PR12CA0074.namprd12.prod.outlook.com (2603:10b6:0:57::18) by DM3PR12MB0764.namprd12.prod.outlook.com (2a01:111:e400:5984::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.735.18; Wed, 9 May 2018 06:48:09 +0000 Received: from DM3NAM03FT053.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::209) by DM3PR12CA0074.outlook.office365.com (2603:10b6:0:57::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.755.16 via Frontend Transport; Wed, 9 May 2018 06:48:09 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=permerror action=none header.from=amd.com; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by DM3NAM03FT053.mail.protection.outlook.com (10.152.83.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.735.16 via Frontend Transport; Wed, 9 May 2018 06:48:09 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.382.0; Wed, 9 May 2018 01:48:08 -0500 From: Chunming Zhou To: , Subject: [PATCH 05/13] drm/amdgpu: pass vm lru to buffer object Date: Wed, 9 May 2018 14:45:35 +0800 Message-ID: <20180509064543.15937-6-david1.zhou@amd.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180509064543.15937-1-david1.zhou@amd.com> References: <20180509064543.15937-1-david1.zhou@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(346002)(396003)(376002)(39380400002)(2980300002)(428003)(189003)(199004)(36756003)(305945005)(104016004)(81156014)(81166006)(47776003)(16586007)(53416004)(50226002)(316002)(356003)(8676002)(86362001)(2616005)(2906002)(4326008)(53936002)(478600001)(5660300001)(68736007)(446003)(476003)(426003)(11346002)(72206003)(39060400002)(126002)(486006)(186003)(7696005)(51416003)(336012)(77096007)(105586002)(26005)(50466002)(110136005)(59450400001)(48376002)(54906003)(1076002)(6666003)(76176011)(97736004)(106466001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR12MB0764; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; DM3NAM03FT053; 1:ZKE1pEvkvZ9rgdR7qEqldQA84yCtOz2xJLqfvoxZjQu8v6EOCXFiCDg5GVu+dDKV1EZiLiVnXrHvxawMeHs7ZJXR2KXJIcxv/u+G/EWCuCynAzYtFzZBRqglchUIZt00 X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060); SRVR:DM3PR12MB0764; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0764; 3:NeSS5ajQGMMHYt29JxZugWlMF/iY4ypUhSvuz3x3u4yandCDc5gGs1bOhu6fz+gpD6RGBPJ+G9wWH4gg2GRvH3SYyFedH9C8KhAqgzhR5ZPRb2toR79th0KCOM3utcgPPhg5Ot8CR1BG6HCu7drv+bVnIMqirDQj9cXaQ7k/gSTJe+KDyBVSPllmn1RodgaL3RH6coRAz8cAYiBmB2xaFegSoHqcjJj/FBg+w/mDrAtqOURIpBlKgXAJzDCZROF5D/TvU1TWT5YPpOx1Sem5q75lhRzbuz3Qq9FbCI1c0n9KwWUAjrtcIN5pA49EvpwYoVtmrgUb6C193YPVujc2pgoFaTspr5erX1F/+1caI+w=; 25:YDNDoJq6qqFeAfO6cg2GQQidJrpyrUCA/eUk36DwxOkjotaMICKANuC9AauQVTZ1Pr4QnJvWckphEZHV9Ezf87roviHZXKLWyBZmtoSZaZuMm2K9WN0CrxNMxgOJKvPeR521z/EaplG7N5oiA4JT2UzvwT6dKU8sLNGDp9uczbb7ZUv8KIHlJAbR9BgvJG2n8EmjPt2H52QbsWkbIlp2cuaQq8Z2/KdjEYP0PrUtoOfBsDSxxdjyBUnCSx6Pqdv2OAVDWEfsmScKT5RYoqpXfq/kYFKka+Wpe2u07D/YAY/LSZhEv43IpuffOaHV0cdCjRxyYxlM+yAxjmWrr7krwA== X-MS-TrafficTypeDiagnostic: DM3PR12MB0764: X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0764; 31:5I4+/xy9ZdzzhqmiHdzT57YHvamsAVbIidexSTlOsB9pk1F2SSvkZ76QwzN8Q6jNqoQDH058jDskm7bm36CvBT15j2u1NYfkn9DweX8QmKieeKC3rNMxbDQT6RDR11JBxbz3Z1ZCnMZUqOthfY9ORjT/9XRTzxd6j0wTZmFSnUQAO6DrLhXQy90jT4boYirNu5LqGwfCMMZ3ypBK4No0BsShTidgtGk4ZV4riya9BAw=; 20:LftRrYHplsv794BG4n1HPnPrhPXaTRiId+sp/XdZzD4+H0GUBXNb8o5TyhuuKJ6zu7HOKrL+CARAZ0GfL5SFjLqJatUaVMG6lrtTkSo4jpj9pj5gNV5MJrvJOBOGBP7GwP3gXiOW3PwxOJ15A/2ylGjNXc6n28E2bxaDHhVXOifM/a0aVn4D7MHoDr3z9YEX3zTdXSndp/Ei1B7vFCkk8SXcn+ABBrwqt/Mupn0CLFzqaiKDbypV9fgn2lwobM1W6nvWu9+qojsAK6N++akS7cZgTTz+21MrAKwr0vNArdvc6N4ikeRI7EcFaHZiOYx33dQzMdifSYQoNThwCzAQLPV8FmxWNs8Z2eglk8t8Nd/8HRYLvWYSJTrsshFdXi83/rATIYg0M9Wddezr8fIjkdz4R47mLNnjIBm4IzD3tDV2SzPPO3Om1CSyvOGxLRP3V+U/g8cfAtX4J9Uezi9Id9yDZWQDmPyNS818OliYIeCOMEWFkdhUjAD0ZhlPW070 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3231254)(944501410)(52105095)(93006095)(93003095)(3002001)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM3PR12MB0764; BCL:0; PCL:0; RULEID:; SRVR:DM3PR12MB0764; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0764; 4:5Z3nJzBBdgBHdkUwKOvDxbCVgULdkas14OEaRj/sMvfAYnPlquSaPyvf7HfWwGvFq7aYEGpdeQ2OzqZ9d2B4MZ97zMKKsokMeo6xZL8bfPw8W+YN4CAGULWm0qdQN5hxNCsnsjx8Z0V70lTqF+ENMpjKn8b7ZgGBzAYXXwo7n9cILZ7U2tKaZIJgxZstQ7tUO0S2py/qW1aKcFHo4IGnwIl0wy3IMv4T+k+PJ5rZLrBSgWX0pAQrdbaCfnAcZX7d+Ud5fmoDqPwwvcGJaqGb3AmUAk1kgCJMMLothGWyORePQhOHzUOOOU9uG3Mxsc1+ X-Forefront-PRVS: 0667289FF8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM3PR12MB0764; 23:aXXBj7BtzIgKDKI/1UkqlArK7Am6KzmzdBTqMOtat?= =?us-ascii?Q?jXWumy3yWbZV0fSLP6nS2uKX/JKvUM7WLALOt1AoOyZ3Nq69r6YeNB3un8u6?= =?us-ascii?Q?He+YfBVuDyYxvEizkMKcZwJWh/claH8qIb5W2U/e/AtWklmu3E54+/LSjY+q?= =?us-ascii?Q?wdyNd1LTLS8RVkLocwYemL/WBvqQTo91kwGIU8B4FOE4VBh8PS2EvDUa6163?= =?us-ascii?Q?kaDAoJDvL948ox9ppZPktka9LGpEzMIXhfSKh2jnamLHKSUQnMYA0eNAm6Bm?= =?us-ascii?Q?Nv/2ipECmhmR5NCO7JaJ4D/hblT2nkW8rGtkzTaMrJKYqQEbzT7PMrJ69KEr?= =?us-ascii?Q?zIfVe/06fk1kxKzkMBnKc19u8sgrQVLQPf3/vGgBBrkQ98oyuuYSt84cgAuq?= =?us-ascii?Q?91vS1FyT21wHJYYm33Mv1FjAAo4croGsTtuPubhKereD4K9dcO+mRCV4IPsR?= =?us-ascii?Q?rHFyFYtkc+mHwIjRrGTDoVR+vEvAuCc6UFXA9eyGb5ywQVwtHpRx/KgjS5EI?= =?us-ascii?Q?VGNlKi46bnOjEGRR/6sikpiudnsiMPbn3XPznDe1OqWN1QpFt+pNzAWEAMbD?= =?us-ascii?Q?I6zH7EtEMVSPB4+zy6O61M3H+KGOnk1zZWza0jj7TnX2HH4aLPkkmEqYLjWV?= =?us-ascii?Q?UVGV+YZE3oP+RXFqwWrk8h76UF0TsXDfLUFkx1Hxyzp9xqrRmSTXR2f6WRA4?= =?us-ascii?Q?ZW7trAf16hOvvyqhDFAwIRiRwYWm1MWRB+GN6luu4YqUg6P7yxAL47QnEnBe?= =?us-ascii?Q?0+kUz71gwvsl3uxyHfV2HLjPMW8GM5nFdEkwHKO8D+DqFfU3jqLHGLuStFBb?= =?us-ascii?Q?o9gCrzU+xJ8AevxNAJ+DhpxCriV2AFF0HnBHUhObMcGEELYEypR7yxtXS0AS?= =?us-ascii?Q?gj5RKMrFLawJDz6zFuufmStyK1YC7/Ggh2eN0TW9Zeqdz4JbV4Q5y0N5SrDY?= =?us-ascii?Q?PVmRZ168hX1ffqkOqj5RZ3fMYktZt1UWyn7uHRWOE45SDvbU84qY0rZrQVfm?= =?us-ascii?Q?Bpw/E2+Rf/gLAWxfz7m4twJmt0y1MCeFer5Hrmx4k8D+Tvp/WSbPU6X7JfZj?= =?us-ascii?Q?JXUoORuXvxA7qEgKN9dnvKtI8QawlEZqzLUikv++6YQbQFUHOpiLq9YwTB82?= =?us-ascii?Q?j/TVj0rjXvouKrmnCioQtayTObOub/ZgWpcElnQUbGSH9lxDqzswIIQvS/a/?= =?us-ascii?Q?v7GXD1RyAG4k4xWiYJRmnOHKNV+rBm5uUsyCsGN5PVbtGDdMzSyDhvbAnCgI?= =?us-ascii?Q?BK6/9aDANndvuIBr7Y=3D?= X-Microsoft-Antispam-Message-Info: L57j28azi8+GJVuzhJKCaN6KU1Jq/HaNf8j/7aiXmBQvj2qhfZmP0SlTb14EQ03MmkLV0KMGhQsWiRRjLcODyv9gdqIHzxKM0/V+liG8am0UwYR1xJ+77YnjUEPe4hI68Bf0MSuC3RgZz5atVYgouLGfai/5mZ9HtpC3oVIeTvyY/cBdmINcEpi8tqxbyf5D X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0764; 6:V1YuASXsCfD2u7JjKoh8+c7C8QSD17gFrjx2xYs4YFydSfqj20/llm/vRChOGIWDIsr58mkcriZEbU3A6VKv387mD4ieQoRWr7sODnxwKmBocqjY4GRUv3571CvRV9iT6RQNMpSeICsp6hfOndUEbqwlrz/ycq8ChHlFpJuFhgV9xjZjd8VEncPtmpmIvzNv0zQ41SRnXb8Fv894oGkes5H3E3S5u7ZZmSUOaEIiR18VDUGwRKTr4qnKloNZKn+Yw/rwQ8hld/AExnzlAyDNX3wUnsmya6I58XpQTgcdHCLHSCgs4eMmVD+ug7VWRP8zJUKGsivg2x60BV1arX2ejhYixZqLWgjJpd0AgubiIM4uMkOGOOmkNeuXvAI/Tb2eUZYXmEpoxA8tHRW/aCLc5pRXhdfd1LoHzKjRqaQZ4EOp1s4VyQl3o2uI0r955c4Grgw9P8oYpxurF8iFYPVDmA==; 5:oLc5jZ/Gzr4zK4gr4MAlHiGX/OCkQTZO/vHgYjbaIMF2tERjwxxAadQ0iB78O2VspdRVbOTJVkURmeJy/DQD3BdtYSU6idbXlUrVoGxp8VaNeHp1KY07sLLBsFNX3FplG0ytOxdZseAsnXL5W6g+4MaY3moepyxMj/D+OosnJ+0=; 24:aKzx3aUPsKx9ly6UbG0tsaq/rbKKJsXFUcQlYmwAL0hbdEkg34xteF5VVXCDIgHfblTaQUw03MYQmzq6kDecMIiqf3VTeU+mukB0AUj99N8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0764; 7:TOmwbra769vCiSERbjzSsTGynxh5HPu6j5s/u0yIEqM1DpaKZ2T2sI+L+5ytRSqPzEYh0xBIPyMNdPeZMQmnZEYKBAd3ZntzxVKHOM0Xwu6vReyJrpUKTx6uKWn39ZfMwDLjRY4W87cyEOZJ9N2Zk2RFFubbRerpR2Grxa6Qui9OB5zzFZzxWDXy7UNktbKhNZUwBdyRmoyqmpGkY0tH2D89vGGTSONIGvGBNkv+BXEmqLXrrUyP+POXuoU2tP+x; 20:7yr67sso1v1J56mR1+7zwTou7Djo1cZO8viLCf2Q6MfYTynLrCJQzQMHRWSwQx1uDH2KE1/HStXtwBneyWMzVXcFNMcW3hf+TtW9ghStVl7XdhH5Sl0pPegidBCv0ck5welJIpbgqfkQfNlWq+sqt07NBcdSQtqFBEjUWbn+7pgCreDP+mI3MGvS3q9RnVwtBFp/VSEU0CC7gLkLgh2BxBQ2+Twp2ec93V7+8RviFh5TQEPPOdx0E2fTFlQ6Ep0Q X-MS-Office365-Filtering-Correlation-Id: 2aca2cd6-b100-46d1-d21b-08d5b578d389 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2018 06:48:09.0802 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2aca2cd6-b100-46d1-d21b-08d5b578d389 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB0764 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jerry.Zhang@amd.com, ckoenig.leichtzumerken@gmail.com, Kai.Guo@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Change-Id: I28351ad8e69c13038ccff40fd9f0369ddae91371 Signed-off-by: Chunming Zhou --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 14 ++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 +++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 ++ 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index f186c8f29774..cec76cda79c5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -445,7 +445,8 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, int alignment, u32 initial_domain, u64 flags, enum ttm_bo_type type, struct reservation_object *resv, - struct drm_gem_object **obj); + struct drm_gem_object **obj, + struct amdgpu_vm_lru *lru); int amdgpu_mode_dumb_create(struct drm_file *file_priv, struct drm_device *dev, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c index bc5fd8ebab5d..b2e45e1314eb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c @@ -146,7 +146,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS | AMDGPU_GEM_CREATE_VRAM_CLEARED, - true, NULL, &gobj); + true, NULL, &gobj, NULL); if (ret) { pr_err("failed to allocate framebuffer (%d)\n", aligned_size); return -ENOMEM; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index 7d3dc229fa47..fac20d796db0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c @@ -45,7 +45,8 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, int alignment, u32 initial_domain, u64 flags, enum ttm_bo_type type, struct reservation_object *resv, - struct drm_gem_object **obj) + struct drm_gem_object **obj, + struct amdgpu_vm_lru *vm_lru) { struct amdgpu_bo *bo; struct amdgpu_bo_param bp; @@ -63,6 +64,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, bp.type = type; bp.resv = resv; bp.preferred_domain = initial_domain; + bp.vm_lru = vm_lru; retry: bp.flags = flags; bp.domain = initial_domain; @@ -257,7 +259,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, r = amdgpu_gem_object_create(adev, size, args->in.alignment, (u32)(0xffffffff & args->in.domains), - flags, false, resv, &gobj); + flags, false, resv, &gobj, &vm->vm_lru); if (flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID) { if (!r) { struct amdgpu_bo *abo = gem_to_amdgpu_bo(gobj); @@ -285,6 +287,8 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, { struct ttm_operation_ctx ctx = { true, false }; struct amdgpu_device *adev = dev->dev_private; + struct amdgpu_fpriv *fpriv = filp->driver_priv; + struct amdgpu_vm *vm = &fpriv->vm; struct drm_amdgpu_gem_userptr *args = data; struct drm_gem_object *gobj; struct amdgpu_bo *bo; @@ -309,7 +313,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, /* create a gem object to contain this object in */ r = amdgpu_gem_object_create(adev, args->size, 0, AMDGPU_GEM_DOMAIN_CPU, - 0, 0, NULL, &gobj); + 0, 0, NULL, &gobj, &vm->vm_lru); if (r) return r; @@ -747,6 +751,8 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv, struct drm_mode_create_dumb *args) { struct amdgpu_device *adev = dev->dev_private; + struct amdgpu_fpriv *fpriv = file_priv->driver_priv; + struct amdgpu_vm *vm = &fpriv->vm; struct drm_gem_object *gobj; uint32_t handle; int r; @@ -759,7 +765,7 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv, r = amdgpu_gem_object_create(adev, args->size, 0, AMDGPU_GEM_DOMAIN_VRAM, AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED, - false, NULL, &gobj); + false, NULL, &gobj, &vm->vm_lru); if (r) return -ENOMEM; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index e62153a86001..a457738c512c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -419,6 +419,11 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, bo->tbo.bdev = &adev->mman.bdev; amdgpu_ttm_placement_from_domain(bo, bp->domain); + bo->vm_lru = bp->vm_lru; + if (bp->type == ttm_bo_type_kernel) { + bo->tbo.priority = 1; + bo->vm_lru = &adev->kernel_vm_lru; + } r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, bp->type, &bo->placement, page_align, &ctx, acc_size, @@ -434,9 +439,6 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, else amdgpu_cs_report_moved_bytes(adev, ctx.bytes_moved, 0); - if (bp->type == ttm_bo_type_kernel) - bo->tbo.priority = 1; - if (bp->flags & AMDGPU_GEM_CREATE_VRAM_CLEARED && bo->tbo.mem.placement & TTM_PL_FLAG_VRAM) { struct dma_fence *fence; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h index 540e03fa159f..f04fc401327b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h @@ -41,6 +41,7 @@ struct amdgpu_bo_param { u64 flags; enum ttm_bo_type type; struct reservation_object *resv; + struct amdgpu_vm_lru *vm_lru; }; /* bo virtual addresses in a vm */ @@ -97,6 +98,7 @@ struct amdgpu_bo { struct ttm_bo_kmap_obj dma_buf_vmap; struct amdgpu_mn *mn; + struct amdgpu_vm_lru *vm_lru; union { struct list_head mn_list;