Skip to content

Commit 98c7fc0

Browse files
committed
drm/i915/display: Use display parent interface for i915 runtime pm
Start using display parent interface for i915 runtime pm. Doing the same for xe is done in coming changes. v3: - remove useless include v2: - use <> when including drm/intel/display_parent_interface.h - drop checks for validity of rpm function pointers Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Jouni Högander <jouni.hogander@intel.com> Link: https://patch.msgid.link/20251030202836.1815680-6-jouni.hogander@intel.com
1 parent f3f6dbf commit 98c7fc0

1 file changed

Lines changed: 13 additions & 20 deletions

File tree

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,62 @@
11
// SPDX-License-Identifier: MIT
22
/* Copyright © 2025 Intel Corporation */
33

4-
#include "i915_drv.h"
4+
#include <drm/intel/display_parent_interface.h>
5+
56
#include "intel_display_core.h"
67
#include "intel_display_rpm.h"
7-
#include "intel_runtime_pm.h"
8-
9-
static struct intel_runtime_pm *display_to_rpm(struct intel_display *display)
10-
{
11-
struct drm_i915_private *i915 = to_i915(display->drm);
12-
13-
return &i915->runtime_pm;
14-
}
158

169
struct ref_tracker *intel_display_rpm_get_raw(struct intel_display *display)
1710
{
18-
return intel_runtime_pm_get_raw(display_to_rpm(display));
11+
return display->parent->rpm->get_raw(display->drm);
1912
}
2013

2114
void intel_display_rpm_put_raw(struct intel_display *display, struct ref_tracker *wakeref)
2215
{
23-
intel_runtime_pm_put_raw(display_to_rpm(display), wakeref);
16+
display->parent->rpm->put_raw(display->drm, wakeref);
2417
}
2518

2619
struct ref_tracker *intel_display_rpm_get(struct intel_display *display)
2720
{
28-
return intel_runtime_pm_get(display_to_rpm(display));
21+
return display->parent->rpm->get(display->drm);
2922
}
3023

3124
struct ref_tracker *intel_display_rpm_get_if_in_use(struct intel_display *display)
3225
{
33-
return intel_runtime_pm_get_if_in_use(display_to_rpm(display));
26+
return display->parent->rpm->get_if_in_use(display->drm);
3427
}
3528

3629
struct ref_tracker *intel_display_rpm_get_noresume(struct intel_display *display)
3730
{
38-
return intel_runtime_pm_get_noresume(display_to_rpm(display));
31+
return display->parent->rpm->get_noresume(display->drm);
3932
}
4033

4134
void intel_display_rpm_put(struct intel_display *display, struct ref_tracker *wakeref)
4235
{
43-
intel_runtime_pm_put(display_to_rpm(display), wakeref);
36+
display->parent->rpm->put(display->drm, wakeref);
4437
}
4538

4639
void intel_display_rpm_put_unchecked(struct intel_display *display)
4740
{
48-
intel_runtime_pm_put_unchecked(display_to_rpm(display));
41+
display->parent->rpm->put_unchecked(display->drm);
4942
}
5043

5144
bool intel_display_rpm_suspended(struct intel_display *display)
5245
{
53-
return intel_runtime_pm_suspended(display_to_rpm(display));
46+
return display->parent->rpm->suspended(display->drm);
5447
}
5548

5649
void assert_display_rpm_held(struct intel_display *display)
5750
{
58-
assert_rpm_wakelock_held(display_to_rpm(display));
51+
display->parent->rpm->assert_held(display->drm);
5952
}
6053

6154
void intel_display_rpm_assert_block(struct intel_display *display)
6255
{
63-
disable_rpm_wakeref_asserts(display_to_rpm(display));
56+
display->parent->rpm->assert_block(display->drm);
6457
}
6558

6659
void intel_display_rpm_assert_unblock(struct intel_display *display)
6760
{
68-
enable_rpm_wakeref_asserts(display_to_rpm(display));
61+
display->parent->rpm->assert_unblock(display->drm);
6962
}

0 commit comments

Comments
 (0)