diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2025-02-28 06:54:14 -0800 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2025-02-28 06:54:14 -0800 |
| commit | 0410c6121529409b08e81a77ae3ee58c657e2243 (patch) | |
| tree | bc9da8b17b25dba10227dd658fce2dbf8adaad7c /drivers/gpu/drm/i915/display/intel_vga.c | |
| parent | ba757a65d2a28d46a8ccf50538f4f05036983f1b (diff) | |
| parent | 33e26f3544a558e7476eb221ff33173759b3a116 (diff) | |
Merge drm/drm-next into drm-xe-next
Sync to fix conlicts between drm-xe-next and drm-intel-next.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_vga.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_vga.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c index fd18dd07ae49..684b5d1bc87c 100644 --- a/drivers/gpu/drm/i915/display/intel_vga.c +++ b/drivers/gpu/drm/i915/display/intel_vga.c @@ -59,7 +59,6 @@ void intel_vga_redisable_power_on(struct intel_display *display) void intel_vga_redisable(struct intel_display *display) { - struct drm_i915_private *i915 = to_i915(display->drm); intel_wakeref_t wakeref; /* @@ -71,13 +70,13 @@ void intel_vga_redisable(struct intel_display *display) * follow the "don't touch the power well if we don't need it" policy * the rest of the driver uses. */ - wakeref = intel_display_power_get_if_enabled(i915, POWER_DOMAIN_VGA); + wakeref = intel_display_power_get_if_enabled(display, POWER_DOMAIN_VGA); if (!wakeref) return; intel_vga_redisable_power_on(display); - intel_display_power_put(i915, POWER_DOMAIN_VGA, wakeref); + intel_display_power_put(display, POWER_DOMAIN_VGA, wakeref); } void intel_vga_reset_io_mem(struct intel_display *display) |