lkml.org 
[lkml]   [2021]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 036/137] drm/i915/selftests: Fix return value check in live_breadcrumbs_smoketest()
    Date
    From: Zhihao Cheng <chengzhihao1@huawei.com>

    [ Upstream commit 10c1f0cbcea93beec5d3bdc02b1a3b577b4985e7 ]

    In case of error, the function live_context() returns ERR_PTR() and never
    returns NULL. The NULL test in the return value check should be replaced
    with IS_ERR().

    Fixes: 52c0fdb25c7c ("drm/i915: Replace global breadcrumbs with per-context interrupt tracking")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
    Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/33c46ef24cd547d0ad21dc106441491a@intel.com
    [tursulin: Wrap commit text, fix Fixes: tag.]
    Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
    (cherry picked from commit 8f4caef8d5401b42c6367d46c23da5e0e8111516)
    Signed-off-by: Jani Nikula <jani.nikula@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/i915/selftests/i915_request.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
    index e424a6d1a68c..7a72faf29f27 100644
    --- a/drivers/gpu/drm/i915/selftests/i915_request.c
    +++ b/drivers/gpu/drm/i915/selftests/i915_request.c
    @@ -1391,8 +1391,8 @@ static int live_breadcrumbs_smoketest(void *arg)

    for (n = 0; n < smoke[0].ncontexts; n++) {
    smoke[0].contexts[n] = live_context(i915, file);
    - if (!smoke[0].contexts[n]) {
    - ret = -ENOMEM;
    + if (IS_ERR(smoke[0].contexts[n])) {
    + ret = PTR_ERR(smoke[0].contexts[n]);
    goto out_contexts;
    }
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-06-08 21:01    [W:4.665 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site