| Message ID | 20171114194759.24541-6-rodrigo.vivi@intel.com |
|---|---|
| State | Accepted |
| Commit | cacf6fe7c6c4ac9e748f41d0de4293b2aea5ae07 |
| Headers | show |
| Series |
"WRPLL fixes for HDMI 2.0 on Cannonlake."
( rev:
4
3
2
1
)
in
Intel GFX |
diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c index 53f650f56148..bd608f7f2399 100644 --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c @@ -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;
On Tue, Nov 14, 2017 at 11:47:57AM -0800, Rodrigo Vivi wrote: > 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> > --- > drivers/gpu/drm/i915/intel_dpll_mgr.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c > index 53f650f56148..bd608f7f2399 100644 > --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c > +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c > @@ -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; > -- > 2.13.6 >
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> --- drivers/gpu/drm/i915/intel_dpll_mgr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)