diff options
| author |   Andreas Ziegler <andreas.ziegler@fau.de> | 2016-01-25 12:41:19 +0100 |
|---|---|---|
| committer |   Jani Nikula <jani.nikula@intel.com> | 2016-01-29 09:13:58 +0200 |
| commit | 428398e44a2762875c01a4d5c18932f1e84fdc17 (patch) | |
| tree | 67f76d6e4c7e78ff13d74413f8b808162a236411 | |
| parent | drm/i915: Fix NULL plane->fb oops on SKL (diff) | |
| download | linux-dev-428398e44a2762875c01a4d5c18932f1e84fdc17.tar.xz linux-dev-428398e44a2762875c01a4d5c18932f1e84fdc17.zip | |
drm/i915: Remove select to deleted STOP_MACHINE from Kconfig
Commit 5bab6f60cb4d ("drm/i915: Serialise updates to GGTT with access
through GGTT on Braswell") depended upon a working stop_machine() and
so forced the selection of STOP_MACHINE. However, commit 86fffe4a61dd
("kernel: remove stop_machine() Kconfig dependency") removed the option
STOP_MACHINE from init/Kconfig and ensured that stop_machine()
universally works. Due to the order in which the patches were applied,
removing the select from DRM_I915 got lost during merging.
Remove the now obsolete select statement.
Signed-off-by: Andreas Ziegler <andreas.ziegler@fau.de>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1453722079-2604-1-git-send-email-andreas.ziegler@fau.de
Cc: drm-intel-fixes@lists.freedesktop.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit 21fabbebff0e17c7698ed399cae23958c214cc82)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig index fcd77b27514d..051eab33e4c7 100644 --- a/drivers/gpu/drm/i915/Kconfig +++ b/drivers/gpu/drm/i915/Kconfig @@ -10,7 +10,6 @@ config DRM_I915 # the shmem_readpage() which depends upon tmpfs select SHMEM select TMPFS - select STOP_MACHINE select DRM_KMS_HELPER select DRM_PANEL select DRM_MIPI_DSI |