public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Remove select to deleted STOP_MACHINE from Kconfig
@ 2016-01-25 11:14 Andreas Ziegler
  2016-01-25 11:26 ` Chris Wilson
  0 siblings, 1 reply; 4+ messages in thread
From: Andreas Ziegler @ 2016-01-25 11:14 UTC (permalink / raw)
  To: chris
  Cc: Daniel Vetter, Jani Nikula, intel-gfx, David Airlie, linux-kernel,
	dri-devel, Andreas Ziegler

Commit 86fffe4a61dd ("kernel: remove stop_machine() Kconfig
dependency") removed the option STOP_MACHINE from init/Kconfig, but
missed a select to this option from the DRM_I915 option.

Remove this now obsolete select statement.

Signed-off-by: Andreas Ziegler <andreas.ziegler@fau.de>
---
 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 fcd77b2..051eab3 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
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] drm/i915: Remove select to deleted STOP_MACHINE from Kconfig
  2016-01-25 11:14 [PATCH] drm/i915: Remove select to deleted STOP_MACHINE from Kconfig Andreas Ziegler
@ 2016-01-25 11:26 ` Chris Wilson
  2016-01-25 11:41   ` [PATCH v2] " Andreas Ziegler
  0 siblings, 1 reply; 4+ messages in thread
From: Chris Wilson @ 2016-01-25 11:26 UTC (permalink / raw)
  To: Andreas Ziegler
  Cc: Daniel Vetter, Jani Nikula, intel-gfx, David Airlie, linux-kernel,
	dri-devel

On Mon, Jan 25, 2016 at 12:14:41PM +0100, Andreas Ziegler wrote:
> Commit 86fffe4a61dd ("kernel: remove stop_machine() Kconfig
> dependency") removed the option STOP_MACHINE from init/Kconfig, but
> missed a select to this option from the DRM_I915 option.

The select didn't exist on the branch on which the patch was applied, so
it couldn't remove it.

Commit 5bab6f60cb4 ("drm/i915: Serialise updates to GGTT with access
through GGTT on Braswel") depended upon a working stop_machine() and so
forced its selection. However, commit 86fffe4a61dd ("kernel: remove
stop_machine() Kconfig dependency") removed the option STOP_MACHINE from
init/Kconfig and ensured that stop_machine() universally works.
 
Remove this now obsolete select statement.
 
> Signed-off-by: Andreas Ziegler <andreas.ziegler@fau.de>

With a little bit of story correction,
Revieweed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH v2] drm/i915: Remove select to deleted STOP_MACHINE from Kconfig
  2016-01-25 11:26 ` Chris Wilson
@ 2016-01-25 11:41   ` Andreas Ziegler
  2016-01-25 15:38     ` Daniel Vetter
  0 siblings, 1 reply; 4+ messages in thread
From: Andreas Ziegler @ 2016-01-25 11:41 UTC (permalink / raw)
  To: chris
  Cc: Daniel Vetter, Jani Nikula, intel-gfx, David Airlie, linux-kernel,
	dri-devel, Andreas Ziegler

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>
---
Changes to v1:
    - Tell the story right, suggested by Chris Wilson

 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 fcd77b2..051eab3 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
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] drm/i915: Remove select to deleted STOP_MACHINE from Kconfig
  2016-01-25 11:41   ` [PATCH v2] " Andreas Ziegler
@ 2016-01-25 15:38     ` Daniel Vetter
  0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2016-01-25 15:38 UTC (permalink / raw)
  To: Andreas Ziegler; +Cc: chris, intel-gfx, linux-kernel, dri-devel, Daniel Vetter

On Mon, Jan 25, 2016 at 12:41:19PM +0100, Andreas Ziegler wrote:
> 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>

Applied, thanks.
-Daniel

> ---
> Changes to v1:
>     - Tell the story right, suggested by Chris Wilson
> 
>  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 fcd77b2..051eab3 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
> -- 
> 1.9.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-01-25 15:38 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-25 11:14 [PATCH] drm/i915: Remove select to deleted STOP_MACHINE from Kconfig Andreas Ziegler
2016-01-25 11:26 ` Chris Wilson
2016-01-25 11:41   ` [PATCH v2] " Andreas Ziegler
2016-01-25 15:38     ` Daniel Vetter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox