From patchwork Wed May 30 03:14:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10437559 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 E8DF9601D3 for ; Wed, 30 May 2018 03:15:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAE67286DE for ; Wed, 30 May 2018 03:15:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF510286F2; Wed, 30 May 2018 03:15:19 +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.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 E6151286DE for ; Wed, 30 May 2018 03:15:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A5546EF2F; Wed, 30 May 2018 03:15:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0061.outbound.protection.outlook.com [104.47.34.61]) by gabe.freedesktop.org (Postfix) with ESMTPS id AD2B06EF2F; Wed, 30 May 2018 03:15:13 +0000 (UTC) Received: from CY4PR12CA0034.namprd12.prod.outlook.com (2603:10b6:903:129::20) by CY1PR12MB0758.namprd12.prod.outlook.com (2a01:111:e400:59d1::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Wed, 30 May 2018 03:15:12 +0000 Received: from BY2NAM03FT015.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::200) by CY4PR12CA0034.outlook.office365.com (2603:10b6:903:129::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.820.11 via Frontend Transport; Wed, 30 May 2018 03:15:12 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT015.mail.protection.outlook.com (10.152.84.212) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.820.8 via Frontend Transport; Wed, 30 May 2018 03:15:11 +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; Tue, 29 May 2018 22:15:10 -0500 From: Chunming Zhou To: , Subject: [PATCH 2/2] drm/amdgpu: gds bo must not be per-vm-bo Date: Wed, 30 May 2018 11:14:47 +0800 Message-ID: <20180530031447.27119-2-david1.zhou@amd.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180530031447.27119-1-david1.zhou@amd.com> References: <20180530031447.27119-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)(376002)(396003)(39860400002)(39380400002)(346002)(2980300002)(428003)(199004)(189003)(53416004)(316002)(2906002)(47776003)(8676002)(81156014)(1076002)(76176011)(72206003)(81166006)(68736007)(51416003)(105586002)(36756003)(5660300001)(106466001)(478600001)(16586007)(8936002)(7696005)(486006)(48376002)(77096007)(450100002)(2616005)(476003)(4326008)(126002)(59450400001)(26005)(305945005)(53936002)(336012)(356003)(54906003)(50226002)(110136005)(11346002)(97736004)(446003)(6666003)(50466002)(86362001)(104016004)(575784001)(426003)(186003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0758; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT015; 1:p54VPzM5YXkKPMw7VGyKg8edS4L2XFndLHG5fmQplJEFlGacP7ElnqiRLSM4iHo3hdc6koS0ABbBnquPy/SU7EsPN3M5Eyjtr0Hje/rc6kNzSppM3YAfgHRoWZAqQ//8 X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:CY1PR12MB0758; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0758; 3:jgn6/PyYTnR2lll5DUs3DvxSpq/+KNi9Dq7w/xmQH6WmyMe8CWlikhyZ6WWPoGgK3WEDg+KrGbDOd37Qq18DGmspXMeGiAVIBfaPfsK+V48f9ASVIXP4L6eXb5hS8o/lvWr+8KaNTkYsfM3Y/GjPt80ZwwqXOB/xKwdyBlICzzjHt6bqxXlT4X6mD76aTE9z4m5ccWQ+tMvlEiJf/+b6jjmJ/dOQLfMpIlpTCz4mTf/4YdxCr1tMMIQHQQphY0o42BKMBEgcUFZ8WXOHKwoxPdxTLPoZQH4utqi65lHSYsRGebPJUdpMslhCY4Q5LPL0GpLEclP2InFcbgOzjsU+rnoZBwOWN0NEbytRU1EXFFg=; 25:T4/8MieJv3hpl0NB8tsefzGorm1aV6+u2oNIi6m8Cpb52n66lWxgXFNNCCOlLGvwOCjYrTvmJQPGEYVM1CxnJP0Y7qqWPe2txJ8vqdZCQCFOrkrFwDLEDja4uu5UaVQyyEVR6kCncMMPk12MNQsA3xZEcFr8b+T1H+ye6Co3J9yUMjK8ztif8HBYDhwjiePErv8enMhkG0C8cu5+GewueUrud/MbhcygAhXZzq567REK5ZHunZoPcrRcYNsSPlC6/QXjAqxgObx0ZyiuR2aofj0CeLlpPNKSuoPeMB4/jBfO2x03yLtbPTXi0oxvJ+a5telNz1fJMUzxYwaDtvtnvQ== X-MS-TrafficTypeDiagnostic: CY1PR12MB0758: X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0758; 31:htsNgoPEAAxXxeEVQIszt7L7/qlAaTKytGqUkelKbYbXkCf01/+Ohv8VEHgDLBYtA0vh6z+hKxPc/b1IrvXLj4OCbjIXNhsoYum4opvworvxqtptDEAIoB6g35tdkZ40MhYCWz+Iy9Xp3m7cqzsnt12eLgVYIt+1efsuHovoVHTM8VWM5F5Va5QrUxvIbHILCTJBUzNdvHOMfykUw93Q6J8rwcbYsgGamzE++DA7MLk=; 20:X6AQ6yA1GGHcC5AkrsMx8KjsfoNyupkKkLY7CixRam8fqdhPznFvRprbh1jMzQOOAHGy+lSxmA4V3vfPB376UjqNaFihLXTzbO7W1sQctKhX4nB7yCVAQ4C7Dazdc9Lc9DQV3pV3tpVkgMKq4Ge4Ah8b1OK6K01fqL8ZCpU1NzAnTFZzsboKNAtom7QKcUBi3qlOdig357k0nMl9sy9qgFGYhcKifWkicXcJb3EU10apLIo+dQuKmwHwCQ7uKJWvguvQdXR3Oq2FXBAq7YG/2WNzINlrjn1jO1jbXnGoD+nvPwtChbbyBpICheQYw/9B3HiFZcJIoMDSVrLhnxDZHXLQSibGwHKSw/rtgFkUSXiF0pRAiuop2WFP2cvIB4Qbr1OXDYAyM18FcAUGMRB5CjKkkVi+H+/P87DrAlxjZOHx+/+y9303wfCOJG1jI7r3LZObOl2n8M7a3MUDZl5MW+Tp9PvKsVVM7QKdSyfjuLBOWBn5cHInFOZZdfSqdRhw 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)(3231254)(944501410)(52105095)(10201501046)(3002001)(93006095)(93003095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:CY1PR12MB0758; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0758; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0758; 4:jGRMWmrhmVS2ToCqO46iYiAs0AXHvoaAR2NXtakDX8tArwNHAhaiuNN2kb4lItFsExLf5TsN+AY+Ju7BVHTjoa1hzkmms5Xbg/TG8JIFSdOu1ipMeyX+5gUddEk9ltZWUyVS2YAX0HcBpbqoSCGYK8S0fmUrqBUwz1OnQ6ZRrf2DAt8oodgmxth77beZEstlDPBYjzhCSuxvw+6gWlHwVOM4wBlTtu+FKXMtGpee811MMx+G6Lt1xQewbduDxXkHqFXOcDNLvP9187a9SHgis5HbFGBkIU396u2IJ265Sf69ZyFqKF+5IXFHzupYaqGZ X-Forefront-PRVS: 0688BF9B46 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0758; 23:utgpHjmOwouB93/hKR+EjIimrfXcPvL8Oa0yWpTE8?= =?us-ascii?Q?MHN+LqpZjPMZIvQx9s4eSZjLaIXAf0Bi4P98c4zLxMl6jDYsMcos4N8L73fR?= =?us-ascii?Q?ARaVarcsY0GVXQbpyHmeIYDI9G0EIsDZydU6rfde8zhk8IPp3Y0tg/CFF9j2?= =?us-ascii?Q?8CtQQvKVQPYc28O133My+d05NvNA1lPsXpJhOrr+sNoWIjsLgaJ8TTPi22SP?= =?us-ascii?Q?CXT1n0IhFSR2sivzylRSPr62cTL6XDno4IKaP9e1K1emZgiCa44Sy5jTVs+e?= =?us-ascii?Q?NFZpdMD2ZNdh3ZVoRwU3sVYkkMvqyPfSAeNtLx+V4Vme/s7tYKGpcZHr5RDy?= =?us-ascii?Q?+DwPOzgmhd3P9fZtYhwxb+QYycnDiain+j5XFcvyo8xzqnfeVP5MNtpvhmm7?= =?us-ascii?Q?9CBjf3fVb7qzMgZW+XiiBHJNDIWoizu1PQeA5cmWiTzmqBF5kVoNsCxtlnDU?= =?us-ascii?Q?MHQusrPHY2h4/Jwok6tJRKOcpcuwyRyud7h6+90Ms1XrXHBQ6fc0qPLvGTjK?= =?us-ascii?Q?2/8qbjW2HaJ1C3vOBzVRSECaNUnkW8iDJuLtKSOXuMauIB/NpV+Xdgvc1rT9?= =?us-ascii?Q?RGn0T4PI3/R4RyhCL2OKtV5kWIvkYAzkxfDgIpXPv0XdGkfriFA1D9o9VO5q?= =?us-ascii?Q?ryxVi/xG1VyJSP/yLr8SBd6j78c8Mqge4yUpMaJeIkEJgqX/H2IS9Qt0v0W0?= =?us-ascii?Q?miDz47mFJYBiFAggq4Q+xSZoi2UY8VdmoQ6zVuMb7RElCibnkFWrFxLcZOBx?= =?us-ascii?Q?h8leYblzcXZVKEOv55dS6ApIL0yC/ACvhR5iu2r1m49ty5zRo/Z7PRJ6EAVr?= =?us-ascii?Q?W7SZcIVHufjiFWyIbSr3siSuw7+f1EpKSdHaxMWOqwyv/KhcD+NoUGW+DMau?= =?us-ascii?Q?/WCS05V7hsYTMPJXOP3oSqV94UpGheLO+W++3vj5hquukMsydASoBrScCsHk?= =?us-ascii?Q?jH5R90bDjW6EJiTL2M8w7pbldI4TVQKBUM7qH/ME3cDgM2MOhJ8r7QpIcB7w?= =?us-ascii?Q?qvXFktEO/jK3BGPGrmNs/+TuzlxNnD5fvDWtQjynbyeJ3kJ7ches7B5N1AeL?= =?us-ascii?Q?JpicyVdBnVHAm9YYLbo25Rkcv0Sk8O4HI6LpkTW3NOQTYMUYGTWfUz56FGlY?= =?us-ascii?Q?AfsbObgVFVyCBtSGgMRu6w15bF0Be2N6wtmS8sDxikldFxV+YJSHAeqcMjLI?= =?us-ascii?Q?zvm3F9/PCaDNYfBu7ioOddSRqtathDreW3bx9PKR1Of0vyylhcG1wZQIwZC8?= =?us-ascii?Q?Qmy/KBuNnpJR7c6J0peHcxYwlGVu+vQA1GS5kUL?= X-Microsoft-Antispam-Message-Info: gTfn9MqWxihRsMcYf+WPAsptEH8lj2mntlLGeZSBbJJBr/KiQw+DRer7ivvLce9RI7V6f5Mnu64zLMwzr1OEQoVFXo50ymU51KfzhrHukaLX5ziasZE1qbyuPLeOjSvHpYvTjKB3T6XXL0Ie7y+tDC1GV/YQJ89j9MJm10vKk9S//F2FB1VBb7Yek8pEVKVE X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0758; 6:kil3HWapLoKMI8QWgXdOadEXyT42Jh+xNQl4bQQZNdMCJT2WK3t4dpd5PWg6ALIsYCOqh6DyEkAnIuE1N4ycLF5Uf0p3Rl6AvPboNtJw3kmQ0vjGNYPd9KWqEDiWzr//+XdVhahlUQ6CRcEGop3ehwYXz8KX8PePWxLCr+U0NMXWYzo8LKjNbGIkduswpihaMFTPpWIHNASlej4wlHt68sgIv3COGd9VTzcPr5VSwVqbX9InBzfJUgNn0e4+TmN1Yy4Dnskd3LAgg+hnuQexOuthmtOYG8cp5kV9ckKfD6ZlrLW0jRXfx/q1dGkB5VjNXOiOLyQcVL5jo4lz1W50J8TyQ9STbapCvhhAQ2WBn/XjuL3mEXRq19TgH+oBKIJik8dXGjI76Y9qk3u09A1Kier6K1bZ8lzy1SBC4iMpznlNHdj6awJCtFMitIBpGplTepF3k/6KGjbM0MDkh5AXBA==; 5:/KR8tyV7N+E8OM/Oa+XdIlzqxE9g14nGkpEG97tS1818XNAWlyU90KBnrQOaWKO8eEV02fC8esnZbhJ+i4vLXph1/tECHmeYsw16o3UIK0BwclWiQXxbwRtTrpOrCavhAnVvySULavaOAM45s8NTRg/KhSAvCfr/unaIrQ6JDg4=; 24:sxARrCrKkOmHCYEl9KZpUFbuAc/pEeTy11XWhgt5kS/Vf12nW5ESva1XtOnjkZR5DqMeYgEdpkQICM9OcQGDetrfAhay2uua5oYRSC3W7rY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0758; 7:SzS82tWsCswHGZGwaxoWGEBoVJWgbhG0G+fojT0VXxHKWy45xIy1SELquCiQ9Bm7xLfMl8dRDT5ZqNGXb7ln4s68LQOo93v6mkaaP9COvpSM/ugJyXzeTo7aaflj9Vc0Lnz9s6T5NQxGF9mbdrl0Z3gCs7GecNJOlaerNpZDPf7/IqTTSgP/XgjL9IbCIO0S5u2Ae+IxkIGauaLK3OtgtCo3TX8VIY00cJD1sC7xXchq00BNdSmr2Chm2M/YMoso; 20:9pOg+67yvK4ogtdQ2HpDtCIkwT36alcpk8aBhzDa/5EAxDUbvZiP30HMaJfZaxmOyo/s3/zVWZx9pA9IZAdUZR9LeJA1PRhbMwVh8ilocsoabQcyZKIFQGYsXdHtGTVCwAhqrrVh1RzvK1kl/OOeIOgfyV2px3Xdy+Gv/BS+UEYu9X7EEJSvEByzK/0XKz6207c2351KUVS2EqlI/zdzmTotk6mBLVxGBikje0THITDQyLdd75quAbTeCiz9QCWz X-MS-Office365-Filtering-Correlation-Id: ee6d0acc-d652-480f-457c-08d5c5db8e6f X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2018 03:15:11.8772 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee6d0acc-d652-480f-457c-08d5c5db8e6f 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: CY1PR12MB0758 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: Emily.Deng@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP In per-vm-bo case, there could be no bo list. But gds bo created from user space must be passed to bo list. So adding a check to prevent creat per-vm gds bo. Change-Id: Idfa58c40447df0db2883413f9f7ccf56b47579f5 Signed-off-by: Chunming Zhou --- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index 556406a44da3..5fb156a01774 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c @@ -236,6 +236,13 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, /* create a gem object to contain this object in */ if (args->in.domains & (AMDGPU_GEM_DOMAIN_GDS | AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA)) { + if (flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID) { + /* if gds bo is created from user space, it must be + * passed to bo list + */ + DRM_ERROR("GDS bo cannot be per-vm-bo\n"); + return -EINVAL; + } flags |= AMDGPU_GEM_CREATE_NO_CPU_ACCESS; if (args->in.domains == AMDGPU_GEM_DOMAIN_GDS) size = size << AMDGPU_GDS_SHIFT;