From patchwork Wed Apr 24 01:21:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Airlie X-Patchwork-Id: 10913949 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 043D91515 for ; Wed, 24 Apr 2019 01:21:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E29F5289FB for ; Wed, 24 Apr 2019 01:21:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CFDC628A24; Wed, 24 Apr 2019 01:21:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 89EA7289FB for ; Wed, 24 Apr 2019 01:21:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6358E893AB; Wed, 24 Apr 2019 01:21:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by gabe.freedesktop.org (Postfix) with ESMTPS id 640CA893AB; Wed, 24 Apr 2019 01:21:56 +0000 (UTC) Received: by mail-qt1-x842.google.com with SMTP id c35so3718985qtk.3; Tue, 23 Apr 2019 18:21:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=SikQRIPT4euFXr3nx9SiFnt9YLg1qKcKVh7K4Rp/eQg=; b=fFGXhOwMSWqYuQYuRLoZ49m4rUlYADt5RQVVXC1uC0Ew7wGALPDrlx+Cc8qtEDX3iy EthSFy2GoMVpdEI5DGxslDGY+dBzWM1DWkatFA3vVGqbR7/NoSKPM9S19/7GGvpU9xiD ftTWLtOGgTE4Z+bQgISJFRmxBUyg4BJOKq07RqKaIuqafn6UX5QILsedNHOJpavykPL8 7ctjFoYhtSO46MsH0Wz1j6tXDCgltnzovf/C/oGJzLvdR+h0oMGJkKAKcJzjx9Z8dZBf sgOz3vAFIFGOkno8PmNfkxExzpCX2p3MBNi9mf4aZCp7D4qNofCeviWL9ObE5ywNwEXa iW3Q== X-Gm-Message-State: APjAAAUTF1BNOO4AN+EjvSXX42dv6QA/uFWn6LQVSGbLTDjGyQ/Zlo1I E87/cHJ0R7TSSQt28QHG3T6NAdjj1yLzmIgByEFIjBwoIUA= X-Google-Smtp-Source: APXvYqxuSJfSJLiQ2OB+Qw3aGE2czS++t9hFQj/JDkGgUzST7tzdXn3K+w27JCt3ip9dl5nicdSPTdxnv3tNuj84k98= X-Received: by 2002:a0c:f951:: with SMTP id i17mr10496533qvo.64.1556068915387; Tue, 23 Apr 2019 18:21:55 -0700 (PDT) MIME-Version: 1.0 From: Dave Airlie Date: Wed, 24 Apr 2019 11:21:44 +1000 Message-ID: Subject: [git pull] drm fixes (regression special) To: Linus Torvalds , Daniel Vetter , dri-devel , LKML , Intel Graphics Development X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=SikQRIPT4euFXr3nx9SiFnt9YLg1qKcKVh7K4Rp/eQg=; b=UoSCJsZXYi1H+Npsm8ZAckF+uLiMYDMQRQLwGPhwR+7LB5cO6yR+hc2uKyzpRUvoFB 8C8q97sCGT+sXN8qdF+/9TAurRjnY1LfCCvbWDfxUKmwP1EIVW8TVBqGN6dui2aD+YSF VTM/d0+6CPy9V8eE8TtXeuVe7IC1ysaq/wZvCt/xFGz0Li9oIuCvUqKV0r83a1DsEARD GLZOcDb66BXTm8jlxIgLBTrGdyuVAey7ITMTxmGAxVRi9BGxh3W7d93961k7GAY6W4ui L8Ry5fHlfeudfRv/uVJdEPYuGUhEi+uJ2qLVesD6I88LpGNW6x6Puy5fDjJbBab5KsjM juHg== 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hey Linus, We interrupt your regularly scheduled drm fixes for a regression special. The first is for a fix in i915 that had unexpected side effects fallout in the userspace X.org modesetting driver where X would no longer start. I got tired of the nitpicking and issued a large hammer on it. The X.org driver is buggy, but blackscreen regressions are worse. The second was an oversight that myself and Gerd should have noticed better, Gerd is trying to fix this properly, but the regression is too large to leave, even if the original behaviour is bad in some cases, it's clearly bad to break a bunch of working use cases. I'll likely have a regular fixes pull later, but I really wanted to highlight these. Dave. drm-fixes-2019-04-24: drm regression fixes (i915 and virtio-gpu) The following changes since commit 085b7755808aa11f78ab9377257e1dad2e6fa4bb: Linux 5.1-rc6 (2019-04-21 10:45:57 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2019-04-24 for you to fetch changes up to a0cecc23cfcbf2626497a8c8770856dd56b67917: Revert "drm/virtio: drop prime import/export callbacks" (2019-04-24 10:52:52 +1000) ---------------------------------------------------------------- drm regression fixes (i915 and virtio-gpu) ---------------------------------------------------------------- Dave Airlie (2): Revert "drm/i915/fbdev: Actually configure untiled displays" Revert "drm/virtio: drop prime import/export callbacks" drivers/gpu/drm/i915/intel_fbdev.c | 12 +++++------- drivers/gpu/drm/virtio/virtgpu_drv.c | 4 ++++ drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ++++ drivers/gpu/drm/virtio/virtgpu_prime.c | 12 ++++++++++++ 4 files changed, 25 insertions(+), 7 deletions(-)