2017-04-24 08:38:53

by Pan Bian

Subject: [PATCH 1/1] drm/radeon: check return value of radeon_ring_lock

From: Pan Bian <[email protected]>

Function radeon_ring_lock() returns an errno on failure, and its return
value should be validated. However, in functions r420_cp_errata_init()
and r420_cp_errata_fini(), its return value is not checked. This patch
adds the checks.

Signed-off-by: Pan Bian <[email protected]>
---
drivers/gpu/drm/radeon/r420.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index 2828605..391c764 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c
@@ -206,6 +206,7 @@ static void r420_clock_resume(struct radeon_device *rdev)

static void r420_cp_errata_init(struct radeon_device *rdev)
{
+ int r;
struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];

/* RV410 and R420 can lock up if CP DMA to host memory happens
@@ -215,7 +216,8 @@ static void r420_cp_errata_init(struct radeon_device *rdev)
* of the CP init, apparently.
*/
radeon_scratch_get(rdev, &rdev->config.r300.resync_scratch);
- radeon_ring_lock(rdev, ring, 8);
+ r = radeon_ring_lock(rdev, ring, 8);
+ WARN_ON(r);
radeon_ring_write(ring, PACKET0(R300_CP_RESYNC_ADDR, 1));
radeon_ring_write(ring, rdev->config.r300.resync_scratch);
radeon_ring_write(ring, 0xDEADBEEF);
@@ -224,12 +226,14 @@ static void r420_cp_errata_init(struct radeon_device *rdev)

static void r420_cp_errata_fini(struct radeon_device *rdev)
{
+ int r;
struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];

/* Catch the RESYNC we dispatched all the way back,
* at the very beginning of the CP init.
*/
- radeon_ring_lock(rdev, ring, 8);
+ r = radeon_ring_lock(rdev, ring, 8);
+ WARN_ON(r);
radeon_ring_write(ring, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
radeon_ring_write(ring, R300_RB3D_DC_FINISH);
radeon_ring_unlock_commit(rdev, ring, false);
--
1.9.1

2017-04-24 09:08:25

by Christian König

Subject: Re: [PATCH 1/1] drm/radeon: check return value of radeon_ring_lock

Am 24.04.2017 um 10:38 schrieb Pan Bian:
> From: Pan Bian <[email protected]>
>
> Function radeon_ring_lock() returns an errno on failure, and its return
> value should be validated. However, in functions r420_cp_errata_init()
> and r420_cp_errata_fini(), its return value is not checked. This patch
> adds the checks.
>
> Signed-off-by: Pan Bian <[email protected]>

Reviewed-by: Christian K?nig <[email protected]>

> ---
> drivers/gpu/drm/radeon/r420.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
> index 2828605..391c764 100644
> --- a/drivers/gpu/drm/radeon/r420.c
> +++ b/drivers/gpu/drm/radeon/r420.c
> @@ -206,6 +206,7 @@ static void r420_clock_resume(struct radeon_device *rdev)
>
> static void r420_cp_errata_init(struct radeon_device *rdev)
> {
> + int r;
> struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
>
> /* RV410 and R420 can lock up if CP DMA to host memory happens
> @@ -215,7 +216,8 @@ static void r420_cp_errata_init(struct radeon_device *rdev)
> * of the CP init, apparently.
> */
> radeon_scratch_get(rdev, &rdev->config.r300.resync_scratch);
> - radeon_ring_lock(rdev, ring, 8);
> + r = radeon_ring_lock(rdev, ring, 8);
> + WARN_ON(r);
> radeon_ring_write(ring, PACKET0(R300_CP_RESYNC_ADDR, 1));
> radeon_ring_write(ring, rdev->config.r300.resync_scratch);
> radeon_ring_write(ring, 0xDEADBEEF);
> @@ -224,12 +226,14 @@ static void r420_cp_errata_init(struct radeon_device *rdev)
>
> static void r420_cp_errata_fini(struct radeon_device *rdev)
> {
> + int r;
> struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
>
> /* Catch the RESYNC we dispatched all the way back,
> * at the very beginning of the CP init.
> */
> - radeon_ring_lock(rdev, ring, 8);
> + r = radeon_ring_lock(rdev, ring, 8);
> + WARN_ON(r);
> radeon_ring_write(ring, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
> radeon_ring_write(ring, R300_RB3D_DC_FINISH);
> radeon_ring_unlock_commit(rdev, ring, false);