* [PATCH 1/3] drm/i915: Deprecate UMS harder
@ 2014-03-31 14:23 Daniel Vetter
2014-03-31 14:23 ` [PATCH 2/3] drm/i915: dmesg output for VT-d testing Daniel Vetter
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Daniel Vetter @ 2014-03-31 14:23 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Progess according to the deprecation plan laid out in
commit b30324adaf8d2e5950a602bde63030d15a61826f
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed Nov 13 22:11:25 2013 +0100
drm/i915: Deprecated UMS support
and disable UMS for 3.16.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 73ed59eff139..7213c38a4d91 100644
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -72,7 +72,7 @@ config DRM_I915_PRELIMINARY_HW_SUPPORT
config DRM_I915_UMS
bool "Enable userspace modesetting on Intel hardware (DEPRECATED)"
- depends on DRM_I915
+ depends on DRM_I915 && BROKEN
default n
help
Choose this option if you still need userspace modesetting.
--
1.8.5.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] drm/i915: dmesg output for VT-d testing
2014-03-31 14:23 [PATCH 1/3] drm/i915: Deprecate UMS harder Daniel Vetter
@ 2014-03-31 14:23 ` Daniel Vetter
2014-03-31 14:23 ` [PATCH 3/3] drm/i915: Add debug module option for VTd validation Daniel Vetter
2014-03-31 15:44 ` [PATCH 1/3] drm/i915: Deprecate UMS harder Chris Wilson
2 siblings, 0 replies; 10+ messages in thread
From: Daniel Vetter @ 2014-03-31 14:23 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Our validation guys want to have a positive proof that the gfx driver
is indeed using VT-d, since setting up a gfx stack, especially in
early bring-up and by people not versed in linux gfx is a bit tricky.
So provide just that.
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index b31cde1d5979..cb6401fe9637 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -1961,6 +1961,10 @@ int i915_gem_gtt_init(struct drm_device *dev)
gtt->base.total >> 20);
DRM_DEBUG_DRIVER("GMADR size = %ldM\n", gtt->mappable_end >> 20);
DRM_DEBUG_DRIVER("GTT stolen size = %zdM\n", gtt->stolen_size >> 20);
+#ifdef CONFIG_INTEL_IOMMU
+ if (intel_iommu_gfx_mapped)
+ DRM_INFO("VT-d active for gfx access\n");
+#endif
return 0;
}
--
1.8.5.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/3] drm/i915: Add debug module option for VTd validation
2014-03-31 14:23 [PATCH 1/3] drm/i915: Deprecate UMS harder Daniel Vetter
2014-03-31 14:23 ` [PATCH 2/3] drm/i915: dmesg output for VT-d testing Daniel Vetter
@ 2014-03-31 14:23 ` Daniel Vetter
2014-04-01 6:52 ` Jani Nikula
2014-03-31 15:44 ` [PATCH 1/3] drm/i915: Deprecate UMS harder Chris Wilson
2 siblings, 1 reply; 10+ messages in thread
From: Daniel Vetter @ 2014-03-31 14:23 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
VTd has a few too many "outright disable the damn thing" workarounds
accumulated and for validation we want a simple knob to make sure we
disable them all.
Since this is for bdw+ validation and atm we don't have any
workarounds for bdw this option currently does nothing. So currently
this is just a placeholder to make sure reality will match with the
documented process for our validation people.
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/i915_params.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ff02225d5edd..610ff70f8609 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1925,6 +1925,7 @@ struct i915_params {
bool prefault_disable;
bool reset;
bool disable_display;
+ bool disable_vtd_wa;
};
extern struct i915_params i915 __read_mostly;
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index e1027cc5f0ee..60bfcfa2f339 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -47,6 +47,7 @@ struct i915_params i915 __read_mostly = {
.invert_brightness = 0,
.disable_display = 0,
.enable_cmd_parser = 1,
+ .disable_vtd_wa = 0,
};
module_param_named(modeset, i915.modeset, int, 0400);
@@ -149,6 +150,9 @@ MODULE_PARM_DESC(invert_brightness,
module_param_named(disable_display, i915.disable_display, bool, 0600);
MODULE_PARM_DESC(disable_display, "Disable display (default: false)");
+module_param_named(disable_vtd_wa, i915.disable_vtd_wa, bool, 0600);
+MODULE_PARM_DESC(disable_display, "Disable all VT-d workarounds (default: false)");
+
module_param_named(enable_cmd_parser, i915.enable_cmd_parser, int, 0600);
MODULE_PARM_DESC(enable_cmd_parser,
"Enable command parsing (1=enabled [default], 0=disabled)");
--
1.8.5.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] drm/i915: Deprecate UMS harder
2014-03-31 14:23 [PATCH 1/3] drm/i915: Deprecate UMS harder Daniel Vetter
2014-03-31 14:23 ` [PATCH 2/3] drm/i915: dmesg output for VT-d testing Daniel Vetter
2014-03-31 14:23 ` [PATCH 3/3] drm/i915: Add debug module option for VTd validation Daniel Vetter
@ 2014-03-31 15:44 ` Chris Wilson
2014-03-31 17:19 ` Daniel Vetter
2 siblings, 1 reply; 10+ messages in thread
From: Chris Wilson @ 2014-03-31 15:44 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Intel Graphics Development
On Mon, Mar 31, 2014 at 04:23:03PM +0200, Daniel Vetter wrote:
> Progess according to the deprecation plan laid out in
>
> commit b30324adaf8d2e5950a602bde63030d15a61826f
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date: Wed Nov 13 22:11:25 2013 +0100
>
> drm/i915: Deprecated UMS support
>
> and disable UMS for 3.16.
Please reiterate that it has been 5 years since the last userspace to
support UMS was released.
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
I agree that we should mark UMS as BROKEN, it no longer receives testing
and untested code is broken. I feel a it saddened as for those people
who still insist that UMS is better (usually because the BIOS breaks
something) should be left untouched.
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] drm/i915: Deprecate UMS harder
2014-03-31 15:44 ` [PATCH 1/3] drm/i915: Deprecate UMS harder Chris Wilson
@ 2014-03-31 17:19 ` Daniel Vetter
0 siblings, 0 replies; 10+ messages in thread
From: Daniel Vetter @ 2014-03-31 17:19 UTC (permalink / raw)
To: Chris Wilson, Daniel Vetter, Intel Graphics Development
On Mon, Mar 31, 2014 at 04:44:47PM +0100, Chris Wilson wrote:
> On Mon, Mar 31, 2014 at 04:23:03PM +0200, Daniel Vetter wrote:
> > Progess according to the deprecation plan laid out in
> >
> > commit b30324adaf8d2e5950a602bde63030d15a61826f
> > Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Date: Wed Nov 13 22:11:25 2013 +0100
> >
> > drm/i915: Deprecated UMS support
> >
> > and disable UMS for 3.16.
>
> Please reiterate that it has been 5 years since the last userspace to
> support UMS was released.
Done
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> I agree that we should mark UMS as BROKEN, it no longer receives testing
> and untested code is broken. I feel a it saddened as for those people
> who still insist that UMS is better (usually because the BIOS breaks
> something) should be left untouched.
>
> Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
and merged the patch. I guess we'll figure out soon whether we need to
back off on this since 3.14 (which is the first release with the
deprecated UMS) is now out the door ...
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] drm/i915: Add debug module option for VTd validation
2014-03-31 14:23 ` [PATCH 3/3] drm/i915: Add debug module option for VTd validation Daniel Vetter
@ 2014-04-01 6:52 ` Jani Nikula
2014-04-01 7:33 ` [PATCH] " Daniel Vetter
2014-04-01 7:33 ` Daniel Vetter
0 siblings, 2 replies; 10+ messages in thread
From: Jani Nikula @ 2014-04-01 6:52 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
On Mon, 31 Mar 2014, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> VTd has a few too many "outright disable the damn thing" workarounds
> accumulated and for validation we want a simple knob to make sure we
> disable them all.
>
> Since this is for bdw+ validation and atm we don't have any
> workarounds for bdw this option currently does nothing. So currently
> this is just a placeholder to make sure reality will match with the
> documented process for our validation people.
>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 1 +
> drivers/gpu/drm/i915/i915_params.c | 4 ++++
> 2 files changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index ff02225d5edd..610ff70f8609 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1925,6 +1925,7 @@ struct i915_params {
> bool prefault_disable;
> bool reset;
> bool disable_display;
> + bool disable_vtd_wa;
> };
> extern struct i915_params i915 __read_mostly;
>
> diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
> index e1027cc5f0ee..60bfcfa2f339 100644
> --- a/drivers/gpu/drm/i915/i915_params.c
> +++ b/drivers/gpu/drm/i915/i915_params.c
> @@ -47,6 +47,7 @@ struct i915_params i915 __read_mostly = {
> .invert_brightness = 0,
> .disable_display = 0,
> .enable_cmd_parser = 1,
> + .disable_vtd_wa = 0,
> };
>
> module_param_named(modeset, i915.modeset, int, 0400);
> @@ -149,6 +150,9 @@ MODULE_PARM_DESC(invert_brightness,
> module_param_named(disable_display, i915.disable_display, bool, 0600);
> MODULE_PARM_DESC(disable_display, "Disable display (default: false)");
>
> +module_param_named(disable_vtd_wa, i915.disable_vtd_wa, bool, 0600);
> +MODULE_PARM_DESC(disable_display, "Disable all VT-d workarounds (default: false)");
disable_display?!
Jani.
> +
> module_param_named(enable_cmd_parser, i915.enable_cmd_parser, int, 0600);
> MODULE_PARM_DESC(enable_cmd_parser,
> "Enable command parsing (1=enabled [default], 0=disabled)");
> --
> 1.8.5.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] drm/i915: Add debug module option for VTd validation
2014-04-01 6:52 ` Jani Nikula
@ 2014-04-01 7:33 ` Daniel Vetter
2014-04-01 7:33 ` Daniel Vetter
1 sibling, 0 replies; 10+ messages in thread
From: Daniel Vetter @ 2014-04-01 7:33 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
VTd has a few too many "outright disable the damn thing" workarounds
accumulated and for validation we want a simple knob to make sure we
disable them all.
Since this is for bdw+ validation and atm we don't have any
workarounds for bdw this option currently does nothing. So currently
this is just a placeholder to make sure reality will match with the
documented process for our validation people.
v2: Fix up param description (Jani).
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/i915_params.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ff02225d5edd..610ff70f8609 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1925,6 +1925,7 @@ struct i915_params {
bool prefault_disable;
bool reset;
bool disable_display;
+ bool disable_vtd_wa;
};
extern struct i915_params i915 __read_mostly;
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index e1027cc5f0ee..60bfcfa2f339 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -47,6 +47,7 @@ struct i915_params i915 __read_mostly = {
.invert_brightness = 0,
.disable_display = 0,
.enable_cmd_parser = 1,
+ .disable_vtd_wa = 0,
};
module_param_named(modeset, i915.modeset, int, 0400);
@@ -149,6 +150,9 @@ MODULE_PARM_DESC(invert_brightness,
module_param_named(disable_display, i915.disable_display, bool, 0600);
MODULE_PARM_DESC(disable_display, "Disable display (default: false)");
+module_param_named(disable_vtd_wa, i915.disable_vtd_wa, bool, 0600);
+MODULE_PARM_DESC(disable_display, "Disable all VT-d workarounds (default: false)");
+
module_param_named(enable_cmd_parser, i915.enable_cmd_parser, int, 0600);
MODULE_PARM_DESC(enable_cmd_parser,
"Enable command parsing (1=enabled [default], 0=disabled)");
--
1.8.5.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH] drm/i915: Add debug module option for VTd validation
2014-04-01 6:52 ` Jani Nikula
2014-04-01 7:33 ` [PATCH] " Daniel Vetter
@ 2014-04-01 7:33 ` Daniel Vetter
2014-04-01 8:14 ` Jani Nikula
1 sibling, 1 reply; 10+ messages in thread
From: Daniel Vetter @ 2014-04-01 7:33 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
VTd has a few too many "outright disable the damn thing" workarounds
accumulated and for validation we want a simple knob to make sure we
disable them all.
Since this is for bdw+ validation and atm we don't have any
workarounds for bdw this option currently does nothing. So currently
this is just a placeholder to make sure reality will match with the
documented process for our validation people.
v2: Fix up param description (Jani).
v3: Actually git add ...
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/i915_params.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ff02225d5edd..610ff70f8609 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1925,6 +1925,7 @@ struct i915_params {
bool prefault_disable;
bool reset;
bool disable_display;
+ bool disable_vtd_wa;
};
extern struct i915_params i915 __read_mostly;
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index e1027cc5f0ee..d05a2afa17dc 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -47,6 +47,7 @@ struct i915_params i915 __read_mostly = {
.invert_brightness = 0,
.disable_display = 0,
.enable_cmd_parser = 1,
+ .disable_vtd_wa = 0,
};
module_param_named(modeset, i915.modeset, int, 0400);
@@ -149,6 +150,9 @@ MODULE_PARM_DESC(invert_brightness,
module_param_named(disable_display, i915.disable_display, bool, 0600);
MODULE_PARM_DESC(disable_display, "Disable display (default: false)");
+module_param_named(disable_vtd_wa, i915.disable_vtd_wa, bool, 0600);
+MODULE_PARM_DESC(disable_vtd_wa, "Disable all VT-d workarounds (default: false)");
+
module_param_named(enable_cmd_parser, i915.enable_cmd_parser, int, 0600);
MODULE_PARM_DESC(enable_cmd_parser,
"Enable command parsing (1=enabled [default], 0=disabled)");
--
1.8.5.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] drm/i915: Add debug module option for VTd validation
2014-04-01 7:33 ` Daniel Vetter
@ 2014-04-01 8:14 ` Jani Nikula
2014-04-03 9:25 ` Daniel Vetter
0 siblings, 1 reply; 10+ messages in thread
From: Jani Nikula @ 2014-04-01 8:14 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
On Tue, 01 Apr 2014, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> VTd has a few too many "outright disable the damn thing" workarounds
> accumulated and for validation we want a simple knob to make sure we
> disable them all.
>
> Since this is for bdw+ validation and atm we don't have any
> workarounds for bdw this option currently does nothing. So currently
> this is just a placeholder to make sure reality will match with the
> documented process for our validation people.
>
> v2: Fix up param description (Jani).
>
> v3: Actually git add ...
*rolls eyes* ;)
I'm really sorry I just spotted that one param desc and failed to do any
proper review. So here's some bikeshedding.
>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 1 +
> drivers/gpu/drm/i915/i915_params.c | 4 ++++
> 2 files changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index ff02225d5edd..610ff70f8609 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1925,6 +1925,7 @@ struct i915_params {
> bool prefault_disable;
> bool reset;
> bool disable_display;
> + bool disable_vtd_wa;
> };
> extern struct i915_params i915 __read_mostly;
>
> diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
> index e1027cc5f0ee..d05a2afa17dc 100644
> --- a/drivers/gpu/drm/i915/i915_params.c
> +++ b/drivers/gpu/drm/i915/i915_params.c
> @@ -47,6 +47,7 @@ struct i915_params i915 __read_mostly = {
> .invert_brightness = 0,
> .disable_display = 0,
> .enable_cmd_parser = 1,
> + .disable_vtd_wa = 0,
Gringe at initializing bools with ints.
> };
>
> module_param_named(modeset, i915.modeset, int, 0400);
> @@ -149,6 +150,9 @@ MODULE_PARM_DESC(invert_brightness,
> module_param_named(disable_display, i915.disable_display, bool, 0600);
> MODULE_PARM_DESC(disable_display, "Disable display (default: false)");
>
> +module_param_named(disable_vtd_wa, i915.disable_vtd_wa, bool, 0600);
> +MODULE_PARM_DESC(disable_vtd_wa, "Disable all VT-d workarounds (default: false)");
> +
Why negative? Why not enable_vtd_wa defaulting to true? The disable will
lead to code like:
if (!i915.disable_vtd_wa)
instead of
if (i915.enable_vtd_wa)
Regardless of the bikeshedding, it's
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> module_param_named(enable_cmd_parser, i915.enable_cmd_parser, int, 0600);
> MODULE_PARM_DESC(enable_cmd_parser,
> "Enable command parsing (1=enabled [default], 0=disabled)");
> --
> 1.8.5.2
>
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] drm/i915: Add debug module option for VTd validation
2014-04-01 8:14 ` Jani Nikula
@ 2014-04-03 9:25 ` Daniel Vetter
0 siblings, 0 replies; 10+ messages in thread
From: Daniel Vetter @ 2014-04-03 9:25 UTC (permalink / raw)
To: Jani Nikula; +Cc: Daniel Vetter, Intel Graphics Development
On Tue, Apr 01, 2014 at 11:14:08AM +0300, Jani Nikula wrote:
> On Tue, 01 Apr 2014, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> > VTd has a few too many "outright disable the damn thing" workarounds
> > accumulated and for validation we want a simple knob to make sure we
> > disable them all.
> >
> > Since this is for bdw+ validation and atm we don't have any
> > workarounds for bdw this option currently does nothing. So currently
> > this is just a placeholder to make sure reality will match with the
> > documented process for our validation people.
> >
> > v2: Fix up param description (Jani).
> >
> > v3: Actually git add ...
>
> *rolls eyes* ;)
>
> I'm really sorry I just spotted that one param desc and failed to do any
> proper review. So here's some bikeshedding.
>
> >
> > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> > Cc: David Woodhouse <dwmw2@infradead.org>
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > ---
> > drivers/gpu/drm/i915/i915_drv.h | 1 +
> > drivers/gpu/drm/i915/i915_params.c | 4 ++++
> > 2 files changed, 5 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index ff02225d5edd..610ff70f8609 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -1925,6 +1925,7 @@ struct i915_params {
> > bool prefault_disable;
> > bool reset;
> > bool disable_display;
> > + bool disable_vtd_wa;
> > };
> > extern struct i915_params i915 __read_mostly;
> >
> > diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
> > index e1027cc5f0ee..d05a2afa17dc 100644
> > --- a/drivers/gpu/drm/i915/i915_params.c
> > +++ b/drivers/gpu/drm/i915/i915_params.c
> > @@ -47,6 +47,7 @@ struct i915_params i915 __read_mostly = {
> > .invert_brightness = 0,
> > .disable_display = 0,
> > .enable_cmd_parser = 1,
> > + .disable_vtd_wa = 0,
>
> Gringe at initializing bools with ints.
Yeah, I think I'll do a quick follow-up patch.
>
> > };
> >
> > module_param_named(modeset, i915.modeset, int, 0400);
> > @@ -149,6 +150,9 @@ MODULE_PARM_DESC(invert_brightness,
> > module_param_named(disable_display, i915.disable_display, bool, 0600);
> > MODULE_PARM_DESC(disable_display, "Disable display (default: false)");
> >
> > +module_param_named(disable_vtd_wa, i915.disable_vtd_wa, bool, 0600);
> > +MODULE_PARM_DESC(disable_vtd_wa, "Disable all VT-d workarounds (default: false)");
> > +
>
> Why negative? Why not enable_vtd_wa defaulting to true? The disable will
> lead to code like:
>
> if (!i915.disable_vtd_wa)
>
> instead of
>
> if (i915.enable_vtd_wa)
I've kinda optimized the naming for the validation users, not us ;-) And
"disable" tends to turn away experimenting users, I hope.
> Regardless of the bikeshedding, it's
>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Ok, I've picked these vtd patches up.
-Daniel
>
>
> > module_param_named(enable_cmd_parser, i915.enable_cmd_parser, int, 0600);
> > MODULE_PARM_DESC(enable_cmd_parser,
> > "Enable command parsing (1=enabled [default], 0=disabled)");
> > --
> > 1.8.5.2
> >
>
> --
> Jani Nikula, Intel Open Source Technology Center
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-04-03 9:25 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-31 14:23 [PATCH 1/3] drm/i915: Deprecate UMS harder Daniel Vetter
2014-03-31 14:23 ` [PATCH 2/3] drm/i915: dmesg output for VT-d testing Daniel Vetter
2014-03-31 14:23 ` [PATCH 3/3] drm/i915: Add debug module option for VTd validation Daniel Vetter
2014-04-01 6:52 ` Jani Nikula
2014-04-01 7:33 ` [PATCH] " Daniel Vetter
2014-04-01 7:33 ` Daniel Vetter
2014-04-01 8:14 ` Jani Nikula
2014-04-03 9:25 ` Daniel Vetter
2014-03-31 15:44 ` [PATCH 1/3] drm/i915: Deprecate UMS harder Chris Wilson
2014-03-31 17:19 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.