diff options
| author |   jsg <jsg@openbsd.org> | 2020-05-11 04:38:08 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-05-11 04:38:08 +0000 |
| commit | ccced5948b28668ed644686026b2418384bf5ba1 (patch) | |
| tree | 05ae36c077f9bc9a48f851c01f0a477f54ea211d | |
| parent | clarify role of FIDO tokens in multi-factor authentictation; (diff) | |
| download | wireguard-openbsd-ccced5948b28668ed644686026b2418384bf5ba1.tar.xz wireguard-openbsd-ccced5948b28668ed644686026b2418384bf5ba1.zip | |
drm/edid: Fix off-by-one in DispID DTD pixel clock
From Ville Syrjala
85b1efa12a7fa209e0e3e254d6ea466c8ec3d083 in linux 4.19.y/4.19.121
6292b8efe32e6be408af364132f09572aed14382 in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/drm_edid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/drm_edid.c b/sys/dev/pci/drm/drm_edid.c index ebd1792ffcd..f34e2e94f7e 100644 --- a/sys/dev/pci/drm/drm_edid.c +++ b/sys/dev/pci/drm/drm_edid.c @@ -4712,7 +4712,7 @@ static struct drm_display_mode *drm_mode_displayid_detailed(struct drm_device *d struct drm_display_mode *mode; unsigned pixel_clock = (timings->pixel_clock[0] | (timings->pixel_clock[1] << 8) | - (timings->pixel_clock[2] << 16)); + (timings->pixel_clock[2] << 16)) + 1; unsigned hactive = (timings->hactive[0] | timings->hactive[1] << 8) + 1; unsigned hblank = (timings->hblank[0] | timings->hblank[1] << 8) + 1; unsigned hsync = (timings->hsync[0] | (timings->hsync[1] & 0x7f) << 8) + 1; |