From patchwork Tue Dec 17 09:00:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3359711 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 041439F314 for ; Tue, 17 Dec 2013 09:00:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 596C920364 for ; Tue, 17 Dec 2013 09:00:14 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9CE822035E for ; Tue, 17 Dec 2013 09:00:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4615FF9FA5; Tue, 17 Dec 2013 01:00:07 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f44.google.com (mail-ee0-f44.google.com [74.125.83.44]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D8D2F9F26 for ; Tue, 17 Dec 2013 01:00:04 -0800 (PST) Received: by mail-ee0-f44.google.com with SMTP id b57so2723190eek.3 for ; Tue, 17 Dec 2013 01:00:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yUgvH80JpLfzqoQR/fesJvNO2KOp0B/bXhhQGa5DpZQ=; b=b6yPqYm++5uAGhBWvnT/Ifqo6lypKd76AejyR2Wyi+H7nnOzbQDrkb8DYCc4up1aSq tt0+2J+VOqrUjm38buDeSvBFuQMtQskkL+efXytWlBk1EZv/jAe5ltGeZBmQmpHhiU/6 2uJR4tQKGmFFanbdaZLXeKbQH/73fwX+Ei1KY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yUgvH80JpLfzqoQR/fesJvNO2KOp0B/bXhhQGa5DpZQ=; b=aVWNrk7x0HpmJIh9p0F3Lponk3PsCAag3dXVJ7jt8KinQp0RgI8ShDk4q+x+wIzEWl VJRFsGLb0r7IePXazIMPjWkPU4Y+A32kaTEzOvTABb/hQErxPCpaYGzRv0XjCQOt9+3T +Q3zaoqYhQApk2qYtiF/zCVk72eTBl1LTQMYSBRpBqdLidtVC6W2DovZFObH4rYej0AC mVTKA7cqsNCU+5ZFZLPLUM/akBwmmXgBkJZuRrlNWw2n+BwHrC9zLxhFHdTp8ss9Z+BY Nnh62rFkV5dwYVPsBi9T1NfpLPMVore+LN/54kV0HwrZ2XbN0AvUv0G5Q4/khBfVNr+8 hHdA== X-Gm-Message-State: ALoCoQkmCeGK4Uvl6bOOMZJU7aStb1Dkx7+VMovFzggkVDMkMojNoWvBGVPtJKmaXbeRdCGKWBNU X-Received: by 10.15.41.140 with SMTP id s12mr21719651eev.50.1387270803852; Tue, 17 Dec 2013 01:00:03 -0800 (PST) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id 4sm51077877eed.14.2013.12.17.01.00.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Dec 2013 01:00:02 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 17 Dec 2013 10:00:54 +0100 Message-Id: <1387270854-21303-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <87bo0g3so5.fsf@intel.com> References: <87bo0g3so5.fsf@intel.com> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: kick firmware fbs even when i915 fbdev is disabled X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Otherwise we don't kick out firmware framebuffers like vesafb and efifb when CONFIG_DRM_I915_FBDEV=n but CONFIG_FB=y. There's still the pesky issue with vgacon which we should somehow replace with the dummy console at least. We have a similar issue at module un/reload, since vgacon state is terminally botched after i915.ko has loaded in modeset mode. But this gets us a step further at least. v2: Use IS_ENABLED - I always get this wrong for tristates. Spotted by Jani. Reported-by: Chris Wilson Cc: Chris Wilson Cc: Jani Nikula Signed-off-by: Daniel Vetter Reviewed-by: Jani Nikula --- drivers/gpu/drm/i915/i915_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index c9101bde96be..6b5f63043cde 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1413,7 +1413,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master) master->driver_priv = NULL; } -#ifdef CONFIG_DRM_I915_FBDEV +#if IS_ENABLED(CONFIG_FB) static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv) { struct apertures_struct *ap;