drm/i915: enable semaphores on per-device defaults
Subsystems (2)
PATCH 1/2 drm/i915: enable semaphores on per-device defaults
We should enable semaphores on IVB by default, and on SNB in cases where dma remapping is disabled or iommu is not enabled.
v2: adapt patch according to the feedback, and put it in line with Keith's rc6 enabling patch.
v3: move the generation check into intel_enable_semaphores function, and fix variable type for i915_semaphores.
CC: Daniel Vetter <[email protected]>
CC: Ben Widawsky <[email protected]>
CC: Keith Packard <[email protected]>
CC: Jesse Barnes <[email protected]>
CC: Chris Wilson <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42696
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40564
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41353
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38862
--- drivers/gpu/drm/i915/i915_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 29 +++++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -2
@@ -58,10 +58,10 @@ module_param_named(powersave, i915_powersave, int, 0600);MODULE_PARM_DESC (powersave,"Enable powersavings, fbc, downclocking, etc. (default: true)" ); -unsigned int i915_semaphores__read_mostly =0 ; +int i915_semaphores__read_mostly =-1 ;module_param_named (semaphores, i915_semaphores, int,0600 );MODULE_PARM_DESC (semaphores, -"Use semaphores for inter-ring sync (default: false)" ); +"Use semaphores for inter-ring sync (default: -1 (use per-chip defaults))" );unsigned int i915_enable_rc6__read_mostly =0 ;module_param_named (i915_enable_rc6, i915_enable_rc6, int,0600 );
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -997,7 +997,7 @@ extern int i915_max_ioctl;extern unsigned int i915_fbpercrtc__always_unused ;extern int i915_panel_ignore_lid__read_mostly ;extern unsigned int i915_powersave__read_mostly ; -extern unsigned int i915_semaphores__read_mostly ; +extern int i915_semaphores__read_mostly ;extern unsigned int i915_lvds_downclock__read_mostly ;extern unsigned int i915_panel_use_ssc__read_mostly ;extern int i915_vbt_sdvo_panel_type__read_mostly ;
drivers/gpu/drm/i915/i915_gem_execbuffer.c +28 -1
@@ -33,6 +33,11 @@#include "i915_trace.h" #include "intel_drv.h" +#ifdef CONFIG_INTEL_IOMMU +#include <linux/dma_remapping.h> +#include <linux/dmar.h> +#endif +struct change_domains {uint32_t invalidate_domains;uint32_t flush_domains;
@@ -746,6 +751,28 @@ i915_gem_execbuffer_flush(struct drm_device *dev,return 0 ; } +static bool +intel_enable_semaphores (struct drm_device *dev) +{ +if (INTEL_INFO (dev)->gen <6 ) +return 0 ; + +if (i915_semaphores >=0 ) +return i915_semaphores; + +if (INTEL_INFO (dev)->gen >=7 ) +return 1 ; +#ifdef CONFIG_INTEL_IOMMU +/* On gen6, we only enable semaphores if dma remapping is disabled, +* or if there is no iommu. +*/ +if (INTEL_INFO (dev)->gen ==6 ) +return no_iommu || dmar_disabled; +#endif + +return 1 ; +} +static int i915_gem_execbuffer_sync_rings (struct drm_i915_gem_object *obj,struct intel_ring_buffer *to)
@@ -758,7 +785,7 @@ i915_gem_execbuffer_sync_rings(struct drm_i915_gem_object *obj,return 0 ;/* XXX gpu semaphores are implicated in various hard hangs on SNB */ -if (INTEL_INFO (obj->base.dev)->gen <6 || !i915_semaphores) +if (!intel_enable_semaphores (obj->base.dev))return i915_gem_object_wait_rendering (obj); idx =intel_ring_sync_index (from, to);
Signature · 1 line
1.7.7.4
PATCH 2/2 drm/i915: allow per-device fbc to work with default settings
The change which added support for default settings for fbc has not changed the variable type of i915_enable_fbc from unsigned int to int. So we were unable to get into the default ('-1') state with the default settings.
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -68,7 +68,7 @@ module_param_named(i915_enable_rc6, i915_enable_rc6, int, 0600);MODULE_PARM_DESC (i915_enable_rc6,"Enable power-saving render C-state 6 (default: true)" ); -unsigned int i915_enable_fbc__read_mostly =-1 ; +int i915_enable_fbc__read_mostly =-1 ;module_param_named (i915_enable_fbc, i915_enable_fbc, int,0600 );MODULE_PARM_DESC (i915_enable_fbc, "Enable frame buffer compression for power savings "
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1002,7 +1002,7 @@ extern unsigned int i915_lvds_downclock __read_mostly;extern unsigned int i915_panel_use_ssc__read_mostly ;extern int i915_vbt_sdvo_panel_type__read_mostly ;extern unsigned int i915_enable_rc6__read_mostly ; -extern unsigned int i915_enable_fbc__read_mostly ; +extern int i915_enable_fbc__read_mostly ;extern bool i915_enable_hangcheck__read_mostly ;extern int i915_suspend (struct drm_device *dev,pm_message_t state);
Signature · 1 line
1.7.7.4
Re: [PATCH 2/2] drm/i915: allow per-device fbc to work with default settings
Quoted 6 lines · Eugeni Dodonov
The change which added support for default settings for fbc has not changed the variable type of
i915_enable_fbcfrom unsigned int to int. So we were unable to get into the default ('-1') state with the default settings.Signed-off-by Eugeni Dodonov <[email protected]>
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 31 lines · Eugeni Dodonov
We should enable semaphores on IVB by default, and on SNB in cases where dma remapping is disabled or iommu is not enabled.
v2: adapt patch according to the feedback, and put it in line with Keith's rc6 enabling patch.
v3: move the generation check into
intel_enable_semaphoresfunction, and fix variable type fori915_semaphores.CC: Daniel Vetter <[email protected]>
CC: Ben Widawsky <[email protected]>
CC: Keith Packard <[email protected]>
CC: Jesse Barnes <[email protected]>
CC: Chris Wilson <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42696
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40564
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41353
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38862Signed-off-by Eugeni Dodonov <[email protected]>drivers/gpu/drm/i915/i915_gem_execbuffer.c +11
-0+static bool +intel_enable_semaphores (struct drm_device *dev) +{ +if (INTEL_INFO (dev)->gen <6 ) +return 0 ; + +if (i915_semaphores >=0 ) +return i915_semaphores; + +if (INTEL_INFO (dev)->gen >=7 ) +return 1 ;
drivers/gpu/drm/i915/i915_gem_execbuffer.c i915_gem_execbuffer_flush(struct drm_device *dev, · line 774
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_execbuffer.c +10
-0+#ifdef CONFIG_INTEL_IOMMU +/* On gen6, we only enable semaphores if dma remapping is disabled, +* or if there is no iommu. +*/ +if (INTEL_INFO (dev)->gen ==6 ) +return no_iommu || dmar_disabled; +#endif + +return 1 ; +}
Now this function can be written more compactly by just removing the gen >= 7 check. Otherwise,
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre