* [PATCH 1/2] drm/amdgpu: fix overflowed constant warning in mmhub_set_clockgating()
@ 2024-06-07 8:33 Bob Zhou
2024-06-07 8:33 ` [PATCH 2/2] drm/amdgpu: fix dereferencing null pointer warning in ring_test_ib() Bob Zhou
2024-06-07 11:38 ` [PATCH 1/2] drm/amdgpu: fix overflowed constant warning in mmhub_set_clockgating() Christian König
0 siblings, 2 replies; 4+ messages in thread
From: Bob Zhou @ 2024-06-07 8:33 UTC (permalink / raw)
To: amd-gfx, Tim.Huang, jesse.zhang
Cc: alexander.deucher, christian.koenig, Bob Zhou
To fix potential overflowed constant warning, modify the variables to u32
for getting the return value of RREG32_SOC15().
Signed-off-by: Bob Zhou <bob.zhou@amd.com>
---
drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 2 +-
drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 2 +-
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
index 92432cd2c0c7..9689e2b5d4e5 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
@@ -544,7 +544,7 @@ static int mmhub_v1_7_set_clockgating(struct amdgpu_device *adev,
static void mmhub_v1_7_get_clockgating(struct amdgpu_device *adev, u64 *flags)
{
- int data, data1;
+ u32 data, data1;
if (amdgpu_sriov_vf(adev))
*flags = 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c
index 02fd45261399..a0cc8e218ca1 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c
@@ -671,7 +671,7 @@ static int mmhub_v2_0_set_clockgating(struct amdgpu_device *adev,
static void mmhub_v2_0_get_clockgating(struct amdgpu_device *adev, u64 *flags)
{
- int data, data1;
+ u32 data, data1;
if (amdgpu_sriov_vf(adev))
*flags = 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
index 8928f9160822..b4ce3375d3fd 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
@@ -613,7 +613,7 @@ static int mmhub_v3_3_set_clockgating(struct amdgpu_device *adev,
static void mmhub_v3_3_get_clockgating(struct amdgpu_device *adev, u64 *flags)
{
- int data;
+ u32 data;
if (amdgpu_sriov_vf(adev))
*flags = 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
index 1b7da4aff2b8..ff1b58e44689 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
@@ -657,7 +657,7 @@ static int mmhub_v9_4_set_clockgating(struct amdgpu_device *adev,
static void mmhub_v9_4_get_clockgating(struct amdgpu_device *adev, u64 *flags)
{
- int data, data1;
+ u32 data, data1;
if (amdgpu_sriov_vf(adev))
*flags = 0;
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] drm/amdgpu: fix dereferencing null pointer warning in ring_test_ib()
2024-06-07 8:33 [PATCH 1/2] drm/amdgpu: fix overflowed constant warning in mmhub_set_clockgating() Bob Zhou
@ 2024-06-07 8:33 ` Bob Zhou
2024-06-07 11:39 ` Christian König
2024-06-07 11:38 ` [PATCH 1/2] drm/amdgpu: fix overflowed constant warning in mmhub_set_clockgating() Christian König
1 sibling, 1 reply; 4+ messages in thread
From: Bob Zhou @ 2024-06-07 8:33 UTC (permalink / raw)
To: amd-gfx, Tim.Huang, jesse.zhang
Cc: alexander.deucher, christian.koenig, Bob Zhou
To avoid null pointer dereference, Check return value and
conduct error handling.
Signed-off-by: Bob Zhou <bob.zhou@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 ++
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 2 ++
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 4 ++++
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 4 ++++
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 4 ++++
drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 4 ++++
6 files changed, 20 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index 2a510351dfce..f131f96a734c 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -547,6 +547,8 @@ static int gfx_v11_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, padding);
cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, padding);
+ if (cpu_ptr == NULL)
+ return -EINVAL;
*cpu_ptr = cpu_to_le32(0xCAFEDEAD);
} else {
r = amdgpu_device_wb_get(adev, &index);
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
index 460bf33a22b1..b5719760abe2 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
@@ -322,6 +322,8 @@ static int gfx_v12_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, padding);
cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, padding);
+ if (cpu_ptr == NULL)
+ return -EINVAL;
*cpu_ptr = cpu_to_le32(0xCAFEDEAD);
} else {
r = amdgpu_device_wb_get(adev, &index);
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
index b7d33d78bce0..56edac57d1e3 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -984,6 +984,8 @@ static int sdma_v5_0_ring_test_ring(struct amdgpu_ring *ring)
AMDGPU_MES_CTX_PADDING_OFFS);
gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
+ if (cpu_ptr == NULL)
+ return -EINVAL;
*cpu_ptr = tmp;
} else {
r = amdgpu_device_wb_get(adev, &index);
@@ -1067,6 +1069,8 @@ static int sdma_v5_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
AMDGPU_MES_CTX_PADDING_OFFS);
gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
+ if (cpu_ptr == NULL)
+ return -EINVAL;
*cpu_ptr = tmp;
} else {
r = amdgpu_device_wb_get(adev, &index);
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index cc9e961f0078..3e5316a24c90 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
@@ -824,6 +824,8 @@ static int sdma_v5_2_ring_test_ring(struct amdgpu_ring *ring)
AMDGPU_MES_CTX_PADDING_OFFS);
gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
+ if (cpu_ptr == NULL)
+ return -EINVAL;
*cpu_ptr = tmp;
} else {
r = amdgpu_device_wb_get(adev, &index);
@@ -907,6 +909,8 @@ static int sdma_v5_2_ring_test_ib(struct amdgpu_ring *ring, long timeout)
AMDGPU_MES_CTX_PADDING_OFFS);
gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
+ if (cpu_ptr == NULL)
+ return -EINVAL;
*cpu_ptr = tmp;
} else {
r = amdgpu_device_wb_get(adev, &index);
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
index c833b6b8373b..c1d6ece57bd4 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -846,6 +846,8 @@ static int sdma_v6_0_ring_test_ring(struct amdgpu_ring *ring)
AMDGPU_MES_CTX_PADDING_OFFS);
gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
+ if (cpu_ptr == NULL)
+ return -EINVAL;
*cpu_ptr = tmp;
} else {
r = amdgpu_device_wb_get(adev, &index);
@@ -929,6 +931,8 @@ static int sdma_v6_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
AMDGPU_MES_CTX_PADDING_OFFS);
gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
+ if (cpu_ptr == NULL)
+ return -EINVAL;
*cpu_ptr = tmp;
} else {
r = amdgpu_device_wb_get(adev, &index);
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
index 96514fd77e35..2ea988e7e242 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
@@ -859,6 +859,8 @@ static int sdma_v7_0_ring_test_ring(struct amdgpu_ring *ring)
AMDGPU_MES_CTX_PADDING_OFFS);
gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
+ if (cpu_ptr == NULL)
+ return -EINVAL;
*cpu_ptr = tmp;
} else {
r = amdgpu_device_wb_get(adev, &index);
@@ -942,6 +944,8 @@ static int sdma_v7_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
AMDGPU_MES_CTX_PADDING_OFFS);
gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
+ if (cpu_ptr == NULL)
+ return -EINVAL;
*cpu_ptr = tmp;
} else {
r = amdgpu_device_wb_get(adev, &index);
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] drm/amdgpu: fix overflowed constant warning in mmhub_set_clockgating()
2024-06-07 8:33 [PATCH 1/2] drm/amdgpu: fix overflowed constant warning in mmhub_set_clockgating() Bob Zhou
2024-06-07 8:33 ` [PATCH 2/2] drm/amdgpu: fix dereferencing null pointer warning in ring_test_ib() Bob Zhou
@ 2024-06-07 11:38 ` Christian König
1 sibling, 0 replies; 4+ messages in thread
From: Christian König @ 2024-06-07 11:38 UTC (permalink / raw)
To: Bob Zhou, amd-gfx, Tim.Huang, jesse.zhang; +Cc: alexander.deucher
Am 07.06.24 um 10:33 schrieb Bob Zhou:
> To fix potential overflowed constant warning, modify the variables to u32
> for getting the return value of RREG32_SOC15().
>
> Signed-off-by: Bob Zhou <bob.zhou@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
> index 92432cd2c0c7..9689e2b5d4e5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
> @@ -544,7 +544,7 @@ static int mmhub_v1_7_set_clockgating(struct amdgpu_device *adev,
>
> static void mmhub_v1_7_get_clockgating(struct amdgpu_device *adev, u64 *flags)
> {
> - int data, data1;
> + u32 data, data1;
>
> if (amdgpu_sriov_vf(adev))
> *flags = 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c
> index 02fd45261399..a0cc8e218ca1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c
> @@ -671,7 +671,7 @@ static int mmhub_v2_0_set_clockgating(struct amdgpu_device *adev,
>
> static void mmhub_v2_0_get_clockgating(struct amdgpu_device *adev, u64 *flags)
> {
> - int data, data1;
> + u32 data, data1;
>
> if (amdgpu_sriov_vf(adev))
> *flags = 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
> index 8928f9160822..b4ce3375d3fd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
> @@ -613,7 +613,7 @@ static int mmhub_v3_3_set_clockgating(struct amdgpu_device *adev,
>
> static void mmhub_v3_3_get_clockgating(struct amdgpu_device *adev, u64 *flags)
> {
> - int data;
> + u32 data;
>
> if (amdgpu_sriov_vf(adev))
> *flags = 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> index 1b7da4aff2b8..ff1b58e44689 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> @@ -657,7 +657,7 @@ static int mmhub_v9_4_set_clockgating(struct amdgpu_device *adev,
>
> static void mmhub_v9_4_get_clockgating(struct amdgpu_device *adev, u64 *flags)
> {
> - int data, data1;
> + u32 data, data1;
>
> if (amdgpu_sriov_vf(adev))
> *flags = 0;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] drm/amdgpu: fix dereferencing null pointer warning in ring_test_ib()
2024-06-07 8:33 ` [PATCH 2/2] drm/amdgpu: fix dereferencing null pointer warning in ring_test_ib() Bob Zhou
@ 2024-06-07 11:39 ` Christian König
0 siblings, 0 replies; 4+ messages in thread
From: Christian König @ 2024-06-07 11:39 UTC (permalink / raw)
To: Bob Zhou, amd-gfx, Tim.Huang, jesse.zhang; +Cc: alexander.deucher
Am 07.06.24 um 10:33 schrieb Bob Zhou:
> To avoid null pointer dereference, Check return value and
> conduct error handling.
That doesn't make much sense.
At this point the amdgpu_mes_ctx_get_offs_cpu_addr() shouldn't be able
to return NULL in the first place.
Regards,
Christian.
>
> Signed-off-by: Bob Zhou <bob.zhou@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 ++
> drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 2 ++
> drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 4 ++++
> drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 4 ++++
> drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 4 ++++
> drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 4 ++++
> 6 files changed, 20 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> index 2a510351dfce..f131f96a734c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> @@ -547,6 +547,8 @@ static int gfx_v11_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
>
> gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, padding);
> cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, padding);
> + if (cpu_ptr == NULL)
> + return -EINVAL;
> *cpu_ptr = cpu_to_le32(0xCAFEDEAD);
> } else {
> r = amdgpu_device_wb_get(adev, &index);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> index 460bf33a22b1..b5719760abe2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> @@ -322,6 +322,8 @@ static int gfx_v12_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
>
> gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, padding);
> cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, padding);
> + if (cpu_ptr == NULL)
> + return -EINVAL;
> *cpu_ptr = cpu_to_le32(0xCAFEDEAD);
> } else {
> r = amdgpu_device_wb_get(adev, &index);
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
> index b7d33d78bce0..56edac57d1e3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
> @@ -984,6 +984,8 @@ static int sdma_v5_0_ring_test_ring(struct amdgpu_ring *ring)
> AMDGPU_MES_CTX_PADDING_OFFS);
> gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
> cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
> + if (cpu_ptr == NULL)
> + return -EINVAL;
> *cpu_ptr = tmp;
> } else {
> r = amdgpu_device_wb_get(adev, &index);
> @@ -1067,6 +1069,8 @@ static int sdma_v5_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> AMDGPU_MES_CTX_PADDING_OFFS);
> gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
> cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
> + if (cpu_ptr == NULL)
> + return -EINVAL;
> *cpu_ptr = tmp;
> } else {
> r = amdgpu_device_wb_get(adev, &index);
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
> index cc9e961f0078..3e5316a24c90 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
> @@ -824,6 +824,8 @@ static int sdma_v5_2_ring_test_ring(struct amdgpu_ring *ring)
> AMDGPU_MES_CTX_PADDING_OFFS);
> gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
> cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
> + if (cpu_ptr == NULL)
> + return -EINVAL;
> *cpu_ptr = tmp;
> } else {
> r = amdgpu_device_wb_get(adev, &index);
> @@ -907,6 +909,8 @@ static int sdma_v5_2_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> AMDGPU_MES_CTX_PADDING_OFFS);
> gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
> cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
> + if (cpu_ptr == NULL)
> + return -EINVAL;
> *cpu_ptr = tmp;
> } else {
> r = amdgpu_device_wb_get(adev, &index);
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
> index c833b6b8373b..c1d6ece57bd4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
> @@ -846,6 +846,8 @@ static int sdma_v6_0_ring_test_ring(struct amdgpu_ring *ring)
> AMDGPU_MES_CTX_PADDING_OFFS);
> gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
> cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
> + if (cpu_ptr == NULL)
> + return -EINVAL;
> *cpu_ptr = tmp;
> } else {
> r = amdgpu_device_wb_get(adev, &index);
> @@ -929,6 +931,8 @@ static int sdma_v6_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> AMDGPU_MES_CTX_PADDING_OFFS);
> gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
> cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
> + if (cpu_ptr == NULL)
> + return -EINVAL;
> *cpu_ptr = tmp;
> } else {
> r = amdgpu_device_wb_get(adev, &index);
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
> index 96514fd77e35..2ea988e7e242 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
> @@ -859,6 +859,8 @@ static int sdma_v7_0_ring_test_ring(struct amdgpu_ring *ring)
> AMDGPU_MES_CTX_PADDING_OFFS);
> gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
> cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
> + if (cpu_ptr == NULL)
> + return -EINVAL;
> *cpu_ptr = tmp;
> } else {
> r = amdgpu_device_wb_get(adev, &index);
> @@ -942,6 +944,8 @@ static int sdma_v7_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> AMDGPU_MES_CTX_PADDING_OFFS);
> gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);
> cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);
> + if (cpu_ptr == NULL)
> + return -EINVAL;
> *cpu_ptr = tmp;
> } else {
> r = amdgpu_device_wb_get(adev, &index);
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-07 11:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-07 8:33 [PATCH 1/2] drm/amdgpu: fix overflowed constant warning in mmhub_set_clockgating() Bob Zhou
2024-06-07 8:33 ` [PATCH 2/2] drm/amdgpu: fix dereferencing null pointer warning in ring_test_ib() Bob Zhou
2024-06-07 11:39 ` Christian König
2024-06-07 11:38 ` [PATCH 1/2] drm/amdgpu: fix overflowed constant warning in mmhub_set_clockgating() Christian König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox