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

Commit 02bbc4dc authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-atmel-hlcdc/fixes-for-4.2' of... 

Merge tag 'drm-atmel-hlcdc/fixes-for-4.2' of https://github.com/bbrezillon/linux-at91 into drm-fixes

single hlcdc fix.

* tag 'drm-atmel-hlcdc/fixes-for-4.2' of https://github.com/bbrezillon/linux-at91:
  drm: atmel-hlcdc: fix vblank initial state
parents b37b425f 8c4b4b0d

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);