From patchwork Fri Jan 23 16:12:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 5695671 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 483AEC058D for ; Fri, 23 Jan 2015 16:13:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 85FB6202AE for ; Fri, 23 Jan 2015 16:13:01 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 441FE2028D for ; Fri, 23 Jan 2015 16:13:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9A46E6E40C; Fri, 23 Jan 2015 08:12:58 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f51.google.com (mail-qa0-f51.google.com [209.85.216.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 2AC416E40C for ; Fri, 23 Jan 2015 08:12:57 -0800 (PST) Received: by mail-qa0-f51.google.com with SMTP id f12so6421612qad.10 for ; Fri, 23 Jan 2015 08:12:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=PVZR5FvjO/Z3k4kt8IBPtmdYWO0AdUVvUWGztr7V47w=; b=wpESeZ/PenxdYYzp+uCy9RQ2g6Rv5J0H1KIanodjU+8BuRLgkBxi1eQYKDs2tB9kNm rOMpHVayMNLk9GNjueWsylDv1D0NW6/jqhY73NDLAq2Ox7X3TMeW7UdjHSupFb0asJiu y5WP3GP9AZ+duXbZN486Nqm6GVZDLCzqPew1Z8B/Z8QC11Jk2ph+DFhWXgrKNHvQI4iw 2gFNtoiyf233TkoT+CjBAXj7KRAHZeFQHuL0rUqDWi3C5vFErcOMnNdCmqKW6vwp/D+L CV09kfIoHphyRE5fQpywDB69mGVee2xWWzpc0hsRUwJ2o3jY5F0z2Ah5JPm973zdEoyt pRLg== X-Received: by 10.140.33.162 with SMTP id j31mr15055308qgj.10.1422029576748; Fri, 23 Jan 2015 08:12:56 -0800 (PST) Received: from localhost ([2601:6:2c00:943:ba6b:23ff:feff:af85]) by mx.google.com with ESMTPSA id i48sm1816504qge.34.2015.01.23.08.12.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jan 2015 08:12:55 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm: fix fb-helper vs MST dangling connector ptrs Date: Fri, 23 Jan 2015 11:12:50 -0500 Message-Id: <1422029570-21511-1-git-send-email-robdclark@gmail.com> X-Mailer: git-send-email 2.1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP VT switch back/forth from console to xserver (for example) has potential to go horribly wrong if a dynamic DP MST connector ends up in the saved modeset that is restored when switching back to fbcon. When removing a dynamic connector, don't forget to clean up the saved state. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1184968 Signed-off-by: Rob Clark --- drivers/gpu/drm/drm_fb_helper.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 52ce26d..ff98b31 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -145,6 +145,25 @@ int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_ } EXPORT_SYMBOL(drm_fb_helper_add_one_connector); +static void remove_from_modeset(struct drm_mode_set *set, + struct drm_connector *connector) +{ + int i, j; + + for (i = 0; i < set->num_connectors; i++) { + if (set->connectors[i] == connector) + break; + } + + if (i == set->num_connectors) + return; + + for (j = i + 1; j < set->num_connectors; j++) { + set->connectors[j - 1] = set->connectors[j]; + } + set->num_connectors--; +} + int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector) { @@ -167,6 +186,11 @@ int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper, } fb_helper->connector_count--; kfree(fb_helper_connector); + + /* also cleanup dangling references to the connector: */ + for (i = 0; i < fb_helper->crtc_count; i++) + remove_from_modeset(&fb_helper->crtc_info[i].mode_set, connector); + return 0; } EXPORT_SYMBOL(drm_fb_helper_remove_one_connector);