diff options
author | 2020-09-14 18:11:40 +0200 | |
---|---|---|
committer | 2020-09-14 18:11:40 +0200 | |
commit | 00af6729b52ede86a08173c8d5f2c8cd9fa3390d (patch) | |
tree | 6a8cec3575d5cd49fffadb372b85da5475a266b0 /drivers/video/fbdev/nvidia/nv_hw.c | |
parent | drm: fix double free for gbo in drm_gem_vram_init and drm_gem_vram_create (diff) | |
parent | Merge v5.9-rc5 into drm-next (diff) | |
download | linux-dev-00af6729b52ede86a08173c8d5f2c8cd9fa3390d.tar.xz linux-dev-00af6729b52ede86a08173c8d5f2c8cd9fa3390d.zip |
Merge drm/drm-next into drm-misc-next
Paul Cercueil needs some patches in -rc5 to apply new patches for ingenic
properly.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/video/fbdev/nvidia/nv_hw.c')
-rw-r--r-- | drivers/video/fbdev/nvidia/nv_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/nvidia/nv_hw.c b/drivers/video/fbdev/nvidia/nv_hw.c index 8335da4ca30e..9b0a324bb1b4 100644 --- a/drivers/video/fbdev/nvidia/nv_hw.c +++ b/drivers/video/fbdev/nvidia/nv_hw.c @@ -896,7 +896,7 @@ void NVCalcStateExt(struct nvidia_par *par, if (!par->FlatPanel) state->control = NV_RD32(par->PRAMDAC0, 0x0580) & 0xeffffeff; - /* fallthrough */ + fallthrough; case NV_ARCH_10: case NV_ARCH_20: case NV_ARCH_30: |