Skip to contentSkip to conversation

drm/nouveau: declare constants as unsigned long long.

PATCH In review Wambui Karuga 2 participants 2 messages Jan 2, 2020 – Jan 6, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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

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

v2: convert to unsigned long long for compatibility with 32-bit architectures.

Suggested by: lia Mirkin <[email protected]>

---
 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..ba43fe158b22 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 = 0x0200000000ULL,
 	.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..d97fa43efb91 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 = 0x0200000000ULL,
 	.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..d350d92852d2 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 = 0x0200000000ULL,
 	.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..be91da854dca 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 = 0x1000000000ULL,
 	.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..8f91ea91ee25 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 = 0x1000000000ULL,
 	.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..378f6fb70990 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 = 0x1000000000ULL,
 	.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
Quoted 10 lines · Wambui Karuga

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

v2: convert to unsigned long long for compatibility with 32-bit architectures.

Suggested by: lia Mirkin <[email protected]>

Thanks!

Quoted 94 lines
---
 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..ba43fe158b22 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 = 0x0200000000ULL,
        .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..d97fa43efb91 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 = 0x0200000000ULL,
        .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..d350d92852d2 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 = 0x0200000000ULL,
        .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..be91da854dca 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 = 0x1000000000ULL,
        .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..8f91ea91ee25 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 = 0x1000000000ULL,
        .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..378f6fb70990 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 = 0x1000000000ULL,
        .probe_fbp = gm107_ram_probe_fbp,
        .probe_fbp_amount = gm200_ram_probe_fbp_amount,
        .probe_fbpa_amount = gp100_ram_probe_fbpa,
--

2.17.1

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau