OSDN Git Service

drm/i915: avoid division by zero on cnl_calc_wrpll_link
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Thu, 5 Oct 2017 21:38:42 +0000 (18:38 -0300)
committerPaulo Zanoni <paulo.r.zanoni@intel.com>
Mon, 9 Oct 2017 20:48:18 +0000 (17:48 -0300)
If for some unexpected reason the registers all read zero it's better
to WARN and return instead of dividing by zero and completely freezing
the machine.

I don't expect this to happen in the wild with the current code, but I
accidentally triggered the division by zero while doing some debugging
in an unusual environment.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171005213842.11423-2-paulo.r.zanoni@intel.com
drivers/gpu/drm/i915/intel_ddi.c

index ce4b733..b307b6f 100644 (file)
@@ -1220,6 +1220,9 @@ static int cnl_calc_wrpll_link(struct drm_i915_private *dev_priv,
        dco_freq += (((cfgcr0 & DPLL_CFGCR0_DCO_FRACTION_MASK) >>
                      DPLL_CFGCR0_DCO_FRACTION_SHIFT) * ref_clock) / 0x8000;
 
+       if (WARN_ON(p0 == 0 || p1 == 0 || p2 == 0))
+               return 0;
+
        return dco_freq / (p0 * p1 * p2 * 5);
 }