* [PATCH] drm/mediatek: Check return value of mtk_drm_ddp_comp_for_plane.
@ 2019-11-18 6:18 Pi-Hsun Shih
2019-11-22 7:58 ` CK Hu
0 siblings, 1 reply; 3+ messages in thread
From: Pi-Hsun Shih @ 2019-11-18 6:18 UTC (permalink / raw)
Cc: Philipp Zabel, David Airlie,
moderated list:ARM/Mediatek SoC support, open list,
open list:DRM DRIVERS FOR MEDIATEK, Matthias Brugger,
Pi-Hsun Shih, Daniel Vetter, CK Hu, Sean Paul,
moderated list:ARM/Mediatek SoC support
The mtk_drm_ddp_comp_for_plane can return NULL, but the usage doesn't
check for it. Add check for it.
Fixes: d6b53f68356f ("drm/mediatek: Add helper to get component for a plane")
Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org>
---
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index f80a8ba75977..4c4f976c994e 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -310,7 +310,9 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
plane_state = to_mtk_plane_state(plane->state);
comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer);
- mtk_ddp_comp_layer_config(comp, local_layer, plane_state);
+ if (comp)
+ mtk_ddp_comp_layer_config(comp, local_layer,
+ plane_state);
}
return 0;
@@ -386,8 +388,9 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc)
comp = mtk_drm_ddp_comp_for_plane(crtc, plane,
&local_layer);
- mtk_ddp_comp_layer_config(comp, local_layer,
- plane_state);
+ if (comp)
+ mtk_ddp_comp_layer_config(comp, local_layer,
+ plane_state);
plane_state->pending.config = false;
}
mtk_crtc->pending_planes = false;
@@ -401,7 +404,9 @@ int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,
struct mtk_ddp_comp *comp;
comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer);
- return mtk_ddp_comp_layer_check(comp, local_layer, state);
+ if (comp)
+ return mtk_ddp_comp_layer_check(comp, local_layer, state);
+ return 0;
}
static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
base-commit: 5a6fcbeabe3e20459ed8504690b2515dacc5246f
--
2.24.0.432.g9d3f5f5b63-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/mediatek: Check return value of mtk_drm_ddp_comp_for_plane.
2019-11-18 6:18 [PATCH] drm/mediatek: Check return value of mtk_drm_ddp_comp_for_plane Pi-Hsun Shih
@ 2019-11-22 7:58 ` CK Hu
2019-12-12 4:48 ` CK Hu
0 siblings, 1 reply; 3+ messages in thread
From: CK Hu @ 2019-11-22 7:58 UTC (permalink / raw)
To: Pi-Hsun Shih
Cc: Philipp Zabel, David Airlie, open list,
open list:DRM DRIVERS FOR MEDIATEK, Sean Paul, Daniel Vetter,
Matthias Brugger, moderated list:ARM/Mediatek SoC support,
moderated list:ARM/Mediatek SoC support
Hi, Pi-Hsun:
On Mon, 2019-11-18 at 14:18 +0800, Pi-Hsun Shih wrote:
> The mtk_drm_ddp_comp_for_plane can return NULL, but the usage doesn't
> check for it. Add check for it.
Reviewed-by: CK Hu <ck.hu@mediatek.com>
>
> Fixes: d6b53f68356f ("drm/mediatek: Add helper to get component for a plane")
> Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org>
> ---
> drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index f80a8ba75977..4c4f976c994e 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -310,7 +310,9 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
>
> plane_state = to_mtk_plane_state(plane->state);
> comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer);
> - mtk_ddp_comp_layer_config(comp, local_layer, plane_state);
> + if (comp)
> + mtk_ddp_comp_layer_config(comp, local_layer,
> + plane_state);
> }
>
> return 0;
> @@ -386,8 +388,9 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc)
> comp = mtk_drm_ddp_comp_for_plane(crtc, plane,
> &local_layer);
>
> - mtk_ddp_comp_layer_config(comp, local_layer,
> - plane_state);
> + if (comp)
> + mtk_ddp_comp_layer_config(comp, local_layer,
> + plane_state);
> plane_state->pending.config = false;
> }
> mtk_crtc->pending_planes = false;
> @@ -401,7 +404,9 @@ int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,
> struct mtk_ddp_comp *comp;
>
> comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer);
> - return mtk_ddp_comp_layer_check(comp, local_layer, state);
> + if (comp)
> + return mtk_ddp_comp_layer_check(comp, local_layer, state);
> + return 0;
> }
>
> static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
>
> base-commit: 5a6fcbeabe3e20459ed8504690b2515dacc5246f
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/mediatek: Check return value of mtk_drm_ddp_comp_for_plane.
2019-11-22 7:58 ` CK Hu
@ 2019-12-12 4:48 ` CK Hu
0 siblings, 0 replies; 3+ messages in thread
From: CK Hu @ 2019-12-12 4:48 UTC (permalink / raw)
To: Pi-Hsun Shih
Cc: Philipp Zabel, David Airlie, open list,
open list:DRM DRIVERS FOR MEDIATEK, Sean Paul, Daniel Vetter,
Matthias Brugger, moderated list:ARM/Mediatek SoC support,
moderated list:ARM/Mediatek SoC support
Hi, Pi-Hsun:
On Fri, 2019-11-22 at 15:58 +0800, CK Hu wrote:
> Hi, Pi-Hsun:
>
> On Mon, 2019-11-18 at 14:18 +0800, Pi-Hsun Shih wrote:
> > The mtk_drm_ddp_comp_for_plane can return NULL, but the usage doesn't
> > check for it. Add check for it.
>
> Reviewed-by: CK Hu <ck.hu@mediatek.com>
>
Applied to mediatek-drm-fixes-5.5 [1], thanks.
[1]
https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-fixes-5.5
Regards,
CK
> >
> > Fixes: d6b53f68356f ("drm/mediatek: Add helper to get component for a plane")
> > Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org>
> > ---
> > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 13 +++++++++----
> > 1 file changed, 9 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > index f80a8ba75977..4c4f976c994e 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > @@ -310,7 +310,9 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
> >
> > plane_state = to_mtk_plane_state(plane->state);
> > comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer);
> > - mtk_ddp_comp_layer_config(comp, local_layer, plane_state);
> > + if (comp)
> > + mtk_ddp_comp_layer_config(comp, local_layer,
> > + plane_state);
> > }
> >
> > return 0;
> > @@ -386,8 +388,9 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc)
> > comp = mtk_drm_ddp_comp_for_plane(crtc, plane,
> > &local_layer);
> >
> > - mtk_ddp_comp_layer_config(comp, local_layer,
> > - plane_state);
> > + if (comp)
> > + mtk_ddp_comp_layer_config(comp, local_layer,
> > + plane_state);
> > plane_state->pending.config = false;
> > }
> > mtk_crtc->pending_planes = false;
> > @@ -401,7 +404,9 @@ int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,
> > struct mtk_ddp_comp *comp;
> >
> > comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer);
> > - return mtk_ddp_comp_layer_check(comp, local_layer, state);
> > + if (comp)
> > + return mtk_ddp_comp_layer_check(comp, local_layer, state);
> > + return 0;
> > }
> >
> > static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
> >
> > base-commit: 5a6fcbeabe3e20459ed8504690b2515dacc5246f
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-12 4:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-18 6:18 [PATCH] drm/mediatek: Check return value of mtk_drm_ddp_comp_for_plane Pi-Hsun Shih
2019-11-22 7:58 ` CK Hu
2019-12-12 4:48 ` CK Hu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox