Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp1370476ybe; Fri, 13 Sep 2019 15:42:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqxdvxZSh/SLN+Il8npt6BkU1msPibsqR4bxU55OpiYlVss+07qZ+2DmiqkhFycwsCWOzIdh X-Received: by 2002:aa7:c50e:: with SMTP id o14mr49995261edq.78.1568414563512; Fri, 13 Sep 2019 15:42:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568414563; cv=none; d=google.com; s=arc-20160816; b=sEty9tvGF/KHEAsPXU9ESJ92iYPsMcKfjCuIGtuOWJvob1dHd2ZO9T43TvKiCxzHAj Rl1rTpek6AtzKVudLUsojWkjgCP03AJOGBs4276kcGQkiIYan+AaaQlf22FaxzG7OKWB QAzEYDBmwsWRw/kQAznZsZSjtY+KjE2B4QWQblGhaPlHw/HDGsPUxAIBg4JkhuZNg1yh sk9Bn27f7RGiniz8Kz1H+k4P9Yv8nEBt07Z0cI6HZY9Sfn6oz7f9IHb477Bi1r9IZLAR Njs6ke429LiOywaUh656/lDze1mMRLyV7c/ax084kGJkdiX3mXr0MIdEOuREUlUBmfSm aa1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=fLpqg+989Vl9OIvAfjJUzZHI0WIfKassy/pyo7Olsus=; b=K5j8Qz1La8hoePphrxQ5HWC45BR2oEh0IsNhpjMiZ/T9ktg8xNnfoqc4EJq96YWFgP Nv8VkClqYsqPhUmm8ietAeBYWU/WAHYbS1Cp56ZzstM/9jOQD33DwrXq6SvluXDyCuCe h9SnGE08Yqaar8NHvgpRwqFCILNn2UpaNTKHcyxLIHTQk9sgvKJPag51Pj9BPGdEHDlX hAvxleJfObetfpUmXTPLK4jtn+MoLF/qMty47fuS1CAw2w37z1RiPdGyUtFvzedY1SAW MQmpvUiynO+fsq5Gf36N7UzWbVapR12u/kPdLtiIxyKo23ctoHlTeaJxwd1hcJJdGMhb 76PA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rv26si15449213ejb.354.2019.09.13.15.42.18; Fri, 13 Sep 2019 15:42:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404170AbfIMWhd (ORCPT + 99 others); Fri, 13 Sep 2019 18:37:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42840 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404123AbfIMWhc (ORCPT ); Fri, 13 Sep 2019 18:37:32 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 84328811A9; Fri, 13 Sep 2019 22:37:32 +0000 (UTC) Received: from malachite.bss.redhat.com (dhcp-10-20-1-34.bss.redhat.com [10.20.1.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFB2510018FF; Fri, 13 Sep 2019 22:37:28 +0000 (UTC) From: Lyude Paul To: nouveau@lists.freedesktop.org Cc: Ben Skeggs , David Airlie , Daniel Vetter , Sam Ravnborg , Laurent Pinchart , Ilia Mirkin , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] drm/nouveau: dispnv50: Remove nv50_mstc_best_encoder() Date: Fri, 13 Sep 2019 18:37:20 -0400 Message-Id: <20190913223721.10185-1-lyude@redhat.com> In-Reply-To: <20190913220355.6883-2-lyude@redhat.com> References: <20190913220355.6883-2-lyude@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 13 Sep 2019 22:37:32 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When drm_connector_helper_funcs->atomic_best_encoder is defined, ->best_encoder is ignored by the atomic modesetting helpers. That being said, this hook is completely broken anyway - it always returns the first msto for a given mstc, despite the fact it might already be in use. So, just get rid of it. We'll need this in a moment anyway, when we make mstos per-head as opposed to per-connector. Changes since v1: * Fix typo in documentation - imirkin Signed-off-by: Lyude Paul --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index b46be8a091e9..a3f350fdfa8c 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -920,14 +920,6 @@ nv50_mstc_atomic_best_encoder(struct drm_connector *connector, return &mstc->mstm->msto[head->base.index]->encoder; } -static struct drm_encoder * -nv50_mstc_best_encoder(struct drm_connector *connector) -{ - struct nv50_mstc *mstc = nv50_mstc(connector); - - return &mstc->mstm->msto[0]->encoder; -} - static enum drm_mode_status nv50_mstc_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) @@ -990,7 +982,6 @@ static const struct drm_connector_helper_funcs nv50_mstc_help = { .get_modes = nv50_mstc_get_modes, .mode_valid = nv50_mstc_mode_valid, - .best_encoder = nv50_mstc_best_encoder, .atomic_best_encoder = nv50_mstc_atomic_best_encoder, .atomic_check = nv50_mstc_atomic_check, }; -- 2.21.0