[PATCH] drm/i915: STOP_MACHINE is no more, stop selecting it

[PATCH] drm/i915: STOP_MACHINE is no more, stop selecting it

[Chris Wilson]

With the merge of 4.9-rc1, we can say goodbye to having to forcibly
select STOP_MACHINE in order to have a working stop_machine(). The code
just works now and the CONFIG_STOP_MACHINE symbol removed.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index e1b32da8954e..c383684b538f 100644
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -4,7 +4,6 @@ config DRM_I915
 	depends on X86 && PCI
 	select INTEL_GTT
 	select INTERVAL_TREE
-	select STOP_MACHINE
 	# we need shmfs for the swappable backing store, and in particular
 	# the shmem_readpage() which depends upon tmpfs
 	select SHMEM
-- 
2.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: STOP_MACHINE is no more, stop selecting it

[Ville Syrjälä]

On Wed, Oct 19, 2016 at 07:06:35PM +0100, Chris Wilson wrote:
> With the merge of 4.9-rc1, we can say goodbye to having to forcibly
> select STOP_MACHINE in order to have a working stop_machine(). The code
> just works now and the CONFIG_STOP_MACHINE symbol removed.

Note the relevant commit too?
86fffe4a61dd ("kernel: remove stop_machine() Kconfig dependency")

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/Kconfig | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
> index e1b32da8954e..c383684b538f 100644
> --- a/drivers/gpu/drm/i915/Kconfig
> +++ b/drivers/gpu/drm/i915/Kconfig
> @@ -4,7 +4,6 @@ config DRM_I915
>  	depends on X86 && PCI
>  	select INTEL_GTT
>  	select INTERVAL_TREE
> -	select STOP_MACHINE
>  	# we need shmfs for the swappable backing store, and in particular
>  	# the shmem_readpage() which depends upon tmpfs
>  	select SHMEM
> -- 
> 2.9.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: STOP_MACHINE is no more, stop selecting it

[Chris Wilson]

On Wed, Oct 19, 2016 at 09:48:02PM +0300, Ville Syrjälä wrote:
> On Wed, Oct 19, 2016 at 07:06:35PM +0100, Chris Wilson wrote:
> > With the merge of 4.9-rc1, we can say goodbye to having to forcibly
> > select STOP_MACHINE in order to have a working stop_machine(). The code
> > just works now and the CONFIG_STOP_MACHINE symbol removed.
> 
> Note the relevant commit too?
> 86fffe4a61dd ("kernel: remove stop_machine() Kconfig dependency")

It's more mysterious than that:

commit 21fabbebff0e17c7698ed399cae23958c214cc82
Author: Andreas Ziegler <andreas.ziegler@fau.de>
Date:   Mon Jan 25 12:41:19 2016 +0100

    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>

is where we are meant to be. Oh, it's actually

commit 9f267eb8d2ea0a87f694da3f236067335e8cb7b9
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Wed Oct 12 10:05:19 2016 +0100

    drm/i915: Stop the machine whilst capturing the GPU crash dump

that reintroduced it because I had completely forgotten about it when
rebasing. Ok, the commitlog needs rewritting to reflect the actual mistake.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx