From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 177/192] drm/nouveau: Stop using drm_crtc_force_disable Date: Wed, 27 Mar 2019 14:10:09 -0400 Message-ID: <20190327181025.13507-177-sashal@kernel.org> References: <20190327181025.13507-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190327181025.13507-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: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Daniel Vetter , dri-devel@lists.freedesktop.org, Sean Paul , nouveau@lists.freedesktop.org, Daniel Vetter List-Id: nouveau.vger.kernel.org RnJvbTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KClsgVXBzdHJlYW0g Y29tbWl0IDkzNGM1YjMyYTVlNDNkOGRlMmFiNGYxNTY2ZjkxZDdjM2JmOGNiNjQgXQoKVGhlIGNv cnJlY3Qgd2F5IGZvciBsZWdhY3kgZHJpdmVycyB0byB1cGRhdGUgcHJvcGVydGllcyB0aGF0IG5l ZWQgdG8KZG8gYSBmdWxsIG1vZGVzZXQsIGlzIHRvIGRvIGEgZnVsbCBtb2Rlc2V0LgoKTm90ZSB0 aGF0IHdlIGRvbid0IG5lZWQgdG8gY2FsbCB0aGUgZHJtX21vZGVfY29uZmlnX2ludGVybmFsIGhl bHBlcgpiZWNhdXNlIHdlJ3JlIG5vdCBjaGFuZ2luZyBhbnkgb2YgdGhlIHJlZmNvdW50ZWQgcGFy YW10ZXJzLgoKdjI6IEZpeHVwIGVycm9yIGhhbmRsaW5nIChWaWxsZSkuIFNpbmNlIHRoZSBvbGQg Y29kZSBkaWRuJ3QgYm90aGVyCkkgZGVjaWRlZCB0byBqdXN0IGRlbGV0ZSBpdCBpbnN0ZWFkIG9m IGFkZGluZyBldmVuIG1vcmUgY29kZSBmb3IganVzdAplcnJvciBoYW5kbGluZy4KCkNjOiBWaWxs ZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTog QWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPiAodjEpCkNjOiBTZWFuIFBh dWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+Ckxpbms6IGh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNr dG9wLm9yZy9wYXRjaC9tc2dpZC8yMDE4MTIxNzE5NDMwMy4xNDM5Ny0yLWRhbmllbC52ZXR0ZXJA ZmZ3bGwuY2gKU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L2Rpc3BudjA0L3R2bnYxNy5jIHwgNCArKystCiAx IGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52MDQvdHZudjE3LmMgYi9kcml2ZXJzL2dw dS9kcm0vbm91dmVhdS9kaXNwbnYwNC90dm52MTcuYwppbmRleCA2YTRjYTEzOWNmNWQuLjhmZDgx MjRkNzJiYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52MDQvdHZu djE3LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52MDQvdHZudjE3LmMKQEAg LTc1MCw3ICs3NTAsOSBAQCBzdGF0aWMgaW50IG52MTdfdHZfc2V0X3Byb3BlcnR5KHN0cnVjdCBk cm1fZW5jb2RlciAqZW5jb2RlciwKIAkJLyogRGlzYWJsZSB0aGUgY3J0YyB0byBlbnN1cmUgYSBm dWxsIG1vZGVzZXQgaXMKIAkJICogcGVyZm9ybWVkIHdoZW5ldmVyIGl0J3MgdHVybmVkIG9uIGFn YWluLiAqLwogCQlpZiAoY3J0YykKLQkJCWRybV9jcnRjX2ZvcmNlX2Rpc2FibGUoY3J0Yyk7CisJ CQlkcm1fY3J0Y19oZWxwZXJfc2V0X21vZGUoY3J0YywgJmNydGMtPm1vZGUsCisJCQkJCQkgY3J0 Yy0+eCwgY3J0Yy0+eSwKKwkJCQkJCSBjcnRjLT5wcmltYXJ5LT5mYik7CiAJfQogCiAJcmV0dXJu IDA7Ci0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbA== 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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,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 2F411C43381 for ; Wed, 27 Mar 2019 18:16:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC7862183E for ; Wed, 27 Mar 2019 18:16:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710565; bh=eWNi1/2LgvDUiHsHnel0TmTz8K9TZ+gzcNTjsTjv8Sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TQXwOu2mJn/5uUIOXwQzh5BS2E/VsKaSkvW5wyo4YYqsDNKGRl2JENU6uIzvOtkLT /wVVI7OQymGwXQ0Leot53FLXgruCQddLkmJv2QLDyFYONuV8tdPC5+WFyB4uwYh1DI vFjHVG1vq5530ZMvNAEDWSshT15joIPzqOsN2+a8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389938AbfC0SQE (ORCPT ); Wed, 27 Mar 2019 14:16:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:59794 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389974AbfC0SP7 (ORCPT ); Wed, 27 Mar 2019 14:15:59 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 8DB1F21738; Wed, 27 Mar 2019 18:15:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710558; bh=eWNi1/2LgvDUiHsHnel0TmTz8K9TZ+gzcNTjsTjv8Sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zYWf7EWXbWfCf6o98PWAb+luVgjC/LFX+r6T56GB8J/K5jq0ZUWsZNI8W71gkODdi R1yO0dV4cbtmXqszWEMOLSqvQbqZCpgA9bgU0PpvTsjmLeYgo3El1Qbm2UKOsA51jJ VNZR8fKH7hOepkuXR8rzAxZlb41K5g2MNOsz8VeM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Daniel Vetter , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Sean Paul , Daniel Vetter , Sasha Levin , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 177/192] drm/nouveau: Stop using drm_crtc_force_disable Date: Wed, 27 Mar 2019 14:10:09 -0400 Message-Id: <20190327181025.13507-177-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327181025.13507-1-sashal@kernel.org> References: <20190327181025.13507-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Vetter [ Upstream commit 934c5b32a5e43d8de2ab4f1566f91d7c3bf8cb64 ] The correct way for legacy drivers to update properties that need to do a full modeset, is to do a full modeset. Note that we don't need to call the drm_mode_config_internal helper because we're not changing any of the refcounted paramters. v2: Fixup error handling (Ville). Since the old code didn't bother I decided to just delete it instead of adding even more code for just error handling. Cc: Ville Syrjälä Reviewed-by: Alex Deucher (v1) Cc: Sean Paul Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20181217194303.14397-2-daniel.vetter@ffwll.ch Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c index 6a4ca139cf5d..8fd8124d72ba 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c @@ -750,7 +750,9 @@ static int nv17_tv_set_property(struct drm_encoder *encoder, /* Disable the crtc to ensure a full modeset is * performed whenever it's turned on again. */ if (crtc) - drm_crtc_force_disable(crtc); + drm_crtc_helper_set_mode(crtc, &crtc->mode, + crtc->x, crtc->y, + crtc->primary->fb); } return 0; -- 2.19.1