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

drm/i915/display: add display specific runtime PM wrappers

Browse Source 
Add display specific wrappers around the i915 and xe dedicated runtime
PM interfaces. There are no conversions here, just the wrappers.

Implement with_intel_display_rpm() without needing to provide a local
variable, which neatly narrows the scope and hides the type of the
wakeref cookie.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/086b312367fa0fbd8de92e9764117aa7ff4a8cc5.1742483007.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2025-03-20 17:03:55 +02:00
parent 09b9563e54
commit 336c0eaed2
5 changed files with 178 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/i915/Makefile
View File

@ -247,6 +247,7 @@ i915-y += \
display/intel_display_power_map.o \
display/intel_display_power_well.o \
display/intel_display_reset.o \
display/intel_display_rpm.o \
display/intel_display_rps.o \
display/intel_display_snapshot.o \
display/intel_display_wa.o \

68
drivers/gpu/drm/i915/display/intel_display_rpm.c Normal file
View File

@ -0,0 +1,68 @@
// SPDX-License-Identifier: MIT
/* Copyright © 2025 Intel Corporation */
#include "i915_drv.h"
#include "intel_display_rpm.h"
#include "intel_runtime_pm.h"
static struct intel_runtime_pm *display_to_rpm(struct intel_display *display)
{
struct drm_i915_private *i915 = to_i915(display->drm);
return &i915->runtime_pm;
}
struct ref_tracker *intel_display_rpm_get_raw(struct intel_display *display)
{
return intel_runtime_pm_get_raw(display_to_rpm(display));
}
void intel_display_rpm_put_raw(struct intel_display *display, struct ref_tracker *wakeref)
{
intel_runtime_pm_put_raw(display_to_rpm(display), wakeref);
}
struct ref_tracker *intel_display_rpm_get(struct intel_display *display)
{
return intel_runtime_pm_get(display_to_rpm(display));
}
struct ref_tracker *intel_display_rpm_get_if_in_use(struct intel_display *display)
{
return intel_runtime_pm_get_if_in_use(display_to_rpm(display));
}
struct ref_tracker *intel_display_rpm_get_noresume(struct intel_display *display)
{
return intel_runtime_pm_get_noresume(display_to_rpm(display));
}
void intel_display_rpm_put(struct intel_display *display, struct ref_tracker *wakeref)
{
intel_runtime_pm_put(display_to_rpm(display), wakeref);
}
void intel_display_rpm_put_unchecked(struct intel_display *display)
{
intel_runtime_pm_put_unchecked(display_to_rpm(display));
}
bool intel_display_rpm_suspended(struct intel_display *display)
{
return intel_runtime_pm_suspended(display_to_rpm(display));
}
void assert_display_rpm_held(struct intel_display *display)
{
assert_rpm_wakelock_held(display_to_rpm(display));
}
void intel_display_rpm_assert_block(struct intel_display *display)
{
disable_rpm_wakeref_asserts(display_to_rpm(display));
}
void intel_display_rpm_assert_unblock(struct intel_display *display)
{
enable_rpm_wakeref_asserts(display_to_rpm(display));
}

37
drivers/gpu/drm/i915/display/intel_display_rpm.h Normal file
View File

@ -0,0 +1,37 @@
/* SPDX-License-Identifier: MIT */
/* Copyright © 2025 Intel Corporation */
#ifndef __INTEL_DISPLAY_RPM__
#define __INTEL_DISPLAY_RPM__
#include <linux/types.h>
struct intel_display;
struct ref_tracker;
struct ref_tracker *intel_display_rpm_get(struct intel_display *display);
void intel_display_rpm_put(struct intel_display *display, struct ref_tracker *wakeref);
#define __with_intel_display_rpm(__display, __wakeref) \
for (struct ref_tracker *(__wakeref) = intel_display_rpm_get(__display); (__wakeref); \
intel_display_rpm_put((__display), (__wakeref)), (__wakeref) = NULL)
#define with_intel_display_rpm(__display) \
__with_intel_display_rpm((__display), __UNIQUE_ID(wakeref))
/* Only for special cases. */
bool intel_display_rpm_suspended(struct intel_display *display);
void assert_display_rpm_held(struct intel_display *display);
void intel_display_rpm_assert_block(struct intel_display *display);
void intel_display_rpm_assert_unblock(struct intel_display *display);
/* Only for display power implementation. */
struct ref_tracker *intel_display_rpm_get_raw(struct intel_display *display);
void intel_display_rpm_put_raw(struct intel_display *display, struct ref_tracker *wakeref);
struct ref_tracker *intel_display_rpm_get_if_in_use(struct intel_display *display);
struct ref_tracker *intel_display_rpm_get_noresume(struct intel_display *display);
void intel_display_rpm_put_unchecked(struct intel_display *display);
#endif /* __INTEL_DISPLAY_RPM__ */

1
drivers/gpu/drm/xe/Makefile
View File

@ -181,6 +181,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
display/intel_fbdev_fb.o \
display/xe_display.o \
display/xe_display_misc.o \
display/xe_display_rpm.o \
display/xe_display_rps.o \
display/xe_display_wa.o \
display/xe_dsb_buffer.o \

71
drivers/gpu/drm/xe/display/xe_display_rpm.c Normal file
View File

@ -0,0 +1,71 @@
// SPDX-License-Identifier: MIT
/* Copyright © 2025 Intel Corporation */
#include "intel_display_rpm.h"
#include "xe_device_types.h"
#include "xe_pm.h"
static struct xe_device *display_to_xe(struct intel_display *display)
{
return container_of(display, struct xe_device, display);
}
struct ref_tracker *intel_display_rpm_get_raw(struct intel_display *display)
{
return intel_display_rpm_get(display);
}
void intel_display_rpm_put_raw(struct intel_display *display, struct ref_tracker *wakeref)
{
intel_display_rpm_put(display, wakeref);
}
struct ref_tracker *intel_display_rpm_get(struct intel_display *display)
{
return xe_pm_runtime_resume_and_get(display_to_xe(display)) ? INTEL_WAKEREF_DEF : NULL;
}
struct ref_tracker *intel_display_rpm_get_if_in_use(struct intel_display *display)
{
return xe_pm_runtime_get_if_in_use(display_to_xe(display)) ? INTEL_WAKEREF_DEF : NULL;
}
struct ref_tracker *intel_display_rpm_get_noresume(struct intel_display *display)
{
xe_pm_runtime_get_noresume(display_to_xe(display));
return INTEL_WAKEREF_DEF;
}
void intel_display_rpm_put(struct intel_display *display, struct ref_tracker *wakeref)
{
if (wakeref)
xe_pm_runtime_put(display_to_xe(display));
}
void intel_display_rpm_put_unchecked(struct intel_display *display)
{
xe_pm_runtime_put(display_to_xe(display));
}
bool intel_display_rpm_suspended(struct intel_display *display)
{
struct xe_device *xe = display_to_xe(display);
return pm_runtime_suspended(xe->drm.dev);
}
void assert_display_rpm_held(struct intel_display *display)
{
/* FIXME */
}
void intel_display_rpm_assert_block(struct intel_display *display)
{
/* FIXME */
}
void intel_display_rpm_assert_unblock(struct intel_display *display)
{
/* FIXME */
}