diff options
author | Eric Anholt <[email protected]> | 2012-03-21 14:35:14 -0700 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2012-04-11 18:12:12 -0700 |
commit | 249fc7056104113633215106ac085b505d8dc161 (patch) | |
tree | d1953b49bff267e79e1e58b223cc77ff4f35960a /src/mesa | |
parent | e3df28337b6b45f5b3444a9d6d4e1f6988d2de1b (diff) |
i965: When the kernel lacks the LLC check, assume it's present on gen >= 6.
The param wasn't added until drm-intel-next for 3.4, so we were
missing our various LLC fast-paths.
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_screen.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index 6344d98a319..e823792ff93 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -770,9 +770,13 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp) intelScreen->hw_must_use_separate_stencil = intelScreen->gen >= 7; intelScreen->dri2_has_hiz = INTEL_DRI2_HAS_HIZ_UNKNOWN; - intelScreen->hw_has_llc = - intel_get_boolean(intelScreen->driScrnPriv, - I915_PARAM_HAS_LLC); + int has_llc = 0; + bool success = intel_get_param(intelScreen->driScrnPriv, I915_PARAM_HAS_LLC, + &has_llc); + if (success && has_llc) + intelScreen->hw_has_llc = true; + else if (!success && intelScreen->gen >= 6) + intelScreen->hw_has_llc = true; intel_override_separate_stencil(intelScreen); |