It's possible for users to try to duplicate the CRTC state even when the state doesn't exist. drm_atomic_helper_crtc_duplicate_state() (and other users of __drm_atomic_helper_crtc_duplicate_state()) already guard this with a WARN_ON() instead of crashing, so let's do that here too.
Signed-off-by: Brian Norris briannorris@chromium.org ---
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 74562d40f639..daf192881353 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1570,6 +1570,9 @@ static struct drm_crtc_state *vop_crtc_duplicate_state(struct drm_crtc *crtc) { struct rockchip_crtc_state *rockchip_state;
+ if (WARN_ON(!crtc->state)) + return NULL; + rockchip_state = kzalloc(sizeof(*rockchip_state), GFP_KERNEL); if (!rockchip_state) return NULL;
On Fri, Jun 17, 2022 at 05:26:52PM -0700, Brian Norris wrote:
It's possible for users to try to duplicate the CRTC state even when the state doesn't exist. drm_atomic_helper_crtc_duplicate_state() (and other users of __drm_atomic_helper_crtc_duplicate_state()) already guard this with a WARN_ON() instead of crashing, so let's do that here too.
Signed-off-by: Brian Norris briannorris@chromium.org
Thanks for this patch!
Reviewed-by: Sean Paul seanpaul@chromium.org
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 74562d40f639..daf192881353 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1570,6 +1570,9 @@ static struct drm_crtc_state *vop_crtc_duplicate_state(struct drm_crtc *crtc) { struct rockchip_crtc_state *rockchip_state;
- if (WARN_ON(!crtc->state))
return NULL;- rockchip_state = kzalloc(sizeof(*rockchip_state), GFP_KERNEL); if (!rockchip_state) return NULL;
-- 2.36.1.476.g0c4daa206d-goog
Hi,
On Fri, Jun 17, 2022 at 5:27 PM Brian Norris briannorris@chromium.org wrote:
It's possible for users to try to duplicate the CRTC state even when the state doesn't exist. drm_atomic_helper_crtc_duplicate_state() (and other users of __drm_atomic_helper_crtc_duplicate_state()) already guard this with a WARN_ON() instead of crashing, so let's do that here too.
Signed-off-by: Brian Norris briannorris@chromium.org
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +++ 1 file changed, 3 insertions(+)
I'm not an expert in this area, but it makes sense to me to match drm_atomic_helper_crtc_duplicate_state() in this way. Thus:
Reviewed-by: Douglas Anderson dianders@chromium.org
I would tend to assume that this would be landed in drm-misc by Heiko if he's good with it. After several weeks of silence, however, I'll commit it myself.
-Doug
Am Freitag, 24. Juni 2022, 01:44:52 CEST schrieb Doug Anderson:
Hi,
On Fri, Jun 17, 2022 at 5:27 PM Brian Norris briannorris@chromium.org wrote:
It's possible for users to try to duplicate the CRTC state even when the state doesn't exist. drm_atomic_helper_crtc_duplicate_state() (and other users of __drm_atomic_helper_crtc_duplicate_state()) already guard this with a WARN_ON() instead of crashing, so let's do that here too.
Signed-off-by: Brian Norris briannorris@chromium.org
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +++ 1 file changed, 3 insertions(+)
I'm not an expert in this area, but it makes sense to me to match drm_atomic_helper_crtc_duplicate_state() in this way. Thus:
Reviewed-by: Douglas Anderson dianders@chromium.org
I would tend to assume that this would be landed in drm-misc by Heiko if he's good with it. After several weeks of silence, however, I'll commit it myself.
I do tend to batch up drm-misc patches, as that is always a different workflow but I'll pick that up :-)
The interesting question would be, do we want some fixes tag for it?
Heiko
dri-devel@lists.freedesktop.org
-
Brian Norris -
Doug Anderson -
Heiko Stuebner -
Sean Paul