From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A34B8C76186 for ; Mon, 29 Jul 2019 19:46:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78442217D6 for ; Mon, 29 Jul 2019 19:46:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564429590; bh=Rs5o3o5qUNTTGMCmzR7zw5kPElIN8kAPuvZuC5E72B4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mp/g/gWuio73l61roI8lz0+iNyMkscLfTMpMnpTJr1Id3ScPr2eyqPwx8MGWOeBRW 6mB/ezuIvjq7TsL1doE5pu7FK6rzeIuh6O/9k+txednzCqa07vShn6F74wNSlpXIvm FuIxl49/Zhp7YHAK2ihzPE0qmTEoo050GtrNCONQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389797AbfG2Tq3 (ORCPT ); Mon, 29 Jul 2019 15:46:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:35752 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389627AbfG2Tq3 (ORCPT ); Mon, 29 Jul 2019 15:46:29 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8806B205F4; Mon, 29 Jul 2019 19:46:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564429588; bh=Rs5o3o5qUNTTGMCmzR7zw5kPElIN8kAPuvZuC5E72B4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rFBzVg39JrZO5bgjFYmp/WNpUZ0qMC6L2U/bKkUnoBIubm272y+TwOf8pcRNyBaey Se9E/McwsBHRNKaf2VhQIOXwpeqr3FuK+3/14XXUX7ui2FLQrerAwDUjxNoceHQMls O4JOaNVcMQFENkctlX55zhJ21xnu2neSjDIf+cWs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Griffin , Rob Herring , Daniel Vetter , Qiang Yu , Sasha Levin Subject: [PATCH 5.2 004/215] drm/lima: handle shared irq case for lima_pp_bcast_irq_handler Date: Mon, 29 Jul 2019 21:20:00 +0200 Message-Id: <20190729190740.513034682@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190729190739.971253303@linuxfoundation.org> References: <20190729190739.971253303@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 409c53f07a81f8db122c461f3255c6f43558c881 ] On Hikey board all lima ip blocks are shared with one irq. This patch avoids a NULL ptr deref crash on this platform on startup. Tested with Weston and kmscube. Signed-off-by: Peter Griffin Cc: Rob Herring Cc: Daniel Vetter Cc: Qiang Yu Signed-off-by: Qiang Yu Link: https://patchwork.freedesktop.org/patch/msgid/1555662781-22570-7-git-send-email-peter.griffin@linaro.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/lima/lima_pp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/lima/lima_pp.c b/drivers/gpu/drm/lima/lima_pp.c index d29721e177bf..8fef224b93c8 100644 --- a/drivers/gpu/drm/lima/lima_pp.c +++ b/drivers/gpu/drm/lima/lima_pp.c @@ -64,7 +64,13 @@ static irqreturn_t lima_pp_bcast_irq_handler(int irq, void *data) struct lima_ip *pp_bcast = data; struct lima_device *dev = pp_bcast->dev; struct lima_sched_pipe *pipe = dev->pipe + lima_pipe_pp; - struct drm_lima_m450_pp_frame *frame = pipe->current_task->frame; + struct drm_lima_m450_pp_frame *frame; + + /* for shared irq case */ + if (!pipe->current_task) + return IRQ_NONE; + + frame = pipe->current_task->frame; for (i = 0; i < frame->num_pp; i++) { struct lima_ip *ip = pipe->processor[i]; -- 2.20.1