diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-07 08:12:39 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-07 08:12:39 +0100 |
| commit | 1d8bb9be35508b62a6f6d0d792fa29568710a2a9 (patch) | |
| tree | f77f02aea8e21522c6b0865916d2bfab4cdf19f5 /drivers/video | |
| parent | 3d565eac1c01ed9c50951bd0c097c32e2e650a45 (diff) | |
| parent | 113677818502a071aeaddffd0b64dce3dcab220d (diff) | |
| download | barebox-1d8bb9be35508b62a6f6d0d792fa29568710a2a9.tar.gz barebox-1d8bb9be35508b62a6f6d0d792fa29568710a2a9.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/imx-ipu-v3/imx-pd.c | 2 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/ipu-di.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/imx-ipu-v3/imx-pd.c b/drivers/video/imx-ipu-v3/imx-pd.c index 09d8a3ae2a..601be35880 100644 --- a/drivers/video/imx-ipu-v3/imx-pd.c +++ b/drivers/video/imx-ipu-v3/imx-pd.c @@ -45,7 +45,7 @@ static int imx_pd_ioctl(struct vpl *vpl, unsigned int port, case IMX_IPU_VPL_DI_MODE: mode = data; - mode->di_clkflags = IPU_DI_CLKMODE_SYNC; + mode->di_clkflags = IPU_DI_CLKMODE_NON_FRACTIONAL; mode->bus_format = imx_pd->bus_format; return 0; diff --git a/drivers/video/imx-ipu-v3/ipu-di.c b/drivers/video/imx-ipu-v3/ipu-di.c index b6e64fe16a..b4302412e0 100644 --- a/drivers/video/imx-ipu-v3/ipu-di.c +++ b/drivers/video/imx-ipu-v3/ipu-di.c @@ -140,6 +140,7 @@ static int ipu_di_clk_calc_div(unsigned long inrate, unsigned long outrate) int div; tmp *= 16; + tmp += outrate / 2; do_div(tmp, outrate); |