mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 06:44:00 -04:00
77fcf58df1
Clearing the DP tunnel stream BW in the atomic state involves getting the tunnel group state, which can fail. Handle the error accordingly. This fixes at least one issue where drm_dp_tunnel_atomic_set_stream_bw() failed to get the tunnel group state returning -EDEADLK, which wasn't handled. This lead to the ctx->contended warn later in modeset_lock() while taking a WW mutex for another object in the same atomic state, and thus within the same already contended WW context. Moving intel_crtc_state_alloc() later would avoid freeing saved_state on the error path; this stable patch leaves that simplification for a follow-up. Cc: Uma Shankar <uma.shankar@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: <stable@vger.kernel.org> # v6.9+ Fixes:a4efae87ec("drm/i915/dp: Compute DP tunnel BW during encoder state computation") Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/7617 Reviewed-by: Michał Grzelak <michal.grzelak@intel.com> Reviewed-by: Uma Shankar <uma.shankar@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Link: https://patch.msgid.link/20260320092900.13210-1-imre.deak@intel.com (cherry picked from commitfb69d0076e) Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
137 lines
3.9 KiB
C
137 lines
3.9 KiB
C
/* SPDX-License-Identifier: MIT */
|
|
/*
|
|
* Copyright © 2023 Intel Corporation
|
|
*/
|
|
|
|
#ifndef __INTEL_DP_TUNNEL_H__
|
|
#define __INTEL_DP_TUNNEL_H__
|
|
|
|
#include <linux/errno.h>
|
|
#include <linux/types.h>
|
|
|
|
struct drm_connector_state;
|
|
struct drm_modeset_acquire_ctx;
|
|
struct intel_atomic_state;
|
|
struct intel_connector;
|
|
struct intel_crtc;
|
|
struct intel_crtc_state;
|
|
struct intel_display;
|
|
struct intel_dp;
|
|
struct intel_encoder;
|
|
struct intel_link_bw_limits;
|
|
|
|
#if (IS_ENABLED(CONFIG_DRM_I915_DP_TUNNEL) && defined(I915)) || \
|
|
(IS_ENABLED(CONFIG_DRM_XE_DP_TUNNEL) && !defined(I915))
|
|
|
|
int intel_dp_tunnel_detect(struct intel_dp *intel_dp, struct drm_modeset_acquire_ctx *ctx);
|
|
void intel_dp_tunnel_disconnect(struct intel_dp *intel_dp);
|
|
void intel_dp_tunnel_destroy(struct intel_dp *intel_dp);
|
|
void intel_dp_tunnel_resume(struct intel_dp *intel_dp,
|
|
const struct intel_crtc_state *crtc_state,
|
|
bool dpcd_updated);
|
|
void intel_dp_tunnel_suspend(struct intel_dp *intel_dp);
|
|
|
|
bool intel_dp_tunnel_bw_alloc_is_enabled(struct intel_dp *intel_dp);
|
|
|
|
void
|
|
intel_dp_tunnel_atomic_cleanup_inherited_state(struct intel_atomic_state *state);
|
|
|
|
int intel_dp_tunnel_atomic_compute_stream_bw(struct intel_atomic_state *state,
|
|
struct intel_dp *intel_dp,
|
|
const struct intel_connector *connector,
|
|
struct intel_crtc_state *crtc_state);
|
|
int intel_dp_tunnel_atomic_clear_stream_bw(struct intel_atomic_state *state,
|
|
struct intel_crtc_state *crtc_state);
|
|
|
|
int intel_dp_tunnel_atomic_add_state_for_crtc(struct intel_atomic_state *state,
|
|
struct intel_crtc *crtc);
|
|
int intel_dp_tunnel_atomic_check_link(struct intel_atomic_state *state,
|
|
struct intel_link_bw_limits *limits);
|
|
int intel_dp_tunnel_atomic_check_state(struct intel_atomic_state *state,
|
|
struct intel_dp *intel_dp,
|
|
struct intel_connector *connector);
|
|
|
|
void intel_dp_tunnel_atomic_alloc_bw(struct intel_atomic_state *state);
|
|
|
|
int intel_dp_tunnel_mgr_init(struct intel_display *display);
|
|
void intel_dp_tunnel_mgr_cleanup(struct intel_display *display);
|
|
|
|
#else
|
|
|
|
static inline int
|
|
intel_dp_tunnel_detect(struct intel_dp *intel_dp, struct drm_modeset_acquire_ctx *ctx)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline void intel_dp_tunnel_disconnect(struct intel_dp *intel_dp) {}
|
|
static inline void intel_dp_tunnel_destroy(struct intel_dp *intel_dp) {}
|
|
static inline void intel_dp_tunnel_resume(struct intel_dp *intel_dp,
|
|
const struct intel_crtc_state *crtc_state,
|
|
bool dpcd_updated) {}
|
|
static inline void intel_dp_tunnel_suspend(struct intel_dp *intel_dp) {}
|
|
|
|
static inline bool intel_dp_tunnel_bw_alloc_is_enabled(struct intel_dp *intel_dp)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static inline void
|
|
intel_dp_tunnel_atomic_cleanup_inherited_state(struct intel_atomic_state *state) {}
|
|
|
|
static inline int
|
|
intel_dp_tunnel_atomic_compute_stream_bw(struct intel_atomic_state *state,
|
|
struct intel_dp *intel_dp,
|
|
const struct intel_connector *connector,
|
|
struct intel_crtc_state *crtc_state)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
intel_dp_tunnel_atomic_clear_stream_bw(struct intel_atomic_state *state,
|
|
struct intel_crtc_state *crtc_state)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
intel_dp_tunnel_atomic_add_state_for_crtc(struct intel_atomic_state *state,
|
|
struct intel_crtc *crtc)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
intel_dp_tunnel_atomic_check_link(struct intel_atomic_state *state,
|
|
struct intel_link_bw_limits *limits)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
intel_dp_tunnel_atomic_check_state(struct intel_atomic_state *state,
|
|
struct intel_dp *intel_dp,
|
|
struct intel_connector *connector)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
intel_dp_tunnel_atomic_alloc_bw(struct intel_atomic_state *state)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
intel_dp_tunnel_mgr_init(struct intel_display *display)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void intel_dp_tunnel_mgr_cleanup(struct intel_display *display) {}
|
|
|
|
#endif /* CONFIG_DRM_I915_DP_TUNNEL || CONFIG_DRM_XE_DP_TUNNEL */
|
|
|
|
#endif /* __INTEL_DP_TUNNEL_H__ */
|