diff options
| author |   Dave Airlie <airlied@redhat.com> | 2018-03-09 09:22:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-03-09 09:22:44 +1000 |
| commit | f5732e66a7d04d587514841124cb591856a943dc (patch) | |
| tree | 24691742a04e5fd1a895fd1cf589398aa38a2bdc /drivers/gpu/drm/sun4i/sun4i_dotclock.c | |
| parent | Merge tag 'drm-intel-fixes-2018-03-07' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (diff) | |
| parent | drm/sun4i: crtc: Call drm_crtc_vblank_on / drm_crtc_vblank_off (diff) | |
| download | linux-dev-f5732e66a7d04d587514841124cb591856a943dc.tar.xz linux-dev-f5732e66a7d04d587514841124cb591856a943dc.zip | |
Merge tag 'drm-misc-fixes-2018-03-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
sun4i fixes on clk, division by zero and LVDS.
* tag 'drm-misc-fixes-2018-03-07' of git://anongit.freedesktop.org/drm/drm-misc:
drm/sun4i: crtc: Call drm_crtc_vblank_on / drm_crtc_vblank_off
drm/sun4i: rgb: Fix potential division by zero
drm/sun4i: tcon: Reduce the scope of the LVDS error a bit
drm/sun4i: Release exclusive clock lock when disabling TCON
drm/sun4i: Fix dclk_set_phase
Diffstat (limited to 'drivers/gpu/drm/sun4i/sun4i_dotclock.c')
| -rw-r--r-- | drivers/gpu/drm/sun4i/sun4i_dotclock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sun4i/sun4i_dotclock.c b/drivers/gpu/drm/sun4i/sun4i_dotclock.c index 023f39bda633..e36004fbe453 100644 --- a/drivers/gpu/drm/sun4i/sun4i_dotclock.c +++ b/drivers/gpu/drm/sun4i/sun4i_dotclock.c @@ -132,10 +132,13 @@ static int sun4i_dclk_get_phase(struct clk_hw *hw) static int sun4i_dclk_set_phase(struct clk_hw *hw, int degrees) { struct sun4i_dclk *dclk = hw_to_dclk(hw); + u32 val = degrees / 120; + + val <<= 28; regmap_update_bits(dclk->regmap, SUN4I_TCON0_IO_POL_REG, GENMASK(29, 28), - degrees / 120); + val); return 0; } |