diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:31:53 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:31:53 +0000 |
| commit | c5833b96030f9e06cf7c19dd4f99d3b55985eb8c (patch) | |
| tree | 9587bb407acebb17bbd8a33d2d9c53ecbe1ab442 /drivers/gpu/drm/nouveau/nouveau_display.c | |
| parent | 78c39820dc30c73f5b69c3fe2269ad9b0840a61a (diff) | |
| parent | b766b14a48de577e5060e4d8762f1e4a34229d2b (diff) | |
Merge tag 'v4.4.124' into linux-linaro-lsk-v4.4lsk-v4.4-18.03
This is the 4.4.124 stable release
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 00de1bf81519..9dfc2471ea09 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -104,7 +104,7 @@ nouveau_display_scanoutpos_head(struct drm_crtc *crtc, int *vpos, int *hpos, }; struct nouveau_display *disp = nouveau_display(crtc->dev); struct drm_vblank_crtc *vblank = &crtc->dev->vblank[drm_crtc_index(crtc)]; - int ret, retry = 1; + int ret, retry = 20; do { ret = nvif_mthd(&disp->disp, 0, &args, sizeof(args)); |