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

Commit 2989b3ce authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'tilcdc-4.18' of https://github.com/jsarha/linux into drm-next 



tilcdc v4.18 pull request

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

# gpg: Signature made Thu 10 May 2018 03:30:33 AM AEST
# gpg:                using RSA key 9036B350D7D61941
# gpg: Can't check signature: public key not found
Link: https://patchwork.freedesktop.org/patch/msgid/2502349c-87fd-57e8-d950-835ffb6c449f@ti.com
parents 8eb008c8 a88ad3de

drivers/gpu/drm/tilcdc/tilcdc_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static void tilcdc_crtc_set_clk(struct drm_crtc *crtc) 


	ret = clk_set_rate(priv->clk, req_rate * clkdiv);

	clk_rate = clk_get_rate(priv->clk);

	if (ret < 0) {

	if (ret < 0 || tilcdc_pclk_diff(req_rate, clk_rate) > 5) {

		/*

		 * If we fail to set the clock rate (some architectures don't

		 * use the common clock framework yet and may not implement