| From d62aa80e6b7324dd2458fc3d4023a311ba894898 Mon Sep 17 00:00:00 2001 |
| From: Jacopo Mondi <jacopo+renesas@jmondi.org> |
| Date: Fri, 3 Mar 2017 13:58:56 +0100 |
| Subject: [PATCH 252/286] drm: rcar-du: Make sure the VSP is initialized on |
| platforms that need it |
| |
| On Gen3 platforms planes are managed by the external VSP compositor on |
| behalf of DRM/KMS. If VSP compositor support is not enabled in the DU |
| driver, the VSP initialization stub routine is called. Return an error |
| from that stub to fail explicitly, otherwise the device won't be usable |
| and the driver will crash. |
| |
| Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org> |
| Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| [Clarified commit message] |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| |
| (cherry picked from commit 3115345577d8e8c912562a1dd555787f11fcaf06) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.h |
| +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.h |
| @@ -68,7 +68,7 @@ void rcar_du_vsp_disable(struct rcar_du_ |
| void rcar_du_vsp_atomic_begin(struct rcar_du_crtc *crtc); |
| void rcar_du_vsp_atomic_flush(struct rcar_du_crtc *crtc); |
| #else |
| -static inline int rcar_du_vsp_init(struct rcar_du_vsp *vsp) { return 0; }; |
| +static inline int rcar_du_vsp_init(struct rcar_du_vsp *vsp) { return -ENXIO; }; |
| static inline void rcar_du_vsp_enable(struct rcar_du_crtc *crtc) { }; |
| static inline void rcar_du_vsp_disable(struct rcar_du_crtc *crtc) { }; |
| static inline void rcar_du_vsp_atomic_begin(struct rcar_du_crtc *crtc) { }; |
