diff options
author | Maxime Ripard <maxime@cerno.tech> | 2020-03-04 08:56:28 +0100 |
---|---|---|
committer | Maxime Ripard <maxime@cerno.tech> | 2020-03-04 08:56:28 +0100 |
commit | 83794ee6c13b41c7db86ccfcaa20dc360b08fdb6 (patch) | |
tree | c80162f31fdea3ddded188870e61d5dc71cbf892 /drivers/gpu/drm/i915/gt/selftest_reset.c | |
parent | drm/hdcp: fix DRM_HDCP_2_KSV_COUNT_2_LSBITS (diff) | |
parent | Merge tag 'drm-misc-next-2020-02-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
download | linux-dev-83794ee6c13b41c7db86ccfcaa20dc360b08fdb6.tar.xz linux-dev-83794ee6c13b41c7db86ccfcaa20dc360b08fdb6.zip |
Merge drm/drm-next into drm-misc-next
Daniel needs a few commits from drm-next.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/gpu/drm/i915/gt/selftest_reset.c')
-rw-r--r-- | drivers/gpu/drm/i915/gt/selftest_reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gt/selftest_reset.c b/drivers/gpu/drm/i915/gt/selftest_reset.c index 6ad6aca315f6..35406ecdf0b2 100644 --- a/drivers/gpu/drm/i915/gt/selftest_reset.c +++ b/drivers/gpu/drm/i915/gt/selftest_reset.c @@ -115,7 +115,7 @@ static int igt_atomic_engine_reset(void *arg) if (!intel_has_reset_engine(gt)) return 0; - if (USES_GUC_SUBMISSION(gt->i915)) + if (intel_uc_uses_guc_submission(>->uc)) return 0; intel_gt_pm_get(gt); |