diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-08 00:44:49 +0100 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-08 00:44:49 +0100 |
commit | b16d3d60b112c8cb90ebcd7ae97a5d2207d6f43c (patch) | |
tree | 9d741e4a5f1cad574a901636a8ba81f1b7fb6a41 /drivers/gpu/imx/dpu/dpu-framegen.c | |
parent | 13afff494b3380314bcbee716fed98ec8a802a78 (diff) | |
parent | 860ec89b125a6d90729fec87262ebc6596428efe (diff) |
Merge tag 'rel_imx_4.14.98_2.3.1_patch' into 4.14-2.3.x-imx
Diffstat (limited to 'drivers/gpu/imx/dpu/dpu-framegen.c')
-rw-r--r-- | drivers/gpu/imx/dpu/dpu-framegen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/imx/dpu/dpu-framegen.c b/drivers/gpu/imx/dpu/dpu-framegen.c index fc445abb7932..9b91cf4e95dd 100644 --- a/drivers/gpu/imx/dpu/dpu-framegen.c +++ b/drivers/gpu/imx/dpu/dpu-framegen.c @@ -543,7 +543,7 @@ EXPORT_SYMBOL_GPL(framegen_read_timestamp); void framegen_wait_for_frame_counter_moving(struct dpu_framegen *fg) { u32 frame_index, line_index, last_frame_index; - unsigned long timeout = jiffies + msecs_to_jiffies(50); + unsigned long timeout = jiffies + msecs_to_jiffies(100); framegen_read_timestamp(fg, &frame_index, &line_index); do { |