aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_uncore.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2021-10-04 10:31:33 +1000
committerJani Nikula <jani.nikula@intel.com>2021-10-04 10:21:48 +0300
commit5def925dbb60bcdd8ce6f860d80abc749dd5e1ef (patch)
tree854863dac1ac1a34ce964fb0f603bf928f4955a3 /drivers/gpu/drm/i915/intel_uncore.c
parentdrm/i915: Stop force enabling pipe bottom color gammma/csc (diff)
downloadlinux-dev-5def925dbb60bcdd8ce6f860d80abc749dd5e1ef.tar.xz
linux-dev-5def925dbb60bcdd8ce6f860d80abc749dd5e1ef.zip
drm/i915: fix regression with uncore refactoring.
This was causing infinite recursion on snb/ivb. Fixes: 5716c8c6f4b6 ("drm/i915/uncore: split the fw get function into separate vfunc") Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20211004003133.2279446-1-airlied@gmail.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uncore.c')
-rw-r--r--drivers/gpu/drm/i915/intel_uncore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 2dac69d92c1b..f1b816ebcdf6 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -346,7 +346,7 @@ static void __gen6_gt_wait_for_thread_c0(struct intel_uncore *uncore)
static void fw_domains_get_with_thread_status(struct intel_uncore *uncore,
enum forcewake_domains fw_domains)
{
- fw_domains_get(uncore, fw_domains);
+ fw_domains_get_normal(uncore, fw_domains);
/* WaRsForcewakeWaitTC0:snb,ivb,hsw,bdw,vlv */
__gen6_gt_wait_for_thread_c0(uncore);