diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-17 13:08:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-17 13:08:03 -0700 |
| commit | 55ea9bd666887ed4159df38d1494c204246cf2bc (patch) | |
| tree | 1ca5247e3e1269a779e17df547c6bdbfba248922 /drivers/gpu/drm/i915/intel_region_ttm.h | |
| parent | f7f4da303dd8946228860e78bd7f36c2cc47a636 (diff) | |
| parent | ced7866db39fc5c59ee05e154d4abc0977a17f6b (diff) | |
Merge tag 'drm-intel-fixes-2022-07-17' of git://anongit.freedesktop.org/drm/drm-intel
Pull intel drm build fix from Rodrigo Vivi:
"Our 'dim' flow has a problem with fixes of fixes getting missed. We
need to take a look on that later.
Meanwhile, please allow me to quickly propagate this fix for the
32-bit build issue here upstream"
* tag 'drm-intel-fixes-2022-07-17' of git://anongit.freedesktop.org/drm/drm-intel:
drm/i915/ttm: fix 32b build
Diffstat (limited to 'drivers/gpu/drm/i915/intel_region_ttm.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_region_ttm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_region_ttm.h b/drivers/gpu/drm/i915/intel_region_ttm.h index 98fba5155619..5bb8d8b582ae 100644 --- a/drivers/gpu/drm/i915/intel_region_ttm.h +++ b/drivers/gpu/drm/i915/intel_region_ttm.h @@ -25,7 +25,7 @@ int intel_region_ttm_fini(struct intel_memory_region *mem); struct i915_refct_sgt * intel_region_ttm_resource_to_rsgt(struct intel_memory_region *mem, struct ttm_resource *res, - u64 page_alignment); + u32 page_alignment); void intel_region_ttm_resource_free(struct intel_memory_region *mem, struct ttm_resource *res); |