diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-05-14 16:32:20 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-14 16:32:21 +1000 |
| commit | 2989b3ced370aa8e23e572c9ecaa7404d96e1c7a (patch) | |
| tree | 958688eca0946ae117f540e7757096e300d78ba6 /drivers/gpu/drm | |
| parent | 8eb008c80841e3410ef2c043093478ea36bb5ff1 (diff) | |
| parent | a88ad3ded15daa0389106779c60b8a5e76d4b20a (diff) | |
Merge tag 'tilcdc-4.18' of https://github.com/jsarha/linux into drm-next
tilcdc v4.18 pull request
Signed-off-by: Dave 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
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c index 1b278a22c8b7..1067e702c22c 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c @@ -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 |