[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Pull in upstream commit:

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2ba30b9e303e
branches:  trunk
changeset: 825629:2ba30b9e303e
user:      maya <maya%NetBSD.org@localhost>
date:      Tue Jul 25 23:31:27 2017 +0000

description:
Pull in upstream commit:

Author: Ville Syrj?l? <ville.syrjala%linux.intel.com@localhost>
Date:   Mon Jun 9 16:20:46 2014 +0300

    drm/i915: Avoid div-by-zero when pixel_multiplier is zero

On certain platforms pixel_multiplier is read out in
.get_pipe_config(), but it also gets used to calculate the
pixel clock in intel_sdvo_get_config(). If the pipe is disabled
but some SDVO outputs are active, we may end up dividing by zero
in intel_sdvo_get_config().

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=76520

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (15 lines):

diff -r 89b8feebbb7d -r 2ba30b9e303e sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c  Tue Jul 25 23:20:57 2017 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c  Tue Jul 25 23:31:27 2017 +0000
@@ -1391,7 +1391,10 @@
                         >> SDVO_PORT_MULTIPLY_SHIFT) + 1;
        }
 
-       dotclock = pipe_config->port_clock / pipe_config->pixel_multiplier;
+       dotclock = pipe_config->port_clock;
+
+       if (pipe_config->pixel_multiplier)
+               dotclock /= pipe_config->pixel_multiplier;
 
        if (HAS_PCH_SPLIT(dev))
                ironlake_check_encoder_dotclock(pipe_config, dotclock);