Commit c2e04017 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/gem: add i915_gem_fence_wait_priority_display() helper 



Add i915_gem_fence_wait_priority_display() helper to wait with
I915_PRIORITY_DISPLAY. This drops the intel_plane.c dependency on
i915_scheduler_types.h, and allows us to remove the compat header from
xe.

Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://lore.kernel.org/r/20250924085129.146173-1-jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent d90c0a5c

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

+1 −4
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include <drm/drm_panic.h>



#include "gem/i915_gem_object.h"

#include "i915_scheduler_types.h"

#include "i9xx_plane_regs.h"

#include "intel_cdclk.h"

#include "intel_cursor.h"
@@ -1172,7 +1171,6 @@ static int 
intel_prepare_plane_fb(struct drm_plane *_plane,

		       struct drm_plane_state *_new_plane_state)

{

	struct i915_sched_attr attr = { .priority = I915_PRIORITY_DISPLAY };

	struct intel_plane *plane = to_intel_plane(_plane);

	struct intel_display *display = to_intel_display(plane);

	struct intel_plane_state *new_plane_state =
@@ -1221,8 +1219,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane, 
		goto unpin_fb;



	if (new_plane_state->uapi.fence) {

		i915_gem_fence_wait_priority(new_plane_state->uapi.fence,

					     &attr);

		i915_gem_fence_wait_priority_display(new_plane_state->uapi.fence);



		intel_display_rps_boost_after_vblank(new_plane_state->hw.crtc,

						     new_plane_state->uapi.fence);

drivers/gpu/drm/i915/gem/i915_gem_object.h

+1 −0
Original line number Diff line number Diff line
@@ -802,6 +802,7 @@ static inline void __start_cpu_write(struct drm_i915_gem_object *obj) 


void i915_gem_fence_wait_priority(struct dma_fence *fence,

				  const struct i915_sched_attr *attr);

void i915_gem_fence_wait_priority_display(struct dma_fence *fence);



int i915_gem_object_wait(struct drm_i915_gem_object *obj,

			 unsigned int flags,

drivers/gpu/drm/i915/gem/i915_gem_wait.c

+7 −0
Original line number Diff line number Diff line
@@ -138,6 +138,13 @@ void i915_gem_fence_wait_priority(struct dma_fence *fence, 
	local_bh_enable(); /* kick the tasklets if queues were reprioritised */

}



void i915_gem_fence_wait_priority_display(struct dma_fence *fence)

{

	struct i915_sched_attr attr = { .priority = I915_PRIORITY_DISPLAY };



	i915_gem_fence_wait_priority(fence, &attr);

}



int

i915_gem_object_wait_priority(struct drm_i915_gem_object *obj,

			      unsigned int flags,

drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h

+1 −3
Original line number Diff line number Diff line
@@ -5,10 +5,8 @@ 
#define __I915_GEM_OBJECT_H__



struct dma_fence;

struct i915_sched_attr;



static inline void i915_gem_fence_wait_priority(struct dma_fence *fence,

						const struct i915_sched_attr *attr)

static inline void i915_gem_fence_wait_priority_display(struct dma_fence *fence)

{

}

drivers/gpu/drm/xe/compat-i915-headers/i915_scheduler_types.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/* Copyright © 2025 Intel Corporation */



#ifndef __I915_SCHEDULER_TYPES_H__

#define __I915_SCHEDULER_TYPES_H__



#define I915_PRIORITY_DISPLAY 0



struct i915_sched_attr {

	int priority;

};



#endif