| Message ID | 1425000660-1487-5-git-send-email-damien.lespiau@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 5847
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -1 282/282 281/282
ILK -1 308/308 307/308
SNB 326/326 326/326
IVB 379/379 379/379
BYT 294/294 294/294
HSW -1 387/387 386/387
BDW -1 316/316 315/316
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*PNV igt_gem_userptr_blits_minor-sync-interruptible PASS(2) DMESG_WARN(1)PASS(1)
*ILK igt_gem_fenced_exec_thrash_no-spare-fences-busy PASS(2) DMESG_WARN(1)PASS(1)
*HSW igt_gem_storedw_batches_loop_normal PASS(4) DMESG_WARN(1)PASS(1)
*BDW igt_gem_gtt_hog PASS(15) DMESG_WARN(1)PASS(1)
Note: You need to pay more attention to line start with '*'
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 9ceae48..4d892a6 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1525,7 +1525,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused) seq_puts(m, "FBC enabled\n"); else { const char unknown_reason[] = "unknown reason"; - const char *reason = dev_priv->fbc.no_fbc_str; + const char *reason = dev_priv->fbc.no_fbc_reason; if (!reason) reason = unknown_reason; diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 7f44ce2..39d0a32 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -813,7 +813,7 @@ struct i915_fbc { struct drm_framebuffer *fb; } *fbc_work; - const char *no_fbc_str; + const char *no_fbc_reason; }; /** diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c index 0098cdd..0d5364d 100644 --- a/drivers/gpu/drm/i915/intel_fbc.c +++ b/drivers/gpu/drm/i915/intel_fbc.c @@ -464,13 +464,13 @@ void intel_fbc_disable(struct drm_device *dev) } static void set_no_fbc_reason(struct drm_i915_private *dev_priv, - const char *reason_str /* a static string */) + const char *reason /* a static string */) { - if (dev_priv->fbc.no_fbc_str == reason_str) + if (dev_priv->fbc.no_fbc_reason == reason) return; - dev_priv->fbc.no_fbc_str = reason_str; - DRM_DEBUG_KMS("Disabling FBC: %s\n", reason_str); + dev_priv->fbc.no_fbc_reason = reason; + DRM_DEBUG_KMS("Disabling FBC: %s\n", reason); } static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv) @@ -664,7 +664,7 @@ void intel_fbc_update(struct drm_device *dev) } intel_fbc_enable(crtc); - dev_priv->fbc.no_fbc_str = NULL; + dev_priv->fbc.no_fbc_reason = NULL; return; out_disable: @@ -686,7 +686,7 @@ void intel_fbc_init(struct drm_i915_private *dev_priv) { if (!HAS_FBC(dev_priv)) { dev_priv->fbc.enabled = false; - dev_priv->fbc.no_fbc_str = "unsupported"; + dev_priv->fbc.no_fbc_reason = "unsupported"; return; }
no_fbc_reason was a much better name, and now that we only store the reason as a string, we can reuse that name. Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_fbc.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-)