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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 826B0C433ED for ; Mon, 12 Apr 2021 15:01:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 385FE6128E for ; Mon, 12 Apr 2021 15:01:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 385FE6128E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD5506E5CF; Mon, 12 Apr 2021 15:01:04 +0000 (UTC) Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4430A6E5CC for ; Mon, 12 Apr 2021 15:01:03 +0000 (UTC) Received: by mail-wr1-x436.google.com with SMTP id h4so4248783wrt.12 for ; Mon, 12 Apr 2021 08:01:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=M+HH3G3g/0pLTiCkQMZstEq/tur77cz6G2XS8DBz2dE=; b=ix9JuoI/ozWylCqKoLzYD5L5lA8zWaLIQ+2TERUpIcNJjgShygexyH9xqt9bJCGRLp oP2CfviW+k4becQZLC1B0u7cC7j8n5VcweQ7VNIkOlURB8+OzMCjN5+NWEzRViCD4XKm I5ZihGLYyA9TJoInk9IR+4ncy7d+Owry6pLME= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=M+HH3G3g/0pLTiCkQMZstEq/tur77cz6G2XS8DBz2dE=; b=c2eGTA3Ysz/ZoRE74egTUcgq4RP3c8x4x3DS/ejr8tO0W78ty1oytYO18/3LZ6K7+C XaeTWh0LzwWXHzeZwwumvnewbHzFj4BqWixOGAe0MOHro5ZZERdPbHFjFoZkgLxlc+EW iGRcsgsImMHdlstX+ykJxLDNiX3aFhKcjcQDG49PqtRSe4KBaq85ov+xnw2SSXHW24X9 lUVKoVR0yoYCS/fwMWNBDfqBf3fjyha8v4gCdq1B0SE0nxzlAxLy02wAWWcV6g1yEq9a h1n1YZA6GCM13+zyXK/1lNWmIVEkxnTfV1YeWG71G/xa42Oi3JCyGpQ8CZq1LEulivSE STqA== X-Gm-Message-State: AOAM53262fKIHTuRIEWPzWM3m+eTW73VmrxmkgoVgViGKgGPKuYH2/Hx 5QNlsJN+LCcl+6gOnDW0Uu2s0Q== X-Google-Smtp-Source: ABdhPJxrKIbUfalvmRCpk4xhyzDGPZRkbXbzk+VuA5SRlzaTXGJzvSD/ISTOoPraZ43LymKtrr197A== X-Received: by 2002:a5d:4cc9:: with SMTP id c9mr31633576wrt.117.1618239661977; Mon, 12 Apr 2021 08:01:01 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id v189sm15738946wme.39.2021.04.12.08.01.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 08:01:01 -0700 (PDT) Date: Mon, 12 Apr 2021 17:00:59 +0200 From: Daniel Vetter To: Matthew Auld Message-ID: References: <20210412090526.30547-1-matthew.auld@intel.com> <20210412090526.30547-8-matthew.auld@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210412090526.30547-8-matthew.auld@intel.com> X-Operating-System: Linux phenom 5.7.0-1-amd64 Subject: Re: [Intel-gfx] [PATCH 07/19] drm/i915/fbdev: Use lmem physical addresses for fb_mmap() on discrete X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mohammed Khajapasha , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, Apr 12, 2021 at 10:05:14AM +0100, Matthew Auld wrote: > From: Mohammed Khajapasha > > use local memory io BAR address for fbdev's fb_mmap() operation on > discrete, fbdev uses the physical address of our framebuffer for its > fb_mmap() fn. > > Signed-off-by: Mohammed Khajapasha Sob missing (I didn't check all previous patches), but also I think we should aim more to reuse drm fbdev helpers and retire our owns here. Eventually, long-term, and all that. -Daniel > --- > drivers/gpu/drm/i915/display/intel_fbdev.c | 29 +++++++++++++++++----- > 1 file changed, 23 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c > index ccd00e65a5fe..2b37959da747 100644 > --- a/drivers/gpu/drm/i915/display/intel_fbdev.c > +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c > @@ -41,6 +41,8 @@ > #include > #include > > +#include "gem/i915_gem_lmem.h" > + > #include "i915_drv.h" > #include "intel_display_types.h" > #include "intel_fbdev.h" > @@ -178,6 +180,7 @@ static int intelfb_create(struct drm_fb_helper *helper, > unsigned long flags = 0; > bool prealloc = false; > void __iomem *vaddr; > + struct drm_i915_gem_object *obj; > int ret; > > if (intel_fb && > @@ -232,13 +235,27 @@ static int intelfb_create(struct drm_fb_helper *helper, > info->fbops = &intelfb_ops; > > /* setup aperture base/size for vesafb takeover */ > - info->apertures->ranges[0].base = ggtt->gmadr.start; > - info->apertures->ranges[0].size = ggtt->mappable_end; > + obj = intel_fb_obj(&intel_fb->base); > + if (i915_gem_object_is_lmem(obj)) { > + struct intel_memory_region *mem = obj->mm.region; > + > + info->apertures->ranges[0].base = mem->io_start; > + info->apertures->ranges[0].size = mem->total; > + > + /* Use fbdev's framebuffer from lmem for discrete */ > + info->fix.smem_start = > + (unsigned long)(mem->io_start + > + i915_gem_object_get_dma_address(obj, 0)); > + info->fix.smem_len = obj->base.size; > + } else { > + info->apertures->ranges[0].base = ggtt->gmadr.start; > + info->apertures->ranges[0].size = ggtt->mappable_end; > > - /* Our framebuffer is the entirety of fbdev's system memory */ > - info->fix.smem_start = > - (unsigned long)(ggtt->gmadr.start + vma->node.start); > - info->fix.smem_len = vma->node.size; > + /* Our framebuffer is the entirety of fbdev's system memory */ > + info->fix.smem_start = > + (unsigned long)(ggtt->gmadr.start + vma->node.start); > + info->fix.smem_len = vma->node.size; > + } > > vaddr = i915_vma_pin_iomap(vma); > if (IS_ERR(vaddr)) { > -- > 2.26.3 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx