Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf13af56 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Fix up KMS Kconfig removal patch 



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 fd930478
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Fri Jun 19 20:27:27 2015 +0100

    drm/i915: Remove KMS Kconfig option

Reported-by: default avatarTvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Damien Lespiau <damien.lespiau@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent fd930478

drivers/gpu/drm/i915/i915_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

{

drivers/gpu/drm/i915/i915_params.c

+1 −1
Original line number Diff line number Diff line
@@ -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);