From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Paul Subject: [PATCH 4/4] drm/nouveau: dispnv50: Report possible_crtcs incorrectly on mstos, for now Date: Fri, 13 Sep 2019 18:03:53 -0400 Message-ID: <20190913220355.6883-4-lyude@redhat.com> References: <20190913220355.6883-1-lyude@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190913220355.6883-1-lyude@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: nouveau@lists.freedesktop.org Cc: David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Ben Skeggs , Sam Ravnborg , Laurent Pinchart List-Id: nouveau.vger.kernel.org VGhpcyBjb21taXQgaXMgc2VwZXJhdGUgZnJvbSB0aGUgcHJldmlvdXMgb25lIHRvIG1ha2UgaXQg ZWFzaWVyIHRvCnJldmVydCBpbiB0aGUgZnV0dXJlLiBCYXNpY2FsbHksIHdoaWxlIHdvcmtpbmcg b24gbWFraW5nIE1TVE9zIHBlci1oZWFkCmFzIG9wcG9zZWQgdG8gcGVyLWhlYWQtcGVyLWNvbm5l Y3RvciBJIGRpc2NvdmVyZWQgdGhlc2UgbG92ZWx5IGlzc3VlczoKCmh0dHBzOi8vZ2l0bGFiLmZy ZWVkZXNrdG9wLm9yZy94b3JnL3hzZXJ2ZXIvbWVyZ2VfcmVxdWVzdHMvMjc3Cmh0dHBzOi8vZ2l0 bGFiLmdub21lLm9yZy9HTk9NRS9tdXR0ZXIvaXNzdWVzLzc1OQoKTm90ZSBhcyB3ZWxsIHRoYXQg SW50ZWwgYWxyZWFkeSBoYXMgYSB0ZW1wb3Jhcnkgd29ya2Fyb3VuZCBmb3IgdGhpcyBpbgp0aGVp ciBrZXJuZWwgZHJpdmVyLiBTbywgdW5mb3J0dW5hdGVseSB3ZSBuZWVkIHRvIGZvbGxvdyBzdWl0 IHRvIGF2b2lkCmNhdXNpbmcgYSByZWdyZXNzaW9uIGluIHVzZXJzcGFjZS4gT25jZSB0aGVzZSBp c3N1ZXMgZ2V0IGZpeGVkLCB0aGlzCmNvbW1pdCBzaG91bGQgYmUgcmV2ZXJ0ZWQuCgpTaWduZWQt b2ZmLWJ5OiBMeXVkZSBQYXVsIDxseXVkZUByZWRoYXQuY29tPgpDYzogVmlsbGUgU3lyasOkbMOk IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbm91 dmVhdS9kaXNwbnY1MC9kaXNwLmMgfCAxMiArKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAx MiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlz cG52NTAvZGlzcC5jIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52NTAvZGlzcC5jCmlu ZGV4IGQyM2FjMTM3NjNiNS4uZjVhZDIwYWYwZGQ1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vbm91dmVhdS9kaXNwbnY1MC9kaXNwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUv ZGlzcG52NTAvZGlzcC5jCkBAIC0yMzY2LDYgKzIzNjYsMTggQEAgbnY1MF9kaXNwbGF5X2NyZWF0 ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJCWhlYWQtPm1zdG8gPSBOVUxMOwogCQkJCWdv dG8gb3V0OwogCQkJfQorCisJCQkvKgorCQkJICogRklYTUU6IFRoaXMgaXMgYSBoYWNrIHRvIHdv cmthcm91bmQgdGhlIGZvbGxvd2luZworCQkJICogaXNzdWVzOgorCQkJICoKKwkJCSAqIGh0dHBz Oi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9tdXR0ZXIvaXNzdWVzLzc1OQorCQkJICogaHR0cHM6 Ly9naXRsYWIuZnJlZWRlc2t0b3Aub3JnL3hvcmcveHNlcnZlci9tZXJnZV9yZXF1ZXN0cy8yNzcK KwkJCSAqCisJCQkgKiBPbmNlIHRoZXNlIGlzc3VlcyBhcmUgY2xvc2VkLCB0aGlzIHNob3VsZCBi ZQorCQkJICogcmVtb3ZlZAorCQkJICovCisJCQloZWFkLT5tc3RvLT5lbmNvZGVyLnBvc3NpYmxl X2NydGNzID0gY3J0Y3M7CiAJCX0KIAl9CiAKLS0gCjIuMjEuMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs 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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 9DD9CC4CEC5 for ; Fri, 13 Sep 2019 22:05:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F22C206A5 for ; Fri, 13 Sep 2019 22:05:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404035AbfIMWF1 (ORCPT ); Fri, 13 Sep 2019 18:05:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36234 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404024AbfIMWF0 (ORCPT ); Fri, 13 Sep 2019 18:05:26 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A715210C0925; Fri, 13 Sep 2019 22:05:25 +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 A46D7600C6; Fri, 13 Sep 2019 22:05:24 +0000 (UTC) From: Lyude Paul To: nouveau@lists.freedesktop.org Cc: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Ben Skeggs , David Airlie , Daniel Vetter , Sam Ravnborg , Laurent Pinchart , Ilia Mirkin , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] drm/nouveau: dispnv50: Report possible_crtcs incorrectly on mstos, for now Date: Fri, 13 Sep 2019 18:03:53 -0400 Message-Id: <20190913220355.6883-4-lyude@redhat.com> In-Reply-To: <20190913220355.6883-1-lyude@redhat.com> References: <20190913220355.6883-1-lyude@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Fri, 13 Sep 2019 22:05:25 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit is seperate from the previous one to make it easier to revert in the future. Basically, while working on making MSTOs per-head as opposed to per-head-per-connector I discovered these lovely issues: https://gitlab.freedesktop.org/xorg/xserver/merge_requests/277 https://gitlab.gnome.org/GNOME/mutter/issues/759 Note as well that Intel already has a temporary workaround for this in their kernel driver. So, unfortunately we need to follow suit to avoid causing a regression in userspace. Once these issues get fixed, this commit should be reverted. Signed-off-by: Lyude Paul Cc: Ville Syrjälä --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index d23ac13763b5..f5ad20af0dd5 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -2366,6 +2366,18 @@ nv50_display_create(struct drm_device *dev) head->msto = NULL; goto out; } + + /* + * FIXME: This is a hack to workaround the following + * issues: + * + * https://gitlab.gnome.org/GNOME/mutter/issues/759 + * https://gitlab.freedesktop.org/xorg/xserver/merge_requests/277 + * + * Once these issues are closed, this should be + * removed + */ + head->msto->encoder.possible_crtcs = crtcs; } } -- 2.21.0