From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.18 33/59] drm/amd/amdgpu/dm: Fix dm_dp_create_fake_mst_encoder() Date: Wed, 14 Nov 2018 17:23:05 -0500 Message-ID: <20181114222335.99339-33-sashal@kernel.org> References: <20181114222335.99339-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181114222335.99339-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Alex Deucher , Sasha Levin , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org List-Id: amd-gfx.lists.freedesktop.org RnJvbTogTHl1ZGUgUGF1bCA8bHl1ZGVAcmVkaGF0LmNvbT4KClsgVXBzdHJlYW0gY29tbWl0IDYz MjM3Zjg3NDhiZGY0NmRjY2Y3OWVmOGY5OGYwNWU5ZmU3OTkxNjIgXQoKW3doeV0KUmVtb3Zpbmcg Y29ubmVjdG9yIHJldXNhZ2UgZnJvbSBETSB0byBtYXRjaCB0aGUgcmVzdCBvZiB0aGUgdHJlZSBl bmRlZAp1cCByZXZlYWxpbmcgYW4gaXNzdWUgdGhhdCB3YXMgc3VycHJpc2luZ2x5IHN1YnRsZS4g VGhlIG9yaWdpbmFsIGFtZGdwdQpjb2RlIGZvciBEQyB0aGF0IHdhcyBzdWJtaXR0ZWQgYXBwZWFy cyB0byBoYXZlIGxlZnQgYSBjaHVuayBpbgpkbV9kcF9jcmVhdGVfZmFrZV9tc3RfZW5jb2Rlcigp IHRoYXQgdHJpZXMgdG8gZmluZCBhICJtYXN0ZXIgZW5jb2RlciIsCnRoZSBsaWtlcyBvZiB3aGlj aCBpc24ndCBhY3R1YWxseSB1c2VkIG9yIHN0b3JlZCBhbnl3aGVyZS4gSXQgZG9lcyBzbyBhdAp0 aGUgd3JvbmcgdGltZSBhcyB3ZWxsIGJ5IHRyeWluZyB0byBhY2Nlc3MgcGFydHMgb2YgdGhlIGRy bV9jb25uZWN0b3IKZnJvbSB0aGUgZW5jb2RlciBpbml0IGJlZm9yZSBpdCdzIGFjdHVhbGx5IGJl ZW4gaW5pdGlhbGl6ZWQuIFRoaXMKcmVzdWx0cyBpbiBhIE5VTEwgcG9pbnRlciBkZXJlZiBvbiBN U1QgaG90cGx1Z3M6CgpbICAxNjAuNjk2NjEzXSBCVUc6IHVuYWJsZSB0byBoYW5kbGUga2VybmVs IE5VTEwgcG9pbnRlciBkZXJlZmVyZW5jZSBhdCAwMDAwMDAwMDAwMDAwMDAwClsgIDE2MC42OTcy MzRdIFBHRCAwIFA0RCAwClsgIDE2MC42OTc4MTRdIE9vcHM6IDAwMTAgWyMxXSBTTVAgUFRJClsg IDE2MC42OTg0MzBdIENQVTogMiBQSUQ6IDY0IENvbW06IGt3b3JrZXIvMjoxIEtkdW1wOiBsb2Fk ZWQgVGFpbnRlZDogRyAgICAgICAgICAgTyAgICAgIDQuMTkuMEx5dWRlLVRlc3QrICMyClsgIDE2 MC42OTkwMjBdIEhhcmR3YXJlIG5hbWU6IEhQIEhQIFpCb29rIDE1IEc0LzgyNzUsIEJJT1MgUDcw IFZlci4gMDEuMjIgMDUvMTcvMjAxOApbICAxNjAuNjk5NjcyXSBXb3JrcXVldWU6IGV2ZW50c19s b25nIGRybV9kcF9tc3RfbGlua19wcm9iZV93b3JrIFtkcm1fa21zX2hlbHBlcl0KWyAgMTYwLjcw MDMyMl0gUklQOiAwMDEwOiAgICAgICAgICAobnVsbCkKWyAgMTYwLjcwMDkyMF0gQ29kZTogQmFk IFJJUCB2YWx1ZS4KWyAgMTYwLjcwMTU0MV0gUlNQOiAwMDE4OmZmZmZjOTAwMDAyOWZjNzggRUZM QUdTOiAwMDAxMDIwNgpbICAxNjAuNzAyMTgzXSBSQVg6IDAwMDAwMDAwMDAwMDAwMDAgUkJYOiBm ZmZmODgwNDQ0MGVkNDY4IFJDWDogZmZmZjg4MDQ0NDBlOTE1OApbICAxNjAuNzAyNzc4XSBSRFg6 IDAwMDAwMDAwMDAwMDAwMDAgUlNJOiBmZmZmODgwNDU1NmM1NzAwIFJESTogZmZmZjg4MDQ0NDBl ZDAwMApbICAxNjAuNzAzNDA4XSBSQlA6IGZmZmY4ODA0NThlMjE4MDAgUjA4OiAwMDAwMDAwMDAw MDAwMDAyIFIwOTogMDAwMDAwMDA1ZmNhMGEyNQpbICAxNjAuNzA0MDAyXSBSMTA6IGZmZmY4ODA0 NWEwNzdhM2QgUjExOiBmZmZmODgwNDVhMDc3YTNjIFIxMjogZmZmZjg4MDQ0NDBlZDAwMApbICAx NjAuNzA0NjE0XSBSMTM6IGZmZmY4ODA0NThlMjE4MDAgUjE0OiBmZmZmODgwNDQ0MGU5MDAwIFIx NTogZmZmZjg4MDQ0NDBlOTAwMApbICAxNjAuNzA1MjYwXSBGUzogIDAwMDAwMDAwMDAwMDAwMDAo MDAwMCkgR1M6ZmZmZjg4MDQ1ZjI4MDAwMCgwMDAwKSBrbmxHUzowMDAwMDAwMDAwMDAwMDAwClsg IDE2MC43MDU4NTRdIENTOiAgMDAxMCBEUzogMDAwMCBFUzogMDAwMCBDUjA6IDAwMDAwMDAwODAw NTAwMzMKWyAgMTYwLjcwNjQ3OF0gQ1IyOiBmZmZmZmZmZmZmZmZmZmQ2IENSMzogMDAwMDAwMDAw MjAwYTAwMSBDUjQ6IDAwMDAwMDAwMDAzNjA2ZTAKWyAgMTYwLjcwNzEyNF0gRFIwOiAwMDAwMDAw MDAwMDAwMDAwIERSMTogMDAwMDAwMDAwMDAwMDAwMCBEUjI6IDAwMDAwMDAwMDAwMDAwMDAKWyAg MTYwLjcwNzcyNF0gRFIzOiAwMDAwMDAwMDAwMDAwMDAwIERSNjogMDAwMDAwMDBmZmZlMGZmMCBE Ujc6IDAwMDAwMDAwMDAwMDA0MDAKWyAgMTYwLjcwODM3Ml0gQ2FsbCBUcmFjZToKWyAgMTYwLjcw ODk5OF0gID8gZG1fZHBfYWRkX21zdF9jb25uZWN0b3IrMHhlZC8weDFkMCBbYW1kZ3B1XQpbICAx NjAuNzA5NjI1XSAgPyBkcm1fZHBfYWRkX3BvcnQrMHgyZmEvMHg0NzAgW2RybV9rbXNfaGVscGVy XQpbICAxNjAuNzEwMjg0XSAgPyB3YWtlX3VwX3ErMHg1NC8weDcwClsgIDE2MC43MTA4NzddICA/ IF9fbXV0ZXhfdW5sb2NrX3Nsb3dwYXRoLmlzcmEuMTgrMHhiMy8weDExMApbICAxNjAuNzExNTEy XSAgPyBkcm1fZHBfZHBjZF9hY2Nlc3MrMHhlNy8weDExMCBbZHJtX2ttc19oZWxwZXJdClsgIDE2 MC43MTIxNjFdICA/IGRybV9kcF9zZW5kX2xpbmtfYWRkcmVzcysweDE1NS8weDFlMCBbZHJtX2tt c19oZWxwZXJdClsgIDE2MC43MTI3NjJdICA/IGRybV9kcF9jaGVja19hbmRfc2VuZF9saW5rX2Fk ZHJlc3MrMHhhMy8weGQwIFtkcm1fa21zX2hlbHBlcl0KWyAgMTYwLjcxMzQwOF0gID8gZHJtX2Rw X21zdF9saW5rX3Byb2JlX3dvcmsrMHg0Yi8weDgwIFtkcm1fa21zX2hlbHBlcl0KWyAgMTYwLjcx NDAxM10gID8gcHJvY2Vzc19vbmVfd29yaysweDFhMS8weDNhMApbICAxNjAuNzE0NjY3XSAgPyB3 b3JrZXJfdGhyZWFkKzB4MzAvMHgzODAKWyAgMTYwLjcxNTMyNl0gID8gd3FfdXBkYXRlX3VuYm91 bmRfbnVtYSsweDEwLzB4MTAKWyAgMTYwLjcxNTkzOV0gID8ga3RocmVhZCsweDExMi8weDEzMApb ICAxNjAuNzE2NTkxXSAgPyBrdGhyZWFkX2NyZWF0ZV93b3JrZXJfb25fY3B1KzB4NzAvMHg3MApb ICAxNjAuNzE3MjYyXSAgPyByZXRfZnJvbV9mb3JrKzB4MzUvMHg0MApbICAxNjAuNzE3ODg2XSBN b2R1bGVzIGxpbmtlZCBpbjogYW1kZ3B1KE8pIHZmYXQgZmF0IHNuZF9oZGFfY29kZWNfZ2VuZXJp YyBqb3lkZXYgaTkxNSBjaGFzaCBncHVfc2NoZWQgdHRtIGkyY19hbGdvX2JpdCBkcm1fa21zX2hl bHBlciBzbmRfaGRhX2NvZGVjX2hkbWkgaHBfd21pIHN5c2NvcHlhcmVhIGlUQ09fd2R0IHN5c2Zp bGxyZWN0IHNwYXJzZV9rZXltYXAgc3lzaW1nYmx0IGZiX3N5c19mb3BzIHNuZF9oZGFfaW50ZWwg dXNiaGlkIHdtaV9ibW9mIGRybSBzbmRfaGRhX2NvZGVjIGJ0dXNiIHNuZF9oZGFfY29yZSBpbnRl bF9yYXBsIGJ0cnRsIHg4Nl9wa2dfdGVtcF90aGVybWFsIGJ0YmNtIGJ0aW50ZWwgY29yZXRlbXAg c25kX3BjbSBjcmMzMl9wY2xtdWwgYmx1ZXRvb3RoIHBzbW91c2Ugc25kX3RpbWVyIHNuZCBwY3Nw a3IgaTJjX2k4MDEgbWVpX21lIGkyY19jb3JlIHNvdW5kY29yZSBtZWkgdHBtX3RpcyB3bWkgdHBt X3Rpc19jb3JlIGhwX2FjY2VsIGVjZGhfZ2VuZXJpYyBsaXMzbHYwMmQgdHBtIHZpZGVvIHJma2ls bCBhY3BpX3BhZCBpbnB1dF9wb2xsZGV2IGhwX3dpcmVsZXNzIHBjY19jcHVmcmVxIGNyYzMyY19p bnRlbCBzZXJpb19yYXcgdGczIHhoY2lfcGNpIHhoY2lfaGNkIFtsYXN0IHVubG9hZGVkOiBhbWRn cHVdClsgIDE2MC43MjAxNDFdIENSMjogMDAwMDAwMDAwMDAwMDAwMAoKU29tZWhvdyB0aGUgY29u bmVjdG9yIHJldXNhZ2UgRE0gd2FzIHVzaW5nIGZvciBNU1QgY29ubmVjdG9ycyBtYW5hZ2VkIHRv CnBhcGVyIG92ZXIgdGhpcyBpc3N1ZSBlbnRpcmVseTsgaGVuY2Ugd2h5IHRoaXMgd2FzIG5ldmVy IGNhdWdodCB1bnRpbApub3cuCgpbaG93XQpTaW5jZSB0aGlzIGNvZGUgaXNuJ3QgdXNlZCBhbnl3 aGVyZSBhbmQgc2VlbXMgdXNlbGVzcyBhbnl3YXksIHdlIGNhbgpqdXN0IGRyb3AgaXQgZW50aXJl bHkuIFRoaXMgYXBwZWFycyB0byBmaXggdGhlIGlzc3VlIG9uIG15IEhQIFpCb29rIHdpdGgKYW4g QU1EIFdYNDE1MC4KClNpZ25lZC1vZmYtYnk6IEx5dWRlIFBhdWwgPGx5dWRlQHJlZGhhdC5jb20+ ClJldmlld2VkLWJ5OiBIYXJyeSBXZW50bGFuZCA8aGFycnkud2VudGxhbmRAYW1kLmNvbT4KU2ln bmVkLW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgpTaWdu ZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fbXN0X3R5cGVzLmMgfCA1IC0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV9tc3RfdHlwZXMuYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX21zdF90eXBlcy5j CmluZGV4IGFjZTlhZDU3OGNhMC4uNGE3NDhjNzJiNTM0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV9tc3RfdHlwZXMuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV9tc3RfdHlwZXMu YwpAQCAtMjk1LDEyICsyOTUsNyBAQCBkbV9kcF9jcmVhdGVfZmFrZV9tc3RfZW5jb2RlcihzdHJ1 Y3QgYW1kZ3B1X2RtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogCXN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgYW1kZ3B1X2VuY29kZXIgKmFtZGdw dV9lbmNvZGVyOwogCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcjsKLQljb25zdCBzdHJ1Y3Qg ZHJtX2Nvbm5lY3Rvcl9oZWxwZXJfZnVuY3MgKmNvbm5lY3Rvcl9mdW5jcyA9Ci0JCWNvbm5lY3Rv ci0+YmFzZS5oZWxwZXJfcHJpdmF0ZTsKLQlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY19tYXN0ZXIg PQotCQljb25uZWN0b3JfZnVuY3MtPmJlc3RfZW5jb2RlcigmY29ubmVjdG9yLT5iYXNlKTsKIAot CURSTV9ERUJVR19LTVMoImVuYyBtYXN0ZXIgaXMgJXBcbiIsIGVuY19tYXN0ZXIpOwogCWFtZGdw dV9lbmNvZGVyID0ga3phbGxvYyhzaXplb2YoKmFtZGdwdV9lbmNvZGVyKSwgR0ZQX0tFUk5FTCk7 CiAJaWYgKCFhbWRncHVfZW5jb2RlcikKIAkJcmV0dXJuIE5VTEw7Ci0tIAoyLjE3LjEKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT 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 C5D64C43441 for ; Wed, 14 Nov 2018 22:24:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8CACF2252C for ; Wed, 14 Nov 2018 22:24:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="LZWBfp9B" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8CACF2252C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388393AbeKOI3h (ORCPT ); Thu, 15 Nov 2018 03:29:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:36550 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732685AbeKOI3h (ORCPT ); Thu, 15 Nov 2018 03:29:37 -0500 Received: from sasha-vm.mshome.net (unknown [64.114.255.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6F3202252A; Wed, 14 Nov 2018 22:24:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234272; bh=1VkuYIl7WVdadopH5vZJRbyXvufH8kNnGzmeaiqKn0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LZWBfp9BVhqpaXrjtoDdb9CC0PKmHZJ8WxdDj0Wnb9oyZac6c3M9CEbEawamEqK8X 2a8/DgyupoTNFwf5r+q3Q0ZqCssWOBDFxSw+DaLvqpViHgmB3Iyz+QgFZ0jFZvrboD OOYYRlIgpdZRcZHOQABtXsoylKoIBJ/nGBCPI47c= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lyude Paul , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.18 33/59] drm/amd/amdgpu/dm: Fix dm_dp_create_fake_mst_encoder() Date: Wed, 14 Nov 2018 17:23:05 -0500 Message-Id: <20181114222335.99339-33-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222335.99339-1-sashal@kernel.org> References: <20181114222335.99339-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lyude Paul [ Upstream commit 63237f8748bdf46dccf79ef8f98f05e9fe799162 ] [why] Removing connector reusage from DM to match the rest of the tree ended up revealing an issue that was surprisingly subtle. The original amdgpu code for DC that was submitted appears to have left a chunk in dm_dp_create_fake_mst_encoder() that tries to find a "master encoder", the likes of which isn't actually used or stored anywhere. It does so at the wrong time as well by trying to access parts of the drm_connector from the encoder init before it's actually been initialized. This results in a NULL pointer deref on MST hotplugs: [ 160.696613] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 [ 160.697234] PGD 0 P4D 0 [ 160.697814] Oops: 0010 [#1] SMP PTI [ 160.698430] CPU: 2 PID: 64 Comm: kworker/2:1 Kdump: loaded Tainted: G O 4.19.0Lyude-Test+ #2 [ 160.699020] Hardware name: HP HP ZBook 15 G4/8275, BIOS P70 Ver. 01.22 05/17/2018 [ 160.699672] Workqueue: events_long drm_dp_mst_link_probe_work [drm_kms_helper] [ 160.700322] RIP: 0010: (null) [ 160.700920] Code: Bad RIP value. [ 160.701541] RSP: 0018:ffffc9000029fc78 EFLAGS: 00010206 [ 160.702183] RAX: 0000000000000000 RBX: ffff8804440ed468 RCX: ffff8804440e9158 [ 160.702778] RDX: 0000000000000000 RSI: ffff8804556c5700 RDI: ffff8804440ed000 [ 160.703408] RBP: ffff880458e21800 R08: 0000000000000002 R09: 000000005fca0a25 [ 160.704002] R10: ffff88045a077a3d R11: ffff88045a077a3c R12: ffff8804440ed000 [ 160.704614] R13: ffff880458e21800 R14: ffff8804440e9000 R15: ffff8804440e9000 [ 160.705260] FS: 0000000000000000(0000) GS:ffff88045f280000(0000) knlGS:0000000000000000 [ 160.705854] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 160.706478] CR2: ffffffffffffffd6 CR3: 000000000200a001 CR4: 00000000003606e0 [ 160.707124] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 160.707724] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 160.708372] Call Trace: [ 160.708998] ? dm_dp_add_mst_connector+0xed/0x1d0 [amdgpu] [ 160.709625] ? drm_dp_add_port+0x2fa/0x470 [drm_kms_helper] [ 160.710284] ? wake_up_q+0x54/0x70 [ 160.710877] ? __mutex_unlock_slowpath.isra.18+0xb3/0x110 [ 160.711512] ? drm_dp_dpcd_access+0xe7/0x110 [drm_kms_helper] [ 160.712161] ? drm_dp_send_link_address+0x155/0x1e0 [drm_kms_helper] [ 160.712762] ? drm_dp_check_and_send_link_address+0xa3/0xd0 [drm_kms_helper] [ 160.713408] ? drm_dp_mst_link_probe_work+0x4b/0x80 [drm_kms_helper] [ 160.714013] ? process_one_work+0x1a1/0x3a0 [ 160.714667] ? worker_thread+0x30/0x380 [ 160.715326] ? wq_update_unbound_numa+0x10/0x10 [ 160.715939] ? kthread+0x112/0x130 [ 160.716591] ? kthread_create_worker_on_cpu+0x70/0x70 [ 160.717262] ? ret_from_fork+0x35/0x40 [ 160.717886] Modules linked in: amdgpu(O) vfat fat snd_hda_codec_generic joydev i915 chash gpu_sched ttm i2c_algo_bit drm_kms_helper snd_hda_codec_hdmi hp_wmi syscopyarea iTCO_wdt sysfillrect sparse_keymap sysimgblt fb_sys_fops snd_hda_intel usbhid wmi_bmof drm snd_hda_codec btusb snd_hda_core intel_rapl btrtl x86_pkg_temp_thermal btbcm btintel coretemp snd_pcm crc32_pclmul bluetooth psmouse snd_timer snd pcspkr i2c_i801 mei_me i2c_core soundcore mei tpm_tis wmi tpm_tis_core hp_accel ecdh_generic lis3lv02d tpm video rfkill acpi_pad input_polldev hp_wireless pcc_cpufreq crc32c_intel serio_raw tg3 xhci_pci xhci_hcd [last unloaded: amdgpu] [ 160.720141] CR2: 0000000000000000 Somehow the connector reusage DM was using for MST connectors managed to paper over this issue entirely; hence why this was never caught until now. [how] Since this code isn't used anywhere and seems useless anyway, we can just drop it entirely. This appears to fix the issue on my HP ZBook with an AMD WX4150. Signed-off-by: Lyude Paul Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index ace9ad578ca0..4a748c72b534 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -295,12 +295,7 @@ dm_dp_create_fake_mst_encoder(struct amdgpu_dm_connector *connector) struct amdgpu_device *adev = dev->dev_private; struct amdgpu_encoder *amdgpu_encoder; struct drm_encoder *encoder; - const struct drm_connector_helper_funcs *connector_funcs = - connector->base.helper_private; - struct drm_encoder *enc_master = - connector_funcs->best_encoder(&connector->base); - DRM_DEBUG_KMS("enc master is %p\n", enc_master); amdgpu_encoder = kzalloc(sizeof(*amdgpu_encoder), GFP_KERNEL); if (!amdgpu_encoder) return NULL; -- 2.17.1