ca75f6f7c6
There is a possibility for mdp5_get_global_state to return
-EDEADLK when acquiring the modeset lock, but currently global_state in
mdp5_mixer_release doesn't check for if an error is returned.
To avoid a NULL dereference error, let's have mdp5_mixer_release
check if an error is returned and propagate that error.
Reported-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com>
Fixes: 7907a0d77c ("drm/msm/mdp5: Use the new private_obj state")
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/485181/
Link: https://lore.kernel.org/r/20220505214051.155-2-quic_jesszhan@quicinc.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
36 lines
989 B
C
36 lines
989 B
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright (C) 2017 The Linux Foundation. All rights reserved.
|
|
*/
|
|
|
|
#ifndef __MDP5_LM_H__
|
|
#define __MDP5_LM_H__
|
|
|
|
/* represents a hw Layer Mixer, one (or more) is dynamically assigned to a crtc */
|
|
struct mdp5_hw_mixer {
|
|
int idx;
|
|
|
|
const char *name;
|
|
|
|
int lm; /* the LM instance # */
|
|
uint32_t caps;
|
|
int pp;
|
|
int dspp;
|
|
|
|
uint32_t flush_mask; /* used to commit LM registers */
|
|
};
|
|
|
|
/* global atomic state of assignment between CRTCs and Layer Mixers: */
|
|
struct mdp5_hw_mixer_state {
|
|
struct drm_crtc *hwmixer_to_crtc[8];
|
|
};
|
|
|
|
struct mdp5_hw_mixer *mdp5_mixer_init(const struct mdp5_lm_instance *lm);
|
|
void mdp5_mixer_destroy(struct mdp5_hw_mixer *lm);
|
|
int mdp5_mixer_assign(struct drm_atomic_state *s, struct drm_crtc *crtc,
|
|
uint32_t caps, struct mdp5_hw_mixer **mixer,
|
|
struct mdp5_hw_mixer **r_mixer);
|
|
int mdp5_mixer_release(struct drm_atomic_state *s,
|
|
struct mdp5_hw_mixer *mixer);
|
|
|
|
#endif /* __MDP5_LM_H__ */
|