From patchwork Fri May 18 14:17:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10414195 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D4D99600CC for ; Mon, 21 May 2018 08:26:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4E17287AE for ; Mon, 21 May 2018 08:26:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9B9D287BD; Mon, 21 May 2018 08:26:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4FD91287AE for ; Mon, 21 May 2018 08:26:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED97D6E361; Mon, 21 May 2018 08:20:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id E97C36EDB4 for ; Fri, 18 May 2018 14:17:57 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1000) id CED1560C54; Fri, 18 May 2018 14:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1526653077; bh=WIqA3HVLw3DX2FHE3E3O6H7xzQSl4a5SgAfxUqH3+H4=; h=From:To:Cc:Subject:Date:From; b=XU0F32fVORwPxXUmVRMpMFgV5McXy4fEwR9fEIBILOh95dED6hu3Dv15at1b9P3wv l9EeMmbjXuCZG2yIAOuuXuIjmMypth+hlRQK2JikwlxIMz2mp7man0edTY/XmCPBHn PkdHLatcVAZ+ZtiU2h0FMhp1PeLSm1OSgg1rzsPg= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 8CCF46085F; Fri, 18 May 2018 14:17:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1526653077; bh=WIqA3HVLw3DX2FHE3E3O6H7xzQSl4a5SgAfxUqH3+H4=; h=From:To:Cc:Subject:Date:From; b=XU0F32fVORwPxXUmVRMpMFgV5McXy4fEwR9fEIBILOh95dED6hu3Dv15at1b9P3wv l9EeMmbjXuCZG2yIAOuuXuIjmMypth+hlRQK2JikwlxIMz2mp7man0edTY/XmCPBHn PkdHLatcVAZ+ZtiU2h0FMhp1PeLSm1OSgg1rzsPg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8CCF46085F Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-fbdev@vger.kernel.org, timur@codeaurora.org Subject: [PATCH V2 1/2] efi/fb: Simplify fixup code to prefer struct resource Date: Fri, 18 May 2018 10:17:50 -0400 Message-Id: <1526653072-7153-1-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 21 May 2018 08:18:08 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartlomiej Zolnierkiewicz , linux-arm-msm@vger.kernel.org, open list , "open list:FRAMEBUFFER LAYER" , Sinan Kaya , Peter Jones , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Get rid of base and size variables in favor of a struct resource. The conditional for checking window can be replaced with resource_contains(). Signed-off-by: Sinan Kaya Reviewed-by: Ard Biesheuvel Acked-by: Bartlomiej Zolnierkiewicz Acked-by: Bartlomiej Zolnierkiewicz --- drivers/video/fbdev/efifb.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c index 46a4484..6daac8d 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -426,17 +426,20 @@ static void record_efifb_bar_resource(struct pci_dev *dev, int idx, u64 offset) static void efifb_fixup_resources(struct pci_dev *dev) { - u64 base = screen_info.lfb_base; - u64 size = screen_info.lfb_size; + struct resource screen_res = { + .start = screen_info.lfb_base, + .end = screen_info.lfb_base + screen_info.lfb_size - 1, + .flags = IORESOURCE_MEM, + }; int i; if (efifb_pci_dev || screen_info.orig_video_isVGA != VIDEO_TYPE_EFI) return; if (screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE) - base |= (u64)screen_info.ext_lfb_base << 32; + screen_res.start |= (u64)screen_info.ext_lfb_base << 32; - if (!base) + if (!screen_res.start) return; for (i = 0; i <= PCI_STD_RESOURCE_END; i++) { @@ -445,8 +448,10 @@ static void efifb_fixup_resources(struct pci_dev *dev) if (!(res->flags & IORESOURCE_MEM)) continue; - if (res->start <= base && res->end >= base + size - 1) { - record_efifb_bar_resource(dev, i, base - res->start); + if (resource_contains(res, &screen_res)) { + u64 win_offset = screen_res.start - res->start; + + record_efifb_bar_resource(dev, i, win_offset); break; } }