diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-12 09:11:18 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-14 17:58:39 -0400 |
commit | da7c74ea2b0e218ddd6c3d01ea55a12104e7c6fd (patch) | |
tree | c632b9ace679b0e2aeeb26434769eea68f2f14f9 /drivers/gpu | |
parent | ef07ceae02271ac6eadc9f5cd652bb7162455a1b (diff) |
drm/gf100-/gr: fix -ENOSPC detection when allocating zbc table entries
Spotted by Coverity.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c index db19191176fa..30fd1dc64f93 100644 --- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c +++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c | |||
@@ -68,6 +68,9 @@ nvc0_graph_zbc_color_get(struct nvc0_graph_priv *priv, int format, | |||
68 | } | 68 | } |
69 | } | 69 | } |
70 | 70 | ||
71 | if (zbc < 0) | ||
72 | return zbc; | ||
73 | |||
71 | memcpy(priv->zbc_color[zbc].ds, ds, sizeof(priv->zbc_color[zbc].ds)); | 74 | memcpy(priv->zbc_color[zbc].ds, ds, sizeof(priv->zbc_color[zbc].ds)); |
72 | memcpy(priv->zbc_color[zbc].l2, l2, sizeof(priv->zbc_color[zbc].l2)); | 75 | memcpy(priv->zbc_color[zbc].l2, l2, sizeof(priv->zbc_color[zbc].l2)); |
73 | priv->zbc_color[zbc].format = format; | 76 | priv->zbc_color[zbc].format = format; |
@@ -109,6 +112,9 @@ nvc0_graph_zbc_depth_get(struct nvc0_graph_priv *priv, int format, | |||
109 | } | 112 | } |
110 | } | 113 | } |
111 | 114 | ||
115 | if (zbc < 0) | ||
116 | return zbc; | ||
117 | |||
112 | priv->zbc_depth[zbc].format = format; | 118 | priv->zbc_depth[zbc].format = format; |
113 | priv->zbc_depth[zbc].ds = ds; | 119 | priv->zbc_depth[zbc].ds = ds; |
114 | priv->zbc_depth[zbc].l2 = l2; | 120 | priv->zbc_depth[zbc].l2 = l2; |