github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 20:14:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915: add .vgpu_active to parent interface

Browse Source 
Add .vgpu_active() to display parent interface, removing more
dependencies on struct drm_i915_private, i915_drv.h, and i915_vgpu.h.

This also allows us to remove the xe compat i915_vgpu.h.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/a2d4043ebaaf8f69bb738d5d1332afd2847550ad.1763370931.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2025-11-17 11:16:11 +02:00
parent 3815e8f2ff
commit e891673897
7 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/display/intel_crtc.c
View File

@ -13,8 +13,6 @@
#include <drm/drm_vblank.h>
#include <drm/drm_vblank_work.h>
#include "i915_drv.h"
#include "i915_vgpu.h"
#include "i9xx_plane.h"
#include "icl_dsi.h"
#include "intel_atomic.h"
@ -28,6 +26,7 @@
#include "intel_drrs.h"
#include "intel_dsi.h"
#include "intel_fifo_underrun.h"
#include "intel_parent.h"
#include "intel_pipe_crc.h"
#include "intel_plane.h"
#include "intel_psr.h"
@ -671,7 +670,6 @@ void intel_pipe_update_end(struct intel_atomic_state *state,
int scanline_end = intel_get_crtc_scanline(crtc);
u32 end_vbl_count = intel_crtc_get_vblank_counter(crtc);
ktime_t end_vbl_time = ktime_get();
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
drm_WARN_ON(display->drm, new_crtc_state->use_dsb);
@ -737,7 +735,7 @@ void intel_pipe_update_end(struct intel_atomic_state *state,
local_irq_enable();
if (intel_vgpu_active(dev_priv))
if (intel_parent_vgpu_active(display))
goto out;
if (crtc->debug.start_vbl_count &&

5
drivers/gpu/drm/i915/display/intel_fbc.c
View File

@ -50,7 +50,6 @@
#include "gt/intel_gt_types.h"
#include "i915_drv.h"
#include "i915_vgpu.h"
#include "i915_vma.h"
#include "i9xx_plane_regs.h"
#include "intel_de.h"
@ -64,6 +63,7 @@
#include "intel_fbc.h"
#include "intel_fbc_regs.h"
#include "intel_frontbuffer.h"
#include "intel_parent.h"
#define for_each_fbc_id(__display, __fbc_id) \
for ((__fbc_id) = INTEL_FBC_A; (__fbc_id) < I915_MAX_FBCS; (__fbc_id)++) \
@ -1485,7 +1485,6 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state,
struct intel_plane *plane)
{
struct intel_display *display = to_intel_display(state->base.dev);
struct drm_i915_private *i915 = to_i915(display->drm);
struct intel_plane_state *plane_state =
intel_atomic_get_new_plane_state(state, plane);
const struct drm_framebuffer *fb = plane_state->hw.fb;
@ -1501,7 +1500,7 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state,
return 0;
}
if (intel_vgpu_active(i915)) {
if (intel_parent_vgpu_active(display)) {
plane_state->no_fbc_reason = "VGPU active";
return 0;
}

5
drivers/gpu/drm/i915/display/intel_parent.c
View File

@ -31,3 +31,8 @@ void intel_parent_irq_synchronize(struct intel_display *display)
{
display->parent->irq->synchronize(display->drm);
}
bool intel_parent_vgpu_active(struct intel_display *display)
{
return display->parent->vgpu_active && display->parent->vgpu_active(display->drm);
}

2
drivers/gpu/drm/i915/display/intel_parent.h
View File

@ -11,4 +11,6 @@ struct intel_display;
bool intel_parent_irq_enabled(struct intel_display *display);
void intel_parent_irq_synchronize(struct intel_display *display);
bool intel_parent_vgpu_active(struct intel_display *display);
#endif /* __INTEL_PARENT_H__ */

6
drivers/gpu/drm/i915/i915_driver.c
View File

@ -739,9 +739,15 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv)
"DRM_I915_DEBUG_RUNTIME_PM enabled\n");
}
static bool vgpu_active(struct drm_device *drm)
{
return intel_vgpu_active(to_i915(drm));
}
static const struct intel_display_parent_interface parent = {
.rpm = &i915_display_rpm_interface,
.irq = &i915_display_irq_interface,
.vgpu_active = vgpu_active,
};
const struct intel_display_parent_interface *i915_driver_parent_interface(void)

18
drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h
View File

@ -1,18 +0,0 @@
/* SPDX-License-Identifier: MIT */
/*
* Copyright © 2023 Intel Corporation
*/
#ifndef _I915_VGPU_H_
#define _I915_VGPU_H_
#include <linux/types.h>
struct drm_i915_private;
static inline bool intel_vgpu_active(struct drm_i915_private *i915)
{
return false;
}
#endif /* _I915_VGPU_H_ */

3
include/drm/intel/display_parent_interface.h
View File

@ -48,6 +48,9 @@ struct intel_display_parent_interface {
/** @irq: IRQ interface */
const struct intel_display_irq_interface *irq;
/** @vgpu_active: Is vGPU active? Optional. */
bool (*vgpu_active)(struct drm_device *drm);
};
#endif