From 13d38b4b3a61d1e63b8ed508ad505dd17f2e2aab Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 17 Oct 2008 14:41:03 -0700 Subject: [PATCH] --- yaml --- r: 117239 b: refs/heads/master c: a2d44cca4fc9ae04ed2c9fc2ef16b6989eeae218 h: refs/heads/master i: 117237: 81ee39bc92377654ceeba27522711a8b754040d4 117235: 8a9538adf74fd46cc4eb3fa8e8a1cd8e20dfed56 117231: ff2a9ce265be5f85d5b79c4dc73098b581e89710 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem_proc.c | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d1a82a2196f6..bd6df27759e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 053d7f244a8739d96d316c77a97cd063804c8e35 +refs/heads/master: a2d44cca4fc9ae04ed2c9fc2ef16b6989eeae218 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_proc.c b/trunk/drivers/gpu/drm/i915/i915_gem_proc.c index 15d4160415b0..93de15b4c9a7 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem_proc.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem_proc.c @@ -192,7 +192,12 @@ static int i915_gem_seqno_info(char *buf, char **start, off_t offset, *start = &buf[offset]; *eof = 0; - DRM_PROC_PRINT("Current sequence: %d\n", i915_get_gem_seqno(dev)); + if (dev_priv->hw_status_page != NULL) { + DRM_PROC_PRINT("Current sequence: %d\n", + i915_get_gem_seqno(dev)); + } else { + DRM_PROC_PRINT("Current sequence: hws uninitialized\n"); + } DRM_PROC_PRINT("Waiter sequence: %d\n", dev_priv->mm.waiting_gem_seqno); DRM_PROC_PRINT("IRQ sequence: %d\n", dev_priv->mm.irq_gem_seqno); @@ -230,8 +235,12 @@ static int i915_interrupt_info(char *buf, char **start, off_t offset, I915_READ(PIPEBSTAT)); DRM_PROC_PRINT("Interrupts received: %d\n", atomic_read(&dev_priv->irq_received)); - DRM_PROC_PRINT("Current sequence: %d\n", - i915_get_gem_seqno(dev)); + if (dev_priv->hw_status_page != NULL) { + DRM_PROC_PRINT("Current sequence: %d\n", + i915_get_gem_seqno(dev)); + } else { + DRM_PROC_PRINT("Current sequence: hws uninitialized\n"); + } DRM_PROC_PRINT("Waiter sequence: %d\n", dev_priv->mm.waiting_gem_seqno); DRM_PROC_PRINT("IRQ sequence: %d\n",