On Tue, Jul 07, 2015 at 03:26:06PM -0300, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx>
>
> The poor in_dbg_master() check was the only one without a reason
> string. Give it a reason string so it won't feel excluded.
>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 1 +
> drivers/gpu/drm/i915/intel_fbc.c | 6 +++++-
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 4ef1764..52d07fb 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -935,6 +935,7 @@ struct i915_fbc {
> FBC_MODULE_PARAM,
> FBC_CHIP_DEFAULT, /* disabled by default on this chip */
> FBC_ROTATION, /* rotation is not supported */
> + FBC_IN_DBG_MASTER, /* kernel debugger is active */
Oh dear this is dead code. kdbg uses the fbcon, which always uses
untiled, which means fbc will never be enabled. Also we have 0 users and 0
test coverage for kdbg on top of i915 (Jesse implemented it for fun years
back). Imo just remove all this code.
-Daniel
> } no_fbc_reason;
>
> bool (*fbc_enabled)(struct drm_i915_private *dev_priv);
> diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
> index 9ef5b6c..8d39893 100644
> --- a/drivers/gpu/drm/i915/intel_fbc.c
> +++ b/drivers/gpu/drm/i915/intel_fbc.c
> @@ -471,6 +471,8 @@ const char *intel_no_fbc_reason_str(enum no_fbc_reason reason)
> return "disabled per chip default";
> case FBC_ROTATION:
> return "rotation unsupported";
> + case FBC_IN_DBG_MASTER:
> + return "Kernel debugger is active";
> default:
> MISSING_CASE(reason);
> return "unknown reason";
> @@ -755,8 +757,10 @@ static void __intel_fbc_update(struct drm_i915_private *dev_priv)
> }
>
> /* If the kernel debugger is active, always disable compression */
> - if (in_dbg_master())
> + if (in_dbg_master()) {
> + set_no_fbc_reason(dev_priv, FBC_IN_DBG_MASTER);
> goto out_disable;
> + }
>
> if (intel_fbc_setup_cfb(dev_priv, obj->base.size,
> drm_format_plane_cpp(fb->pixel_format, 0))) {
> --
> 2.1.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
