From patchwork Tue Jun 23 12:04:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6660061 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 700DCC05AC for ; Tue, 23 Jun 2015 12:01:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 90FB520685 for ; Tue, 23 Jun 2015 12:01:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0041A20689 for ; Tue, 23 Jun 2015 12:01:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 13C216E625; Tue, 23 Jun 2015 05:01:22 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 92E6A6E625 for ; Tue, 23 Jun 2015 05:01:20 -0700 (PDT) Received: by wicnd19 with SMTP id nd19so103866908wic.1 for ; Tue, 23 Jun 2015 05:01:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=xkvYIDv0bype03b8rLkrNgYtbfn2zbQM7rH4zX73StY=; b=PG30mTqrgIqT/UML0QDsQ3x4FAGdOA3ekMsqTPdfaobe7mlT3UViply4FGAYINa+ib e40FrPuiJbzMT/UCnujXZGB1YRC+ZGd62Un5qS/Lk7KI2pcJ3apgdSp7Q6J4rdoPTs2b PJ+dMDWs9IGN3xYelwlriq8JWy411TZLcjYYA= 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; bh=xkvYIDv0bype03b8rLkrNgYtbfn2zbQM7rH4zX73StY=; b=cY3A4cAxau1l5S8i/q/Er7r72DW3mqM7MM1dG7W0M2qp7KsFjFwStY9QYxAjUcl0ZC Ir3tlGvIYK/NV1a/v5UTnCded+9Vul3dXapNjmZ1zh1qoQri9xTF2xjwrwiScHSg9FBr 9HzdNz6dlC68zj1OMN9iDO6u81CZV00+s69hsb6a1STXcz9BGv0WYKpBoiKmYx0NlWgP WSyPTPnygMaOno7moFJjZ1kBGUC0hGAcM9DXN5dJF/1r61vIg7EgsvWz0UdyrCh4j9M6 bK5W+U1pIBo+EonqQ/Y4UJSs/90PPKztwVdvhtVFHCWW5TOMg66g2ww71H1mJk7Stx72 57yQ== X-Gm-Message-State: ALoCoQm21mbXTwaKXCGzNcFvL5vY59S71oo0kB7ujm0dHjPBswlNJMSnWdRnwuGC3Ypin3Hu7Hjv X-Received: by 10.180.215.8 with SMTP id oe8mr889517wic.0.1435060879719; Tue, 23 Jun 2015 05:01:19 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by mx.google.com with ESMTPSA id az1sm1872589wib.0.2015.06.23.05.01.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Jun 2015 05:01:18 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 23 Jun 2015 14:04:04 +0200 Message-Id: <1435061044-23050-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 Cc: Daniel Vetter , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: Fix up KMS Kconfig removal patch X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.5 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 The module pciid list got lost, but somehow most distros seem to force-load drm drivers early and no one noticed for a while. Bug introduced in commit fd930478fb797e4cbaa799d9ddd970e9a1fa1b4a Author: Chris Wilson Date: Fri Jun 19 20:27:27 2015 +0100 drm/i915: Remove KMS Kconfig option Reported-by: Tvrtko Ursulin Cc: Tvrtko Ursulin Cc: Damien Lespiau Cc: Chris Wilson Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_drv.c | 2 -- drivers/gpu/drm/i915/i915_params.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index c69f19271e27..b12a8218e35e 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -440,9 +440,7 @@ static const struct pci_device_id pciidlist[] = { /* aka */ {0, 0, 0} }; -#if defined(CONFIG_DRM_I915_KMS) MODULE_DEVICE_TABLE(pci, pciidlist); -#endif void intel_detect_pch(struct drm_device *dev) { diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index 8ac5a1b29ac0..3f67e69185c8 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c @@ -58,7 +58,7 @@ struct i915_params i915 __read_mostly = { module_param_named(modeset, i915.modeset, int, 0400); MODULE_PARM_DESC(modeset, - "Use kernel modesetting [KMS] (0=DRM_I915_KMS from .config, " + "Use kernel modesetting [KMS] (0=disable, " "1=on, -1=force vga console preference [default])"); module_param_named(panel_ignore_lid, i915.panel_ignore_lid, int, 0600);