d59be579fa
mdp5_get_global_state runs the risk of hitting a -EDEADLK when acquiring
the modeset lock, but currently mdp5_pipe_release doesn't check for if
an error is returned. Because of this, there is a possibility of
mdp5_pipe_release hitting a NULL dereference error.
To avoid this, let's have mdp5_pipe_release check if
mdp5_get_global_state returns an error and propogate that error.
Changes since v1:
- Separated declaration and initialization of *new_state to avoid
compiler warning
- Fixed some spelling mistakes in commit message
Changes since v2:
- Return 0 in case where hwpipe is NULL as this is considered normal
behavior
- Added 2nd patch in series to fix a similar NULL dereference issue in
mdp5_mixer_release
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/485179/
Link: https://lore.kernel.org/r/20220505214051.155-1-quic_jesszhan@quicinc.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
46 lines
1.2 KiB
C
46 lines
1.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright (C) 2016 Red Hat
|
|
* Author: Rob Clark <robdclark@gmail.com>
|
|
*/
|
|
|
|
#ifndef __MDP5_PIPE_H__
|
|
#define __MDP5_PIPE_H__
|
|
|
|
/* TODO: Add SSPP_MAX in mdp5.xml.h */
|
|
#define SSPP_MAX (SSPP_CURSOR1 + 1)
|
|
|
|
/* represents a hw pipe, which is dynamically assigned to a plane */
|
|
struct mdp5_hw_pipe {
|
|
int idx;
|
|
|
|
const char *name;
|
|
enum mdp5_pipe pipe;
|
|
|
|
uint32_t reg_offset;
|
|
uint32_t caps;
|
|
|
|
uint32_t flush_mask; /* used to commit pipe registers */
|
|
|
|
/* number of smp blocks per plane, ie:
|
|
* nblks_y | (nblks_u << 8) | (nblks_v << 16)
|
|
*/
|
|
uint32_t blkcfg;
|
|
};
|
|
|
|
/* global atomic state of assignment between pipes and planes: */
|
|
struct mdp5_hw_pipe_state {
|
|
struct drm_plane *hwpipe_to_plane[SSPP_MAX];
|
|
};
|
|
|
|
int mdp5_pipe_assign(struct drm_atomic_state *s, struct drm_plane *plane,
|
|
uint32_t caps, uint32_t blkcfg,
|
|
struct mdp5_hw_pipe **hwpipe,
|
|
struct mdp5_hw_pipe **r_hwpipe);
|
|
int mdp5_pipe_release(struct drm_atomic_state *s, struct mdp5_hw_pipe *hwpipe);
|
|
|
|
struct mdp5_hw_pipe *mdp5_pipe_init(enum mdp5_pipe pipe,
|
|
uint32_t reg_offset, uint32_t caps);
|
|
void mdp5_pipe_destroy(struct mdp5_hw_pipe *hwpipe);
|
|
|
|
#endif /* __MDP5_PIPE_H__ */
|