projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f995462
)
drm/i915/selftests: fix a couple IS_ERR() vs NULL tests
author
Dan Carpenter
<dan.carpenter@oracle.com>
Fri, 8 Jul 2022 09:41:04 +0000
(12:41 +0300)
committer
Rodrigo Vivi
<rodrigo.vivi@intel.com>
Tue, 12 Jul 2022 22:21:41 +0000
(18:21 -0400)
The shmem_pin_map() function doesn't return error pointers, it returns
NULL.
Fixes: be1cb55a07bf ("drm/i915/gt: Keep a no-frills swappable copy of the default context state")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20220708094104.GL2316@kadam
(cherry picked from commit
d50f5a109cf4ed50c5b575c1bb5fc3bd17b23308
)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/gt/selftest_lrc.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/gt/selftest_lrc.c
b/drivers/gpu/drm/i915/gt/selftest_lrc.c
index 8b2c11dbe354f604b99779acafc1ef9b1571ae5b..1109088fe8f632e2a533791af40d80bfe5374cac 100644
(file)
--- a/
drivers/gpu/drm/i915/gt/selftest_lrc.c
+++ b/
drivers/gpu/drm/i915/gt/selftest_lrc.c
@@
-176,8
+176,8
@@
static int live_lrc_layout(void *arg)
continue;
hw = shmem_pin_map(engine->default_state);
- if (
IS_ERR(hw)
) {
- err =
PTR_ERR(hw)
;
+ if (
!hw
) {
+ err =
-ENOMEM
;
break;
}
hw += LRC_STATE_OFFSET / sizeof(*hw);
@@
-365,8
+365,8
@@
static int live_lrc_fixed(void *arg)
continue;
hw = shmem_pin_map(engine->default_state);
- if (
IS_ERR(hw)
) {
- err =
PTR_ERR(hw)
;
+ if (
!hw
) {
+ err =
-ENOMEM
;
break;
}
hw += LRC_STATE_OFFSET / sizeof(*hw);