Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2d44cca authored by Eric Anholt's avatar Eric Anholt Committed by Dave Airlie
Browse files

i915: Don't dereference HWS in /proc debug files when it isn't initialized. 



Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Acked-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 053d7f24

drivers/gpu/drm/i915/i915_gem_proc.c

+12 −3
Original line number Diff line number Diff line
@@ -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));

	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",