Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c4b4b0d authored by Boris Brezillon's avatar Boris Brezillon
Browse files

drm: atmel-hlcdc: fix vblank initial state 



drm_vblank_on() now warns on nested use or if vblank is not properly
initialized. This patch fixes Atmel HLCDC vblank initial state.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Reported-by: default avatarSylvain Rochet <sylvain.rochet@finsecur.com>
parent e9308884

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

+1 −0
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ int atmel_hlcdc_crtc_create(struct drm_device *dev) 
		planes->overlays[i]->base.possible_crtcs = 1 << crtc->id;



	drm_crtc_helper_add(&crtc->base, &lcdc_crtc_helper_funcs);

	drm_crtc_vblank_reset(&crtc->base);



	dc->crtc = &crtc->base;

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c

+6 −6
Original line number Diff line number Diff line
@@ -313,20 +313,20 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev) 


	pm_runtime_enable(dev->dev);



	ret = atmel_hlcdc_dc_modeset_init(dev);

	ret = drm_vblank_init(dev, 1);

	if (ret < 0) {

		dev_err(dev->dev, "failed to initialize mode setting\n");

		dev_err(dev->dev, "failed to initialize vblank\n");

		goto err_periph_clk_disable;

	}



	drm_mode_config_reset(dev);



	ret = drm_vblank_init(dev, 1);

	ret = atmel_hlcdc_dc_modeset_init(dev);

	if (ret < 0) {

		dev_err(dev->dev, "failed to initialize vblank\n");

		dev_err(dev->dev, "failed to initialize mode setting\n");

		goto err_periph_clk_disable;

	}



	drm_mode_config_reset(dev);



	pm_runtime_get_sync(dev->dev);

	ret = drm_irq_install(dev, dc->hlcdc->irq);

	pm_runtime_put_sync(dev->dev);