From patchwork Thu Nov 19 01:14:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dave Airlie X-Patchwork-Id: 11916341 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAF6EC5519F for ; Thu, 19 Nov 2020 01:14:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4E89322260 for ; Thu, 19 Nov 2020 01:14:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E89322260 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8ED4E899F3; Thu, 19 Nov 2020 01:14:37 +0000 (UTC) Received: from us-smtp-delivery-44.mimecast.com (us-smtp-delivery-44.mimecast.com [207.211.30.44]) by gabe.freedesktop.org (Postfix) with ESMTPS id C2AAC899F3 for ; Thu, 19 Nov 2020 01:14:36 +0000 (UTC) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-465-mJW9FnQ6Nna1L09DhX5oQQ-1; Wed, 18 Nov 2020 20:14:30 -0500 X-MC-Unique: mJW9FnQ6Nna1L09DhX5oQQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3464518B62B4; Thu, 19 Nov 2020 01:14:28 +0000 (UTC) Received: from dreadlord-bne-redhat-com.bne.redhat.com (unknown [10.64.32.209]) by smtp.corp.redhat.com (Postfix) with ESMTP id 871155C1D7; Thu, 19 Nov 2020 01:14:25 +0000 (UTC) From: Dave Airlie To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/vram: fix incorrect flag variable usage. Date: Thu, 19 Nov 2020 11:14:23 +1000 Message-Id: <20201119011423.14224-1-airlied@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=airlied@gmail.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dave Airlie , David Laight , =?utf-8?q?Christian_K=C3=B6nig?= , Wen Pu Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Dave Airlie In 7053e0eab473119503f6565b4e398f9a73122481 drm/vram-helper: stop using TTM placement flags it appears the flags got mixed up. This should fix a regression on ast [ 64.782340] WARNING: CPU: 51 PID: 1964 at drivers/gpu/drm/drm_gem_vram_helper.c:284 drm_gem_vram_offset+0x35/0x40 [drm_vram_helper] [ 64.782411] CPU: 51 PID: 1964 Comm: Xorg Not tainted 5.10.0-rc3 #12 [ 64.782413] Hardware name: To be filled. [ 64.782419] RIP: 0010:drm_gem_vram_offset+0x35/0x40 [drm_vram_helper] [ 64.782424] Code: 00 48 89 e5 85 c0 74 17 48 83 bf 78 01 00 00 00 74 18 48 8b 87 80 01 00 00 5d 48 c1 e0 0c c3 0f 0b 48 c7 c0 ed ff ff ff 5d c3 <0f> 0b 31 c0 5d c3 0f 1f 44 00 00 0f 1f 44 00 00 55 48 8b 87 18 06 [ 64.782427] RSP: 0018:ffffa9128909fa68 EFLAGS: 00010246 [ 64.782431] RAX: 0000000000000002 RBX: ffff95a5c25e1ec0 RCX: ffffffffc02b6600 [ 64.782433] RDX: ffff959e49824000 RSI: ffff95a5c25e0b40 RDI: ffff959e4b1c2c00 [ 64.782434] RBP: ffffa9128909fa68 R08: 0000000000000040 R09: ffff95a9c5dcb688 [ 64.782436] R10: 0000000000000000 R11: 0000000000000001 R12: ffff959e49824000 [ 64.782437] R13: 0000000000000000 R14: 0000000000000000 R15: ffff95a5c5c56f00 [ 64.782440] FS: 00007f485d466a80(0000) GS:ffff95a9afcc0000(0000) knlGS:0000000000000000 [ 64.782442] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 64.782444] CR2: 00007f485e202000 CR3: 0000000c82a0e000 CR4: 00000000003506e0 [ 64.782446] Call Trace: [ 64.782455] ast_cursor_page_flip+0x22/0x100 [ast] [ 64.782460] ast_cursor_plane_helper_atomic_update+0x46/0x70 [ast] [ 64.782477] drm_atomic_helper_commit_planes+0xbd/0x220 [drm_kms_helper] [ 64.782493] drm_atomic_helper_commit_tail_rpm+0x3a/0x70 [drm_kms_helper] [ 64.782507] commit_tail+0x99/0x130 [drm_kms_helper] [ 64.782521] drm_atomic_helper_commit+0x123/0x150 [drm_kms_helper] [ 64.782551] drm_atomic_commit+0x4a/0x50 [drm] [ 64.782565] drm_atomic_helper_update_plane+0xe7/0x140 [drm_kms_helper] [ 64.782592] __setplane_atomic+0xcc/0x110 [drm] [ 64.782619] drm_mode_cursor_universal+0x13e/0x260 [drm] [ 64.782647] drm_mode_cursor_common+0xef/0x220 [drm] [ 64.782654] ? tomoyo_path_number_perm+0x6f/0x200 [ 64.782680] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [ 64.782706] drm_mode_cursor2_ioctl+0xe/0x10 [drm] [ 64.782727] drm_ioctl_kernel+0xae/0xf0 [drm] [ 64.782749] drm_ioctl+0x241/0x3f0 [drm] [ 64.782774] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [ 64.782781] ? tomoyo_file_ioctl+0x19/0x20 [ 64.782787] __x64_sys_ioctl+0x91/0xc0 [ 64.782792] do_syscall_64+0x38/0x90 [ 64.782797] entry_SYSCALL_64_after_hwframe+0x44/0xa9 Signed-off-by: Dave Airlie Cc: Wen Pu Cc: David Laight Cc: Christian König Reported-by: kernel test robot Reviewed-by: Thomas Zimmermann Reviewed-by: Christian König --- drivers/gpu/drm/drm_gem_vram_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c index 50cad0e4a92e..2896a057b771 100644 --- a/drivers/gpu/drm/drm_gem_vram_helper.c +++ b/drivers/gpu/drm/drm_gem_vram_helper.c @@ -140,7 +140,7 @@ static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo, unsigned int c = 0; if (pl_flag & DRM_GEM_VRAM_PL_FLAG_TOPDOWN) - pl_flag = TTM_PL_FLAG_TOPDOWN; + invariant_flag = TTM_PL_FLAG_TOPDOWN; gbo->placement.placement = gbo->placements; gbo->placement.busy_placement = gbo->placements;