Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes

airlied · airlied · commit b1d83f4c94f5 · 2022-01-28T14:56:37.000+10:00
- relax submit size checks. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Lucas Stach <l.stach@pengutronix.de> Link: https://patchwork.freedesktop.org/patch/msgid/8c2cb3e3a702be86db9d43ca8927b6b78ac2b1d2.camel@pengutronix.de
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
@@ -469,8 +469,8 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data,
 		return -EINVAL;
 	}
 
-	if (args->stream_size > SZ_64K || args->nr_relocs > SZ_64K ||
-	    args->nr_bos > SZ_64K || args->nr_pmrs > 128) {
+	if (args->stream_size > SZ_128K || args->nr_relocs > SZ_128K ||
+	    args->nr_bos > SZ_128K || args->nr_pmrs > 128) {
 		DRM_ERROR("submit arguments out of size limits\n");
 		return -EINVAL;
 	}

Original file line number	Diff line number	Diff line change
`@@ -469,8 +469,8 @@ int etnaviv_ioctl_gem_submit(struct drm_device dev, void data,`
`469`	`469`	`return -EINVAL;`
`470`	`470`	`}`
`471`	`471`
`472`		`- if (args->stream_size > SZ_64K \|\| args->nr_relocs > SZ_64K \|\|`
`473`		`- args->nr_bos > SZ_64K \|\| args->nr_pmrs > 128) {`
	`472`	`+ if (args->stream_size > SZ_128K \|\| args->nr_relocs > SZ_128K \|\|`
	`473`	`+ args->nr_bos > SZ_128K \|\| args->nr_pmrs > 128) {`
`474`	`474`	`DRM_ERROR("submit arguments out of size limits\n");`
`475`	`475`	`return -EINVAL;`
`476`	`476`	`}`