github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 00:53:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915: Nuke intel_plane_ggtt_offset()

Browse Source 
We don't really need the extra intel_plane_ggtt_offset() wrapper
anymore. Get rid of it.

v2: Deal with reuse_vma() hacks

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-3-ville.syrjala@linux.intel.com
This commit is contained in:
Ville Syrjälä 2025-07-19 20:53:54 +03:00
parent 971eb92b04
commit bc0c7fd732
6 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/i915/display/intel_fb_pin.c
View File

@ -11,6 +11,7 @@
#include "gem/i915_gem_object.h"
#include "i915_drv.h"
#include "i915_vma.h"
#include "intel_display_core.h"
#include "intel_display_rpm.h"
#include "intel_display_types.h"
@ -312,7 +313,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state,
plane_state->surf = i915_gem_object_get_dma_address(obj, 0) +
plane->surf_offset(plane_state);
} else {
plane_state->surf = intel_plane_ggtt_offset(plane_state) +
plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma) +
plane->surf_offset(plane_state);
}

6
drivers/gpu/drm/i915/display/intel_plane.c
View File

@ -46,7 +46,6 @@
#include "gem/i915_gem_object.h"
#include "i915_scheduler_types.h"
#include "i915_vma.h"
#include "i9xx_plane_regs.h"
#include "intel_bo.h"
#include "intel_cdclk.h"
@ -1749,8 +1748,3 @@ int intel_plane_atomic_check(struct intel_atomic_state *state)
return 0;
}
u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state)
{
return i915_ggtt_offset(plane_state->ggtt_vma);
}

1
drivers/gpu/drm/i915/display/intel_plane.h
View File

@ -87,7 +87,6 @@ int intel_plane_add_affected(struct intel_atomic_state *state,
struct intel_crtc *crtc);
int intel_plane_atomic_check(struct intel_atomic_state *state);
u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state);
bool intel_plane_format_mod_supported_async(struct drm_plane *plane,
u32 format,
u64 modifier);

2
drivers/gpu/drm/i915/display/intel_plane_initial.c
View File

@ -359,7 +359,7 @@ intel_find_initial_plane_obj(struct intel_crtc *crtc,
i915_vma_pin_fence(vma) == 0 && vma->fence)
plane_state->flags |= PLANE_HAS_FENCE;
plane_state->surf = intel_plane_ggtt_offset(plane_state);
plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma);
plane_state->uapi.src_x = 0;
plane_state->uapi.src_y = 0;

5
drivers/gpu/drm/xe/display/xe_fb_pin.c
View File

@ -12,7 +12,6 @@
#include "intel_fb.h"
#include "intel_fb_pin.h"
#include "intel_fbdev.h"
#include "intel_plane.h"
#include "xe_bo.h"
#include "xe_device.h"
#include "xe_ggtt.h"
@ -407,7 +406,7 @@ static bool reuse_vma(struct intel_plane_state *new_plane_state,
refcount_inc(&vma->ref);
new_plane_state->ggtt_vma = vma;
new_plane_state->surf = intel_plane_ggtt_offset(new_plane_state) +
new_plane_state->surf = i915_ggtt_offset(new_plane_state->ggtt_vma) +
plane->surf_offset(new_plane_state);
return true;
@ -437,7 +436,7 @@ int intel_plane_pin_fb(struct intel_plane_state *new_plane_state,
new_plane_state->ggtt_vma = vma;
new_plane_state->surf = intel_plane_ggtt_offset(new_plane_state) +
new_plane_state->surf = i915_ggtt_offset(new_plane_state->ggtt_vma) +
plane->surf_offset(new_plane_state);
return 0;

3
drivers/gpu/drm/xe/display/xe_plane_initial.c
View File

@ -10,6 +10,7 @@
#include "xe_ggtt.h"
#include "xe_mmio.h"
#include "i915_vma.h"
#include "intel_crtc.h"
#include "intel_display.h"
#include "intel_display_core.h"
@ -235,7 +236,7 @@ intel_find_initial_plane_obj(struct intel_crtc *crtc,
plane_state->ggtt_vma = vma;
plane_state->surf = intel_plane_ggtt_offset(plane_state);
plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma);
plane_state->uapi.src_x = 0;
plane_state->uapi.src_y = 0;