Skip to contentSkip to conversation

drm/nouveau: declare constants as unsigned long.

PATCH Superseded Wambui Karuga 2 participants 3 messages Dec 31, 2019 – Jan 1, 2020

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/nouveau: declare constants as unsigned long.

Explicitly declare constants are unsigned long to address the following sparse warnings:
warning: constant is so big it is long

---
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c +1 -1
index ac87a3b6b7c9..506b358fcdb6 100644
@@ -655,7 +655,7 @@ gf100_ram_new_(const struct nvkm_ram_func *func,
 
 static const struct nvkm_ram_func
 gf100_ram = {
-	.upper = 0x0200000000,
+	.upper = 0x0200000000UL,
 	.probe_fbp = gf100_ram_probe_fbp,
 	.probe_fbp_amount = gf100_ram_probe_fbp_amount,
 	.probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c +1 -1
index 70a06e3cd55a..3bc39895bbce 100644
@@ -43,7 +43,7 @@ gf108_ram_probe_fbp_amount(const struct nvkm_ram_func *func, u32 fbpao,
 
 static const struct nvkm_ram_func
 gf108_ram = {
-	.upper = 0x0200000000,
+	.upper = 0x0200000000UL,
 	.probe_fbp = gf100_ram_probe_fbp,
 	.probe_fbp_amount = gf108_ram_probe_fbp_amount,
 	.probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c +1 -1
index 456aed1f2a02..d01f32c0956a 100644
@@ -1698,7 +1698,7 @@ gk104_ram_new_(const struct nvkm_ram_func *func, struct nvkm_fb *fb,
 
 static const struct nvkm_ram_func
 gk104_ram = {
-	.upper = 0x0200000000,
+	.upper = 0x0200000000UL,
 	.probe_fbp = gf100_ram_probe_fbp,
 	.probe_fbp_amount = gf108_ram_probe_fbp_amount,
 	.probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c +1 -1
index 27c68e3f9772..e24ac664eb15 100644
@@ -33,7 +33,7 @@ gm107_ram_probe_fbp(const struct nvkm_ram_func *func,
 
 static const struct nvkm_ram_func
 gm107_ram = {
-	.upper = 0x1000000000,
+	.upper = 0x1000000000UL,
 	.probe_fbp = gm107_ram_probe_fbp,
 	.probe_fbp_amount = gf108_ram_probe_fbp_amount,
 	.probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c +1 -1
index 6b0cac1fe7b4..17994cbda54b 100644
@@ -48,7 +48,7 @@ gm200_ram_probe_fbp_amount(const struct nvkm_ram_func *func, u32 fbpao,
 
 static const struct nvkm_ram_func
 gm200_ram = {
-	.upper = 0x1000000000,
+	.upper = 0x1000000000UL,
 	.probe_fbp = gm107_ram_probe_fbp,
 	.probe_fbp_amount = gm200_ram_probe_fbp_amount,
 	.probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c +1 -1
index adb62a6beb63..7a07a6ed4578 100644
@@ -79,7 +79,7 @@ gp100_ram_probe_fbpa(struct nvkm_device *device, int fbpa)
 
 static const struct nvkm_ram_func
 gp100_ram = {
-	.upper = 0x1000000000,
+	.upper = 0x1000000000UL,
 	.probe_fbp = gm107_ram_probe_fbp,
 	.probe_fbp_amount = gm200_ram_probe_fbp_amount,
 	.probe_fbpa_amount = gp100_ram_probe_fbpa,
Signature · 1 line
2.17.1
#1 lore raw

Probably want ULL for 32-bit arches to be correct here too.

Quoted 96 lines · Wambui Karuga

Explicitly declare constants are unsigned long to address the following sparse warnings:
warning: constant is so big it is long

---
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c +1 -1
index ac87a3b6b7c9..506b358fcdb6 100644
@@ -655,7 +655,7 @@ gf100_ram_new_(const struct nvkm_ram_func *func,
 
 static const struct nvkm_ram_func
 gf100_ram = {
-       .upper = 0x0200000000,
+       .upper = 0x0200000000UL,
        .probe_fbp = gf100_ram_probe_fbp,
        .probe_fbp_amount = gf100_ram_probe_fbp_amount,
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c +1 -1
index 70a06e3cd55a..3bc39895bbce 100644
@@ -43,7 +43,7 @@ gf108_ram_probe_fbp_amount(const struct nvkm_ram_func *func, u32 fbpao,
 
 static const struct nvkm_ram_func
 gf108_ram = {
-       .upper = 0x0200000000,
+       .upper = 0x0200000000UL,
        .probe_fbp = gf100_ram_probe_fbp,
        .probe_fbp_amount = gf108_ram_probe_fbp_amount,
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c +1 -1
index 456aed1f2a02..d01f32c0956a 100644
@@ -1698,7 +1698,7 @@ gk104_ram_new_(const struct nvkm_ram_func *func, struct nvkm_fb *fb,
 
 static const struct nvkm_ram_func
 gk104_ram = {
-       .upper = 0x0200000000,
+       .upper = 0x0200000000UL,
        .probe_fbp = gf100_ram_probe_fbp,
        .probe_fbp_amount = gf108_ram_probe_fbp_amount,
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c +1 -1
index 27c68e3f9772..e24ac664eb15 100644
@@ -33,7 +33,7 @@ gm107_ram_probe_fbp(const struct nvkm_ram_func *func,
 
 static const struct nvkm_ram_func
 gm107_ram = {
-       .upper = 0x1000000000,
+       .upper = 0x1000000000UL,
        .probe_fbp = gm107_ram_probe_fbp,
        .probe_fbp_amount = gf108_ram_probe_fbp_amount,
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c +1 -1
index 6b0cac1fe7b4..17994cbda54b 100644
@@ -48,7 +48,7 @@ gm200_ram_probe_fbp_amount(const struct nvkm_ram_func *func, u32 fbpao,
 
 static const struct nvkm_ram_func
 gm200_ram = {
-       .upper = 0x1000000000,
+       .upper = 0x1000000000UL,
        .probe_fbp = gm107_ram_probe_fbp,
        .probe_fbp_amount = gm200_ram_probe_fbp_amount,
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c +1 -2
index adb62a6beb63..7a07a6ed4578 100644
@@ -79,7 +79,7 @@ gp100_ram_probe_fbpa(struct nvkm_device *device, int fbpa)
 
 static const struct nvkm_ram_func
 gp100_ram = {
-       .upper = 0x1000000000,
+       .upper = 0x1000000000UL,
        .probe_fbp = gm107_ram_probe_fbp,
        .probe_fbp_amount = gm200_ram_probe_fbp_amount,
        .probe_fbpa_amount = gp100_ram_probe_fbpa,
--

2.17.1

#2 lore raw
Quoted 2 lines · Ilia Mirkin

Probably want ULL for 32-bit arches to be correct here too.

Okay, I can convert them to ULL and send a v2.

Thanks,
wambui.

Quoted 97 lines · Wambui Karuga
Quoted 96 lines

Explicitly declare constants are unsigned long to address the following sparse warnings:
warning: constant is so big it is long

---
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c +1 -1
index ac87a3b6b7c9..506b358fcdb6 100644
@@ -655,7 +655,7 @@ gf100_ram_new_(const struct nvkm_ram_func *func,
 
 static const struct nvkm_ram_func
 gf100_ram = {
-       .upper = 0x0200000000,
+       .upper = 0x0200000000UL,
        .probe_fbp = gf100_ram_probe_fbp,
        .probe_fbp_amount = gf100_ram_probe_fbp_amount,
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c +1 -1
index 70a06e3cd55a..3bc39895bbce 100644
@@ -43,7 +43,7 @@ gf108_ram_probe_fbp_amount(const struct nvkm_ram_func *func, u32 fbpao,
 
 static const struct nvkm_ram_func
 gf108_ram = {
-       .upper = 0x0200000000,
+       .upper = 0x0200000000UL,
        .probe_fbp = gf100_ram_probe_fbp,
        .probe_fbp_amount = gf108_ram_probe_fbp_amount,
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c +1 -1
index 456aed1f2a02..d01f32c0956a 100644
@@ -1698,7 +1698,7 @@ gk104_ram_new_(const struct nvkm_ram_func *func, struct nvkm_fb *fb,
 
 static const struct nvkm_ram_func
 gk104_ram = {
-       .upper = 0x0200000000,
+       .upper = 0x0200000000UL,
        .probe_fbp = gf100_ram_probe_fbp,
        .probe_fbp_amount = gf108_ram_probe_fbp_amount,
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c +1 -1
index 27c68e3f9772..e24ac664eb15 100644
@@ -33,7 +33,7 @@ gm107_ram_probe_fbp(const struct nvkm_ram_func *func,
 
 static const struct nvkm_ram_func
 gm107_ram = {
-       .upper = 0x1000000000,
+       .upper = 0x1000000000UL,
        .probe_fbp = gm107_ram_probe_fbp,
        .probe_fbp_amount = gf108_ram_probe_fbp_amount,
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c +1 -1
index 6b0cac1fe7b4..17994cbda54b 100644
@@ -48,7 +48,7 @@ gm200_ram_probe_fbp_amount(const struct nvkm_ram_func *func, u32 fbpao,
 
 static const struct nvkm_ram_func
 gm200_ram = {
-       .upper = 0x1000000000,
+       .upper = 0x1000000000UL,
        .probe_fbp = gm107_ram_probe_fbp,
        .probe_fbp_amount = gm200_ram_probe_fbp_amount,
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c +1 -2
index adb62a6beb63..7a07a6ed4578 100644
@@ -79,7 +79,7 @@ gp100_ram_probe_fbpa(struct nvkm_device *device, int fbpa)
 
 static const struct nvkm_ram_func
 gp100_ram = {
-       .upper = 0x1000000000,
+       .upper = 0x1000000000UL,
        .probe_fbp = gm107_ram_probe_fbp,
        .probe_fbp_amount = gm200_ram_probe_fbp_amount,
        .probe_fbpa_amount = gp100_ram_probe_fbpa,
--

2.17.1