[Bug 83677] [HSW] GPU hang on ctx load

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=83677

--- Comment #6 from Simon Farnsworth <simon at farnz.org.uk> ---
I built and tested:

: sfarnsworth host64  $ git show
commit 3a5e1e6176fb61735a98f16a80c756b3cc69f125
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Aug 24 19:34:16 2014 +0100

    drm/i915: Convert a couple more INTEL_INFO-esque macros to be pointer
agnostic

    Just a couple more macros that assume that they were being passed a
    struct drm_device when they want a struct drm_i915_private. Use our
    magic macro to ease transitioning over to using drm_i915_privates

    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 5cadfa5..d1678e2 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2046,7 +2046,7 @@ struct drm_i915_cmd_table {
 #define HAS_VEBOX(dev)         (INTEL_INFO(dev)->ring_mask & VEBOX_RING)
 #define HAS_LLC(dev)           (INTEL_INFO(dev)->has_llc)
 #define HAS_WT(dev)            ((IS_HASWELL(dev) || IS_BROADWELL(dev)) && \
-                                to_i915(dev)->ellc_size)
+                                __I915__(dev)->ellc_size)
 #define I915_NEED_GFX_HWS(dev) (INTEL_INFO(dev)->need_gfx_hws)

 #define HAS_HW_CONTEXTS(dev)   (INTEL_INFO(dev)->gen >= 5)
@@ -2100,7 +2100,7 @@ struct drm_i915_cmd_table {
 #define INTEL_PCH_LPT_DEVICE_ID_TYPE           0x8c00
 #define INTEL_PCH_LPT_LP_DEVICE_ID_TYPE                0x9c00

-#define INTEL_PCH_TYPE(dev) (to_i915(dev)->pch_type)
+#define INTEL_PCH_TYPE(dev) (__I915__(dev)->pch_type)
 #define HAS_PCH_LPT(dev) (INTEL_PCH_TYPE(dev) == PCH_LPT)
 #define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT)
 #define HAS_PCH_IBX(dev) (INTEL_PCH_TYPE(dev) == PCH_IBX)

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are on the CC list for the bug.
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20140917/f8cbfce9/attachment-0001.html>