On Wed, Oct 26, 2016 at 5:31 AM, Magnus Damm <magnus.damm@xxxxxxxxx> wrote:
> From: Magnus Damm <damm+renesas@xxxxxxxxxxxxx>
>
> For the DU to operate on R-Car Gen3 hardware a combination of DU
> and VSP devices are required. Since the DU driver also supports
> earlier generations hardware the VSP portion is enabled via Kconfig.
>
> The arm64 defconfig is as of v4.9-rc1 having the DU driver enabled
> as a module, however this is not enough to support R-Car Gen3. In
> the current case of CONFIG_DRM_RCAR_VSP=n then the kernel crashes
> when loading the module. This patch is fixing that particular case.
>
> In more detail, the crash triggers in drm_atomic_get_plane_state()
> when __drm_atomic_helper_set_config() passes NULL as crtc->primary.
>
> This patch corrects this issue by failing to load the DU driver on
> R-Car Gen3 when VSP is not available.
>
> Signed-off-by: Magnus Damm <damm+renesas@xxxxxxxxxxxxx>
> ---
>
> drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- 0001/drivers/gpu/drm/rcar-du/rcar_du_vsp.h
> +++ work/drivers/gpu/drm/rcar-du/rcar_du_vsp.h 2016-10-26 00:01:12.920607110 +0900
> @@ -70,7 +70,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; };
-ENODEV sounds more appropriate
> 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) { };
Alternatively, DRM_RCAR_DU can force DRM_RCAR_VSP to y if ARCH_R8A7795
or ARCH_R8A7796 is enabled.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
