[Nouveau] [PATCH 11/14] drm/nv40/fb: Blend if statement within the switch
Emil Velikov
emil.l.velikov at gmail.com
Sun May 20 16:15:00 PDT 2012
No functional change, just bike-shedding
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
drivers/gpu/drm/nouveau/nv40_fb.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nv40_fb.c b/drivers/gpu/drm/nouveau/nv40_fb.c
index 879678b..4f2d436 100644
--- a/drivers/gpu/drm/nouveau/nv40_fb.c
+++ b/drivers/gpu/drm/nouveau/nv40_fb.c
@@ -107,13 +107,6 @@ nv40_fb_init(struct nouveau_device *ndev, int subdev)
u32 tmp;
int i;
- if (ndev->chipset != 0x40 && ndev->chipset != 0x45) {
- if (nv44_graph_class(ndev))
- nv44_fb_init_gart(ndev);
- else
- nv40_fb_init_gart(ndev);
- }
-
switch (ndev->chipset) {
case 0x40:
case 0x45:
@@ -121,6 +114,10 @@ nv40_fb_init(struct nouveau_device *ndev, int subdev)
nv_wr32(ndev, NV10_PFB_CLOSE_PAGE2, tmp & ~(1 << 15));
break;
default:
+ if (nv44_graph_class(ndev))
+ nv44_fb_init_gart(ndev);
+ else
+ nv40_fb_init_gart(ndev);
break;
}
--
1.7.10.2
More information about the Nouveau
mailing list