diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-05-31 08:18:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-05-31 08:18:18 +1000 |
| commit | cfd36ae37c490b88058e0a220e16edd8bfd126c7 (patch) | |
| tree | 81075efb53cc85aa2e92b117d930136b965d5d18 /drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c | |
| parent | 3e049b6b8f32f25c6967f4cffd8eac6e1e5316f6 (diff) | |
| parent | 75800e2e4203ea83bbc9d4f63ad97ea582244a08 (diff) | |
Merge tag 'drm-intel-fixes-2024-05-30' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes
drm/i915 fixes for v6.10-rc2:
- Fix a race in audio component by registering it later
- Make DPT object unshrinkable to avoid shrinking when framebuffer has
not shrunk
- Fix CCS id calculation to fix a perf regression
- Fix selftest caching mode
- Fix FIELD_PREP compiler warnings
- Fix indefinite wait for GT wakeref release
- Revert overeager multi-gt pm reference removal
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87a5k7iwod.fsf@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c b/drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c index 99b71bb7da0a..3c62a44e9106 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c @@ -19,7 +19,7 @@ unsigned int intel_gt_apply_ccs_mode(struct intel_gt *gt) /* Build the value for the fixed CCS load balancing */ for (cslice = 0; cslice < I915_MAX_CCS; cslice++) { - if (CCS_MASK(gt) & BIT(cslice)) + if (gt->ccs.cslices & BIT(cslice)) /* * If available, assign the cslice * to the first available engine... |