mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
0f2ab6a773
Observe that i915->irq_lock is no longer used to protect anything outside of display. Make it a display thing. This allows us to remove the ugly #define irq_lock irq.lock hack from xe compat header. Note that this is slightly more subtle than it first looks. For i915, there's no functional change here. The lock is moved. However, for xe, we'll now have *two* locks, xe->irq.lock and display->irq.lock. These should protect different things, though. Indeed, nesting in the past would've lead to a deadlock because they were the same lock. With the i915 references gone, we can make a handful more files independent of i915_drv.h. Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com> Link: https://lore.kernel.org/r/6d8d2ce0f34a9c7361a5e2fcf96bb32a34c57e76.1746536745.git.jani.nikula@intel.com [Jani: Fixed a comment while applying.] Signed-off-by: Jani Nikula <jani.nikula@intel.com>
107 lines
2.4 KiB
C
107 lines
2.4 KiB
C
// SPDX-License-Identifier: MIT
|
|
/*
|
|
* Copyright © 2023 Intel Corporation
|
|
*/
|
|
|
|
#include <drm/drm_crtc.h>
|
|
#include <drm/drm_vblank.h>
|
|
|
|
#include "gt/intel_rps.h"
|
|
#include "i915_drv.h"
|
|
#include "i915_reg.h"
|
|
#include "intel_display_irq.h"
|
|
#include "intel_display_rps.h"
|
|
#include "intel_display_types.h"
|
|
|
|
struct wait_rps_boost {
|
|
struct wait_queue_entry wait;
|
|
|
|
struct drm_crtc *crtc;
|
|
struct i915_request *request;
|
|
};
|
|
|
|
static int do_rps_boost(struct wait_queue_entry *_wait,
|
|
unsigned mode, int sync, void *key)
|
|
{
|
|
struct wait_rps_boost *wait = container_of(_wait, typeof(*wait), wait);
|
|
struct i915_request *rq = wait->request;
|
|
|
|
/*
|
|
* If we missed the vblank, but the request is already running it
|
|
* is reasonable to assume that it will complete before the next
|
|
* vblank without our intervention, so leave RPS alone.
|
|
*/
|
|
if (!i915_request_started(rq))
|
|
intel_rps_boost(rq);
|
|
i915_request_put(rq);
|
|
|
|
drm_crtc_vblank_put(wait->crtc);
|
|
|
|
list_del(&wait->wait.entry);
|
|
kfree(wait);
|
|
return 1;
|
|
}
|
|
|
|
void intel_display_rps_boost_after_vblank(struct drm_crtc *crtc,
|
|
struct dma_fence *fence)
|
|
{
|
|
struct wait_rps_boost *wait;
|
|
|
|
if (!dma_fence_is_i915(fence))
|
|
return;
|
|
|
|
if (DISPLAY_VER(to_i915(crtc->dev)) < 6)
|
|
return;
|
|
|
|
if (drm_crtc_vblank_get(crtc))
|
|
return;
|
|
|
|
wait = kmalloc(sizeof(*wait), GFP_KERNEL);
|
|
if (!wait) {
|
|
drm_crtc_vblank_put(crtc);
|
|
return;
|
|
}
|
|
|
|
wait->request = to_request(dma_fence_get(fence));
|
|
wait->crtc = crtc;
|
|
|
|
wait->wait.func = do_rps_boost;
|
|
wait->wait.flags = 0;
|
|
|
|
add_wait_queue(drm_crtc_vblank_waitqueue(crtc), &wait->wait);
|
|
}
|
|
|
|
void intel_display_rps_mark_interactive(struct intel_display *display,
|
|
struct intel_atomic_state *state,
|
|
bool interactive)
|
|
{
|
|
struct drm_i915_private *i915 = to_i915(display->drm);
|
|
|
|
if (state->rps_interactive == interactive)
|
|
return;
|
|
|
|
intel_rps_mark_interactive(&to_gt(i915)->rps, interactive);
|
|
state->rps_interactive = interactive;
|
|
}
|
|
|
|
void ilk_display_rps_enable(struct intel_display *display)
|
|
{
|
|
spin_lock(&display->irq.lock);
|
|
ilk_enable_display_irq(display, DE_PCU_EVENT);
|
|
spin_unlock(&display->irq.lock);
|
|
}
|
|
|
|
void ilk_display_rps_disable(struct intel_display *display)
|
|
{
|
|
spin_lock(&display->irq.lock);
|
|
ilk_disable_display_irq(display, DE_PCU_EVENT);
|
|
spin_unlock(&display->irq.lock);
|
|
}
|
|
|
|
void ilk_display_rps_irq_handler(struct intel_display *display)
|
|
{
|
|
struct drm_i915_private *i915 = to_i915(display->drm);
|
|
|
|
gen5_rps_irq_handler(&to_gt(i915)->rps);
|
|
}
|