diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-03-12 05:42:41 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-03-12 05:42:56 +0300 |
| commit | 9e12da086e5e38f7b4f8d6e02a82447f4165fbee (patch) | |
| tree | 96e6029378ccb9ae3f9530d019c8216a3ca4a556 /drivers/video/fbdev/aty/mach64_gx.c | |
| parent | d3bd37f587b4438d47751d0f1d5aaae3d39bd416 (diff) | |
| parent | bc1a4130fc0309cc2f43b9cc616ebbc295e886ff (diff) | |
| download | linux-9e12da086e5e38f7b4f8d6e02a82447f4165fbee.tar.xz | |
Merge tag 'drm-misc-next-2020-03-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.7:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
Driver Changes:
- fb-helper: Remove drm_fb_helper_{add,add_all,remove}_one_connector
- fbdev: some cleanups and dead-code removal
- Conversions to simple-encoder
- zero-length array removal
- Panel: panel-dpi support in panel-simple, Novatek NT35510, Elida
KD35T133,
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200309135439.dicfnbo4ikj4tkz7@gilmour
Diffstat (limited to 'drivers/video/fbdev/aty/mach64_gx.c')
| -rw-r--r-- | drivers/video/fbdev/aty/mach64_gx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/fbdev/aty/mach64_gx.c b/drivers/video/fbdev/aty/mach64_gx.c index 27cb65fa2ba2..9c37e28fb78b 100644 --- a/drivers/video/fbdev/aty/mach64_gx.c +++ b/drivers/video/fbdev/aty/mach64_gx.c @@ -618,14 +618,13 @@ static int aty_var_to_pll_8398(const struct fb_info *info, u32 vclk_per, u32 mhz100; /* in 0.01 MHz */ u32 program_bits; /* u32 post_divider; */ - u32 mach64MinFreq, mach64MaxFreq, mach64RefFreq; + u32 mach64MinFreq, mach64MaxFreq; u16 m, n, k = 0, save_m, save_n, twoToKth; /* Calculate the programming word */ mhz100 = 100000000 / vclk_per; mach64MinFreq = MIN_FREQ_2595; mach64MaxFreq = MAX_FREQ_2595; - mach64RefFreq = REF_FREQ_2595; /* 14.32 MHz */ save_m = 0; save_n = 0; |