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

Commit 31930d4d authored by Thierry Reding's avatar Thierry Reding
Browse files

drm/tegra: dc: Reset VBLANK to off 



Upon driver load, reset the VBLANK machinery to off to reflect the
hardware state. Since the ->reset() callback is called from the initial
drm_mode_config_reset() call, move the latter after the VBLANK machinery
initialization by drm_vblank_init().

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent fb36d0ee

drivers/gpu/drm/tegra/dc.c

+2 −0
Original line number Diff line number Diff line
@@ -1015,6 +1015,8 @@ static void tegra_crtc_reset(struct drm_crtc *crtc) 
		crtc->state = &state->base;

		crtc->state->crtc = crtc;

	}



	drm_crtc_vblank_reset(crtc);

}



static struct drm_crtc_state *

drivers/gpu/drm/tegra/drm.c

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,6 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags) 
	if (err < 0)

		goto fbdev;



	drm_mode_config_reset(drm);



	/*

	 * We don't use the drm_irq_install() helpers provided by the DRM

	 * core, so we need to set this manually in order to allow the
@@ -188,6 +186,8 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags) 
	if (err < 0)

		goto device;



	drm_mode_config_reset(drm);



	err = tegra_drm_fb_init(drm);

	if (err < 0)

		goto vblank;