Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/overlay: Rename low level i915 specific functions
Some of the lower level functions in the overlay code will
move to the i915 side of the upcoming parent vs. display
driver split. Move all such functions to the "i915_overlay_"
namespace to make it easier to see what belongs where.
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20260226100738.29997-13-ville.syrjala@linux.intel.com
+14
-15
+14
-15
drivers/gpu/drm/i915/display/intel_overlay.c
+14
-15
drivers/gpu/drm/i915/display/intel_overlay.c
···
298
298
return i915_active_wait(&overlay->last_flip);
299
299
}
300
300
301
-
static void intel_overlay_flip_prepare(struct intel_overlay *overlay,
302
-
struct i915_vma *vma)
301
+
static void i915_overlay_flip_prepare(struct intel_overlay *overlay,
302
+
struct i915_vma *vma)
303
303
{
304
304
struct intel_display *display = overlay->display;
305
305
struct intel_frontbuffer *frontbuffer = NULL;
···
352
352
*cs++ = flip_addr;
353
353
intel_ring_advance(rq, cs);
354
354
355
-
intel_overlay_flip_prepare(overlay, vma);
355
+
i915_overlay_flip_prepare(overlay, vma);
356
356
i915_request_add(rq);
357
357
358
358
return 0;
359
359
}
360
360
361
-
static void intel_overlay_release_old_vma(struct intel_overlay *overlay)
361
+
static void i915_overlay_release_old_vma(struct intel_overlay *overlay)
362
362
{
363
363
struct intel_display *display = overlay->display;
364
364
struct i915_vma *vma;
···
373
373
i915_vma_put(vma);
374
374
}
375
375
376
-
static void
377
-
intel_overlay_release_old_vid_tail(struct intel_overlay *overlay)
376
+
static void i915_overlay_release_old_vid_tail(struct intel_overlay *overlay)
378
377
{
379
-
intel_overlay_release_old_vma(overlay);
378
+
i915_overlay_release_old_vma(overlay);
380
379
}
381
380
382
-
static void intel_overlay_off_tail(struct intel_overlay *overlay)
381
+
static void i915_overlay_off_tail(struct intel_overlay *overlay)
383
382
{
384
383
struct intel_display *display = overlay->display;
385
384
386
-
intel_overlay_release_old_vma(overlay);
385
+
i915_overlay_release_old_vma(overlay);
387
386
388
387
overlay->frontbuffer_bits = 0;
389
388
···
390
391
i830_overlay_clock_gating(display, true);
391
392
}
392
393
393
-
static void intel_overlay_last_flip_retire(struct i915_active *active)
394
+
static void i915_overlay_last_flip_retire(struct i915_active *active)
394
395
{
395
396
struct intel_overlay *overlay =
396
397
container_of(active, typeof(*overlay), last_flip);
···
416
417
*/
417
418
flip_addr |= OFC_UPDATE;
418
419
419
-
rq = alloc_request(overlay, intel_overlay_off_tail);
420
+
rq = alloc_request(overlay, i915_overlay_off_tail);
420
421
if (IS_ERR(rq))
421
422
return PTR_ERR(rq);
422
423
···
438
439
439
440
intel_ring_advance(rq, cs);
440
441
441
-
intel_overlay_flip_prepare(overlay, NULL);
442
+
i915_overlay_flip_prepare(overlay, NULL);
442
443
i915_request_add(rq);
443
444
444
445
return i915_active_wait(&overlay->last_flip);
···
472
473
return 0;
473
474
474
475
if (!(intel_de_read(display, GEN2_ISR) & I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT)) {
475
-
intel_overlay_release_old_vid_tail(overlay);
476
+
i915_overlay_release_old_vid_tail(overlay);
476
477
return 0;
477
478
}
478
479
479
-
rq = alloc_request(overlay, intel_overlay_release_old_vid_tail);
480
+
rq = alloc_request(overlay, i915_overlay_release_old_vid_tail);
480
481
if (IS_ERR(rq))
481
482
return PTR_ERR(rq);
482
483
···
1453
1454
overlay->context = engine->kernel_context;
1454
1455
1455
1456
i915_active_init(&overlay->last_flip,
1456
-
NULL, intel_overlay_last_flip_retire, 0);
1457
+
NULL, i915_overlay_last_flip_retire, 0);
1457
1458
1458
1459
return get_registers(overlay, needs_physical);
1459
1460
}