From patchwork Wed Dec 15 06:55:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1568038 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JDQxy1Zt9z9t0k for ; Wed, 15 Dec 2021 17:56:06 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mxOCk-0007wQ-Pg; Wed, 15 Dec 2021 06:55:58 +0000 Received: from mail-pf1-f182.google.com ([209.85.210.182]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mxOCi-0007sy-Hd for kernel-team@lists.ubuntu.com; Wed, 15 Dec 2021 06:55:56 +0000 Received: by mail-pf1-f182.google.com with SMTP id i12so19877399pfd.6 for ; Tue, 14 Dec 2021 22:55:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YgGo9Yc4p+wy8Bt4SlDkX0xZQrdpnMEL0QMRh5UbJ/0=; b=2hxLe3gay8tTnxuXeKkVghGqNbqIkirWEEqh1CWs4u7eHaVKZlkfW7PZDhagc4fUUn E8ddxcdkYXUEGhVn8jNzsD0uyiiyI+AGWWK62jCtgTAJEzeiq1Ur2qCHmDu5LML8+GMN 3C1Vbw8gvZ00NuWr2A3y0w14ye99YzRMjVuDwBFLexhkTOFL1sZ5LWgc6GHpDlm1+Cp9 sI8rYJ42ZP2qS2JOVxomXqrFGVcFvdwvkwvUz+LLZmbHC3iCGBf5QKrMay39TcyXw4Gh TQ5Y5+1+GFOMK2dcmMGXSUrc2LMVtSqhQYws5K1TsGXDmsmtzYgYhWdKGUv18HmIGrPZ fQWg== X-Gm-Message-State: AOAM531hv0YkDdziL9nR2rPWLmtKlDV/O0lypd2qRFtuT5SRvd6xFrS1 pB+/7gkr3fFlA869YjmwukGKYVw3LdA= X-Google-Smtp-Source: ABdhPJwC6ySvZdBhDXbFVtWnj+8HQniGCQ8XhLWGU3O+XLh/X5k0tb1PtNobFtF+fPeMespLgLbuiQ== X-Received: by 2002:a63:42c1:: with SMTP id p184mr6945727pga.440.1639551354165; Tue, 14 Dec 2021 22:55:54 -0800 (PST) Received: from localhost (218-173-164-169.dynamic-ip.hinet.net. [218.173.164.169]) by smtp.gmail.com with ESMTPSA id y6sm1376291pfi.154.2021.12.14.22.55.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Dec 2021 22:55:53 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 05/14][SRU][OEM-5.14] drm/amd/display: Add NULL checks for vblank workqueue Date: Wed, 15 Dec 2021 14:55:33 +0800 Message-Id: <20211215065542.388563-6-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215065542.388563-1-vicamo.yang@canonical.com> References: <20211215065542.388563-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.210.182; envelope-from=vicamo@gmail.com; helo=mail-pf1-f182.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Nicholas Kazlauskas BugLink: https://bugs.launchpad.net/bugs/1953008 [Why] If we're running a headless config with 0 links then the vblank workqueue will be NULL - causing a NULL pointer exception during any commit. [How] Guard access to the workqueue if it's NULL and don't queue or flush work if it is. Reported-by: Mike Lothian BugLink: https://gitlab.freedesktop.org/drm/amd/-/issues/1700 Fixes: 58aa1c50e5a231 ("drm/amd/display: Use vblank control events for PSR enable/disable") Signed-off-by: Nicholas Kazlauskas Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher (cherry picked from commit b3a7b268c147119a9776185b4f37e1555ead9d68) Signed-off-by: You-Sheng Yang --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index b16736e7ed39..181ba1006288 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6187,21 +6187,23 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable) return 0; #if defined(CONFIG_DRM_AMD_DC_DCN) - work = kzalloc(sizeof(*work), GFP_ATOMIC); - if (!work) - return -ENOMEM; + if (dm->vblank_control_workqueue) { + work = kzalloc(sizeof(*work), GFP_ATOMIC); + if (!work) + return -ENOMEM; - INIT_WORK(&work->work, vblank_control_worker); - work->dm = dm; - work->acrtc = acrtc; - work->enable = enable; + INIT_WORK(&work->work, vblank_control_worker); + work->dm = dm; + work->acrtc = acrtc; + work->enable = enable; - if (acrtc_state->stream) { - dc_stream_retain(acrtc_state->stream); - work->stream = acrtc_state->stream; - } + if (acrtc_state->stream) { + dc_stream_retain(acrtc_state->stream); + work->stream = acrtc_state->stream; + } - queue_work(dm->vblank_control_workqueue, &work->work); + queue_work(dm->vblank_control_workqueue, &work->work); + } #endif return 0; @@ -8873,7 +8875,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, * If PSR or idle optimizations are enabled then flush out * any pending work before hardware programming. */ - flush_workqueue(dm->vblank_control_workqueue); + if (dm->vblank_control_workqueue) + flush_workqueue(dm->vblank_control_workqueue); #endif bundle->stream_update.stream = acrtc_state->stream; @@ -9208,7 +9211,8 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) /* if there mode set or reset, disable eDP PSR */ if (mode_set_reset_required) { #if defined(CONFIG_DRM_AMD_DC_DCN) - flush_workqueue(dm->vblank_control_workqueue); + if (dm->vblank_control_workqueue) + flush_workqueue(dm->vblank_control_workqueue); #endif amdgpu_dm_psr_disable_all(dm); }