OSDN Git Service

drm/i915: Add missing ring_mask to Pineview
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 28 Jul 2016 23:45:35 +0000 (00:45 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 29 Jul 2016 15:22:42 +0000 (16:22 +0100)
commit6ce213575cf37c50667850b4372272b4f1660b51
tree5bc7dc6afc7b247d9b944ad1321c84e0a79d396a
parent5b249600c1483976b0a7501ba25a8ba8b86672e1
drm/i915: Add missing ring_mask to Pineview

It appears that we never told Pineview it has a RENDER_RING. This was
all fine until we started using the ring_mask for determining all the
available rings to initialise for legacy ringbuffer submission in commit
88d2ba2e95c8 ("drm/i915: Unify engine init loop"). Though really it is a
latent bug since the ring_mask inception in commit 73ae478cdf6a
("drm/i915: Replace has_bsd/blt/vebox with a mask").

To prevent similar mishaps in future, add a WARN_ON() if we find
ourselves with a device without any rings.

Fixes: 73ae478cdf6a ("drm/i915: Replace has_bsd/blt/vebox with a mask")
Fixes: 88d2ba2e95c8 ("drm/i915: Unify engine init loop")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ben Widawsky <ben@bwidawsk.net>
Link: http://patchwork.freedesktop.org/patch/msgid/1469749535-2382-1-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: drm-intel-fixes@lists.freedesktop.org
drivers/gpu/drm/i915/i915_pci.c
drivers/gpu/drm/i915/intel_engine_cs.c