diff options
| author | Chris Wilson | 2018-10-25 11:18:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-11-21 09:19:27 +0100 |
| commit | 1a25e1a1be71a49ee7f34fb14b5a26191e6cf501 (patch) | |
| tree | d0dc937d39b411d583ae8973ffc5b3a79a0201eb /drivers/gpu/drm/i915/i915_gem_gtt.h | |
| parent | drm/i915/hdmi: Add HDMI 2.0 audio clock recovery N values (diff) | |
| download | kernel-qcow2-linux-1a25e1a1be71a49ee7f34fb14b5a26191e6cf501.tar.gz kernel-qcow2-linux-1a25e1a1be71a49ee7f34fb14b5a26191e6cf501.tar.xz kernel-qcow2-linux-1a25e1a1be71a49ee7f34fb14b5a26191e6cf501.zip | |
drm/i915: Mark up GTT sizes as u64
commit c58281056a8b26d5d9dc15c19859a7880835ef44 upstream.
Since we use a 64b virtual GTT irrespective of the system, we want to
ensure that the GTT computations remains 64b even on 32b systems,
including treatment of huge virtual pages.
No code generation changes on 64b:
Reported-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108282
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181025091823.20571-1-chris@chris-wilson.co.uk
(cherry picked from commit 9125963a9494253fa5a29cc1b4169885d2be7042)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_gtt.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h index 2a116a91420b..4755e5a309d3 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.h +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h @@ -42,9 +42,9 @@ #include "i915_selftest.h" #include "i915_timeline.h" -#define I915_GTT_PAGE_SIZE_4K BIT(12) -#define I915_GTT_PAGE_SIZE_64K BIT(16) -#define I915_GTT_PAGE_SIZE_2M BIT(21) +#define I915_GTT_PAGE_SIZE_4K BIT_ULL(12) +#define I915_GTT_PAGE_SIZE_64K BIT_ULL(16) +#define I915_GTT_PAGE_SIZE_2M BIT_ULL(21) #define I915_GTT_PAGE_SIZE I915_GTT_PAGE_SIZE_4K #define I915_GTT_MAX_PAGE_SIZE I915_GTT_PAGE_SIZE_2M |