diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2025-07-17 20:13:50 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2025-07-19 20:55:25 +0300 |
| commit | c6ab589feebf81e11b784fe1b4e81208019e72c7 (patch) | |
| tree | 74a88839f882ecc3cfe0fa6e5c652f2d307c0ce1 /drivers/gpu/drm | |
| parent | drm/i915: Move the intel_dpt_offset() check into intel_plane_pin_fb() (diff) | |
| download | linux-c6ab589feebf81e11b784fe1b4e81208019e72c7.tar.gz linux-c6ab589feebf81e11b784fe1b4e81208019e72c7.zip | |
drm/i915: Use i915_vma_offset() in intel_dpt_offset()
Replace the open coded vma mm node stuff in intel_dpt_offset()
with i915_vma_offset(). This will also include the VT-d guard
in the result. Granted that should always be 0 for DPT, but
it seems prudent to include that in our DPT vma offset check
anyway.
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250717171353.23090-5-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dpt.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_fb_pin.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dpt.c b/drivers/gpu/drm/i915/display/intel_dpt.c index aea249e2699f..4743d8b0bf40 100644 --- a/drivers/gpu/drm/i915/display/intel_dpt.c +++ b/drivers/gpu/drm/i915/display/intel_dpt.c @@ -322,5 +322,5 @@ void intel_dpt_destroy(struct i915_address_space *vm) u64 intel_dpt_offset(struct i915_vma *dpt_vma) { - return dpt_vma->node.start; + return i915_vma_offset(dpt_vma); } diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c index b0557976836d..d598a005f847 100644 --- a/drivers/gpu/drm/i915/display/intel_fb_pin.c +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c @@ -302,8 +302,8 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state, WARN_ON(plane_state->ggtt_vma == plane_state->dpt_vma); /* - * The DPT object contains only one vma, so - * the VMA's offset within the DPT is always 0. + * The DPT object contains only one vma, and there is no VT-d + * guard, so the VMA's offset within the DPT is always 0. */ drm_WARN_ON(display->drm, intel_dpt_offset(plane_state->dpt_vma)); } |