From patchwork Tue Sep 17 12:09:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11148675 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3F33514DB for ; Tue, 17 Sep 2019 12:09:48 +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 275D121881 for ; Tue, 17 Sep 2019 12:09:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 275D121881 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 25BC16EC09; Tue, 17 Sep 2019 12:09:46 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6C5C36EC09 for ; Tue, 17 Sep 2019 12:09:44 +0000 (UTC) Received: by mail-ed1-x543.google.com with SMTP id r9so3067796edl.10 for ; Tue, 17 Sep 2019 05:09:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=of6wBe7P6WSebdiXmcN25YNAKwd16P1Xglm+KvfUtNo=; b=NmHPKEie9XEl99EMIwhzxle6jvKJJVxrkrrJg/vRadM3cP/AxL6yaYck/SDKZ7Q7tt KDHujTd0CZYJE0h1G9RoP0JJvavGw8Mac7XrCokjjmk5g/oLJDop+7i64HsoPdlzGqjN 2kUqTBAMjKUCzc+xPr6ZSuHfEKz4z9yEuT9yh1HczXogxyZMgLQIfICtHR2AaC17E4TF F45t7bmZhj00x1jcAodpf+QcR/+wnN7/1X73W9wSCUB08vZt1BYG0SJ9789ot9UgGK6u AMhHkz3hrSVbAsy1Z8yk1W43vwC1ByJc1KziyVQ73eWOFHHRMlQGhuS6B/GtjtILFM3D EKAw== X-Gm-Message-State: APjAAAUyg7E9/j6Leu3MYe2DcQ7sSjLN2m3iM7J6n2JBC4a5otz1Rcub 774sni1wk66IPlY0f19sCmS0VNPaZ64= X-Google-Smtp-Source: APXvYqzZZQjm8FmzKSYqrJAfLlc/0nf3MzF5wGAqzpFzfqzvuJXqUbmcmZQSveuV2mCJTOmzQfYePQ== X-Received: by 2002:aa7:d698:: with SMTP id d24mr4326441edr.32.1568722182587; Tue, 17 Sep 2019 05:09:42 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id t9sm251326eji.26.2019.09.17.05.09.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 05:09:41 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 1/2] drm/kms: Duct-tape for mode object lifetime checks Date: Tue, 17 Sep 2019 14:09:35 +0200 Message-Id: <20190917120936.7501-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=of6wBe7P6WSebdiXmcN25YNAKwd16P1Xglm+KvfUtNo=; b=LwNMpV8Mm69xkskZUcAeoqmOD3hPifSNsZJ78J5uTGieWvSJsMO3OjV+hylr5s5r/J byAWLOEKHzxSYorNzavjmh0eTphmkCkbu89GM7FX2nabtF3lbG75ickk6f/4HmT2e0/t CJY6MpeCMKZ8cBN1B51BkWTb4bLnhNxLhIvZg= 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: Daniel Vetter , Intel Graphics Development , Daniel Vetter , Sean Paul , =?utf-8?q?Michel_D=C3=A4nzer?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" commit 4f5368b5541a902f6596558b05f5c21a9770dd32 Author: Daniel Vetter Date: Fri Jun 14 08:17:23 2019 +0200 drm/kms: Catch mode_object lifetime errors uncovered a bit a mess in dp drivers. Most drivers (from a quick look, all except i915) register all the dp stuff in their init code, which is too early. With CONFIG_DRM_DP_AUX_CHARDEV this will blow up, because drm_dp_aux_register tries to add a child to a device in sysfs (the connector) which doesn't even exist yet. No one seems to have cared thus far. But with the above change I also moved the setting of dev->registered after the ->load callback, in an attempt to keep old drivers from hitting any WARN_ON backtraces. But that moved radeon.ko from the "working, by accident" to "now also broken" category. Since this is a huge mess I figured a revert would be simplest. But this check has already caught issues in i915: commit 1b9bd09630d4db4827cc04d358a41a16a6bc2cb0 Author: Ville Syrjälä Date: Tue Aug 20 19:16:57 2019 +0300 drm/i915: Do not create a new max_bpc prop for MST connectors Hence I'd like to retain it. Fix the radeon regression by moving the setting of dev->registered back to were it was, and stop the backtraces with an explicit check for dev->driver->load. Everyone else will stay as broken with CONFIG_DRM_DP_AUX_CHARDEV. The next patch will improve the kerneldoc and add a todo entry for this. Fixes: 4f5368b5541a ("drm/kms: Catch mode_object lifetime errors") Cc: Sean Paul Cc: Maarten Lankhorst Reported-by: Michel Dänzer Cc: Michel Dänzer Signed-off-by: Daniel Vetter Reviewed-by: Michel Dänzer Tested-by: Michel Dänzer --- drivers/gpu/drm/drm_drv.c | 4 ++-- drivers/gpu/drm/drm_mode_object.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index b634882056c8..0c9978af9f72 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -983,14 +983,14 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) if (ret) goto err_minors; + dev->registered = true; + if (dev->driver->load) { ret = dev->driver->load(dev, flags); if (ret) goto err_minors; } - dev->registered = true; - if (drm_core_check_feature(dev, DRIVER_MODESET)) drm_modeset_register_all(dev); diff --git a/drivers/gpu/drm/drm_mode_object.c b/drivers/gpu/drm/drm_mode_object.c index c355ba8e6d5d..6a23e36ed4fe 100644 --- a/drivers/gpu/drm/drm_mode_object.c +++ b/drivers/gpu/drm/drm_mode_object.c @@ -42,7 +42,7 @@ int __drm_mode_object_add(struct drm_device *dev, struct drm_mode_object *obj, { int ret; - WARN_ON(dev->registered && !obj_free_cb); + WARN_ON(!dev->driver->load && dev->registered && !obj_free_cb); mutex_lock(&dev->mode_config.idr_mutex); ret = idr_alloc(&dev->mode_config.object_idr, register_obj ? obj : NULL, @@ -104,7 +104,7 @@ void drm_mode_object_register(struct drm_device *dev, void drm_mode_object_unregister(struct drm_device *dev, struct drm_mode_object *object) { - WARN_ON(dev->registered && !object->free_cb); + WARN_ON(!dev->driver->load && dev->registered && !object->free_cb); mutex_lock(&dev->mode_config.idr_mutex); if (object->id) {