OSDN Git Service

drm/i915/cnl: Don't blindly replace qdiv.
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 14 Nov 2017 19:47:57 +0000 (11:47 -0800)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Thu, 16 Nov 2017 17:45:16 +0000 (09:45 -0800)
Accordingly to spec "If Kdiv != 2, then Qdiv must be 1."
but we already handle qdiv values properly and this case here
should be spurious. But instead of blindly replacing let's
warn loudly instead. Because it means something was really
wrong on initial setup.

Cc: Mika Kahola <mika.kahola@intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Cc: James Ausmus <james.ausmus@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171114194759.24541-6-rodrigo.vivi@intel.com
drivers/gpu/drm/i915/intel_dpll_mgr.c

index 6cc12ab..361b710 100644 (file)
@@ -2184,8 +2184,7 @@ static void cnl_wrpll_params_populate(struct skl_wrpll_params *params,
                WARN(1, "Incorrect PDiv\n");
        }
 
-       if (kdiv != 2)
-               qdiv = 1;
+       WARN_ON(kdiv != 2 && qdiv != 1);
 
        params->qdiv_ratio = qdiv;
        params->qdiv_mode = (qdiv == 1) ? 0 : 1;