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

Commit 0a1fe1b7 authored by Jyri Sarha's avatar Jyri Sarha
Browse files

drm/tilcdc: Make tilcdc_crtc_page_flip() work if crtc is not yet on 



Make tilcdc_crtc_page_flip() work if crtc is not yet on. The plane
commit sometimes comes before crtc is turned on. The new framebuffer
should be set to scanout also in that case, so that it is there when
crtc is turned on at the end of the commit phase.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
parent 8c65abb9

drivers/gpu/drm/tilcdc/tilcdc_crtc.c

+13 −8
Original line number Diff line number Diff line
@@ -174,8 +174,6 @@ int tilcdc_crtc_page_flip(struct drm_crtc *crtc, 
	struct drm_device *dev = crtc->dev;

	int r;

	unsigned long flags;

	s64 tdiff;

	ktime_t next_vblank;



	r = tilcdc_verify_fb(crtc, fb);

	if (r)
@@ -194,15 +192,21 @@ int tilcdc_crtc_page_flip(struct drm_crtc *crtc, 


	spin_lock_irqsave(&tilcdc_crtc->irq_lock, flags);



	if (crtc->hwmode.vrefresh && ktime_to_ns(tilcdc_crtc->last_vblank)) {

		ktime_t next_vblank;

		s64 tdiff;



		next_vblank = ktime_add_us(tilcdc_crtc->last_vblank,

			1000000 / crtc->hwmode.vrefresh);



		tdiff = ktime_to_us(ktime_sub(next_vblank, ktime_get()));



	if (tdiff >= TILCDC_VBLANK_SAFETY_THRESHOLD_US)

		set_scanout(crtc, fb);

	else

		if (tdiff < TILCDC_VBLANK_SAFETY_THRESHOLD_US)

			tilcdc_crtc->next_fb = fb;

	}



	if (tilcdc_crtc->next_fb != fb)

		set_scanout(crtc, fb);



	tilcdc_crtc->event = event;
@@ -248,6 +252,7 @@ void tilcdc_crtc_dpms(struct drm_crtc *crtc, int mode) 
		}



		drm_flip_work_commit(&tilcdc_crtc->unref_work, priv->wq);

		tilcdc_crtc->last_vblank = ktime_set(0, 0);

	}

}