Skip to content

Commit 41a4629

Browse files
committed
drm/i915/psr: convert intel_psr.[ch] to struct intel_display
Going forward, struct intel_display shall replace struct drm_i915_private as the main display device data pointer type. Convert intel_psr.[ch] to struct intel_display. Some stragglers are left behind where needed. Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/4399b98b07019a8063adbec1043ff7eabb7c1080.1725012870.git.jani.nikula@intel.com
1 parent 8a37cd4 commit 41a4629

File tree

4 files changed

+454
-411
lines changed

4 files changed

+454
-411
lines changed

drivers/gpu/drm/i915/display/intel_display_debugfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ void intel_display_debugfs_register(struct drm_i915_private *i915)
10711071
intel_fbc_debugfs_register(display);
10721072
intel_hpd_debugfs_register(i915);
10731073
intel_opregion_debugfs_register(display);
1074-
intel_psr_debugfs_register(i915);
1074+
intel_psr_debugfs_register(display);
10751075
intel_wm_debugfs_register(i915);
10761076
intel_display_debugfs_params(display);
10771077
}

drivers/gpu/drm/i915/display/intel_frontbuffer.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ static void frontbuffer_flush(struct drm_i915_private *i915,
8383
unsigned int frontbuffer_bits,
8484
enum fb_op_origin origin)
8585
{
86+
struct intel_display *display = &i915->display;
87+
8688
/* Delay flushing when rings are still busy.*/
8789
spin_lock(&i915->display.fb_tracking.lock);
8890
frontbuffer_bits &= ~i915->display.fb_tracking.busy_bits;
@@ -96,7 +98,7 @@ static void frontbuffer_flush(struct drm_i915_private *i915,
9698
might_sleep();
9799
intel_td_flush(i915);
98100
intel_drrs_flush(i915, frontbuffer_bits);
99-
intel_psr_flush(i915, frontbuffer_bits, origin);
101+
intel_psr_flush(display, frontbuffer_bits, origin);
100102
intel_fbc_flush(i915, frontbuffer_bits, origin);
101103
}
102104

@@ -172,6 +174,7 @@ void __intel_fb_invalidate(struct intel_frontbuffer *front,
172174
unsigned int frontbuffer_bits)
173175
{
174176
struct drm_i915_private *i915 = intel_bo_to_i915(front->obj);
177+
struct intel_display *display = &i915->display;
175178

176179
if (origin == ORIGIN_CS) {
177180
spin_lock(&i915->display.fb_tracking.lock);
@@ -183,7 +186,7 @@ void __intel_fb_invalidate(struct intel_frontbuffer *front,
183186
trace_intel_frontbuffer_invalidate(i915, frontbuffer_bits, origin);
184187

185188
might_sleep();
186-
intel_psr_invalidate(i915, frontbuffer_bits, origin);
189+
intel_psr_invalidate(display, frontbuffer_bits, origin);
187190
intel_drrs_invalidate(i915, frontbuffer_bits);
188191
intel_fbc_invalidate(i915, frontbuffer_bits, origin);
189192
}

0 commit comments

Comments
 (0)