tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915: Nuke intel_plane_ggtt_offset()
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
+7
-13
+2
-1
drivers/gpu/drm/i915/display/intel_fb_pin.c
+2
-1
drivers/gpu/drm/i915/display/intel_fb_pin.c
···
11
11
#include "gem/i915_gem_object.h"
12
12
13
13
#include "i915_drv.h"
14
+
#include "i915_vma.h"
14
15
#include "intel_display_core.h"
15
16
#include "intel_display_rpm.h"
16
17
#include "intel_display_types.h"
···
313
312
plane_state->surf = i915_gem_object_get_dma_address(obj, 0) +
314
313
plane->surf_offset(plane_state);
315
314
} else {
316
-
plane_state->surf = intel_plane_ggtt_offset(plane_state) +
315
+
plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma) +
317
316
plane->surf_offset(plane_state);
318
317
}
319
318
-6
drivers/gpu/drm/i915/display/intel_plane.c
-6
drivers/gpu/drm/i915/display/intel_plane.c
···
46
46
47
47
#include "gem/i915_gem_object.h"
48
48
#include "i915_scheduler_types.h"
49
-
#include "i915_vma.h"
50
49
#include "i9xx_plane_regs.h"
51
50
#include "intel_bo.h"
52
51
#include "intel_cdclk.h"
···
1747
1748
}
1748
1749
1749
1750
return 0;
1750
-
}
1751
-
1752
-
u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state)
1753
-
{
1754
-
return i915_ggtt_offset(plane_state->ggtt_vma);
1755
1751
}
-1
drivers/gpu/drm/i915/display/intel_plane.h
-1
drivers/gpu/drm/i915/display/intel_plane.h
···
87
87
struct intel_crtc *crtc);
88
88
int intel_plane_atomic_check(struct intel_atomic_state *state);
89
89
90
-
u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state);
91
90
bool intel_plane_format_mod_supported_async(struct drm_plane *plane,
92
91
u32 format,
93
92
u64 modifier);
+1
-1
drivers/gpu/drm/i915/display/intel_plane_initial.c
+1
-1
drivers/gpu/drm/i915/display/intel_plane_initial.c
···
359
359
i915_vma_pin_fence(vma) == 0 && vma->fence)
360
360
plane_state->flags |= PLANE_HAS_FENCE;
361
361
362
-
plane_state->surf = intel_plane_ggtt_offset(plane_state);
362
+
plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma);
363
363
364
364
plane_state->uapi.src_x = 0;
365
365
plane_state->uapi.src_y = 0;
+2
-3
drivers/gpu/drm/xe/display/xe_fb_pin.c
+2
-3
drivers/gpu/drm/xe/display/xe_fb_pin.c
···
12
12
#include "intel_fb.h"
13
13
#include "intel_fb_pin.h"
14
14
#include "intel_fbdev.h"
15
-
#include "intel_plane.h"
16
15
#include "xe_bo.h"
17
16
#include "xe_device.h"
18
17
#include "xe_ggtt.h"
···
406
407
refcount_inc(&vma->ref);
407
408
new_plane_state->ggtt_vma = vma;
408
409
409
-
new_plane_state->surf = intel_plane_ggtt_offset(new_plane_state) +
410
+
new_plane_state->surf = i915_ggtt_offset(new_plane_state->ggtt_vma) +
410
411
plane->surf_offset(new_plane_state);
411
412
412
413
return true;
···
436
437
437
438
new_plane_state->ggtt_vma = vma;
438
439
439
-
new_plane_state->surf = intel_plane_ggtt_offset(new_plane_state) +
440
+
new_plane_state->surf = i915_ggtt_offset(new_plane_state->ggtt_vma) +
440
441
plane->surf_offset(new_plane_state);
441
442
442
443
return 0;
+2
-1
drivers/gpu/drm/xe/display/xe_plane_initial.c
+2
-1
drivers/gpu/drm/xe/display/xe_plane_initial.c
···
10
10
#include "xe_ggtt.h"
11
11
#include "xe_mmio.h"
12
12
13
+
#include "i915_vma.h"
13
14
#include "intel_crtc.h"
14
15
#include "intel_display.h"
15
16
#include "intel_display_core.h"
···
236
235
237
236
plane_state->ggtt_vma = vma;
238
237
239
-
plane_state->surf = intel_plane_ggtt_offset(plane_state);
238
+
plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma);
240
239
241
240
plane_state->uapi.src_x = 0;
242
241
plane_state->uapi.src_y = 0;