From patchwork Wed Mar 13 19:21:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 10851691 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 D95191390 for ; Wed, 13 Mar 2019 19:22:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7C5329FC8 for ; Wed, 13 Mar 2019 19:22:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C59AD29FFC; Wed, 13 Mar 2019 19:22:08 +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,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 810D629FC8 for ; Wed, 13 Mar 2019 19:22:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F2D9889DBC; Wed, 13 Mar 2019 19:22:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1ADE189D89; Wed, 13 Mar 2019 19:22:02 +0000 (UTC) X-Originating-IP: 90.89.68.76 Received: from localhost (lfbn-1-10718-76.w90-89.abo.wanadoo.fr [90.89.68.76]) (Authenticated sender: maxime.ripard@bootlin.com) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 48B19FF802; Wed, 13 Mar 2019 19:21:59 +0000 (UTC) Date: Wed, 13 Mar 2019 20:21:58 +0100 From: Maxime Ripard To: Dave Airlie , Daniel Vetter Subject: [PULL] drm-misc-next-fixes Message-ID: <20190313192158.k3qssf733khsqodn@flea> MIME-Version: 1.0 User-Agent: NeoMutt/20180716 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: , Cc: dim-tools@lists.freedesktop.org, Maxime Ripard , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi , Sean Paul Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi Daniel, Dave, Here is what should be the last drm-misc-next-fixes PR. Thanks! Maxime drm-misc-next-fixes-2019-03-13: - qxl: Remove the conflicting framebuffers earlier - Split out some i915 code into the fb_helper to allow the above The following changes since commit e552f0851070fe4975d610a99910be4e9bf5d7bd: drm: add __user attribute to ptr_to_compat() (2019-03-04 09:55:31 -0500) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2019-03-13 for you to fetch changes up to c34674a23d1e8674ac532bf3397333f24a41e7b2: drm/qxl: remove conflicting framebuffers earlier (2019-03-07 10:34:38 +0100) ---------------------------------------------------------------- - qxl: Remove the conflicting framebuffers earlier - Split out some i915 code into the fb_helper to allow the above ---------------------------------------------------------------- Gerd Hoffmann (3): drm: move i915_kick_out_vgacon to vgaarb drm/fb-helper: call vga_remove_vgacon automatically. drm/qxl: remove conflicting framebuffers earlier drivers/gpu/drm/i915/i915_drv.c | 35 +---------------------------- drivers/gpu/drm/qxl/qxl_drv.c | 5 ++++- drivers/gpu/vga/vgaarb.c | 49 +++++++++++++++++++++++++++++++++++++++++ include/drm/drm_fb_helper.h | 14 +++++++++--- include/linux/vgaarb.h | 2 ++ 5 files changed, 67 insertions(+), 38 deletions(-)