From patchwork Mon Mar 6 12:07:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nirmoy Das X-Patchwork-Id: 13161026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DCDADC61DA4 for ; Mon, 6 Mar 2023 12:07:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 63B6010E361; Mon, 6 Mar 2023 12:07:45 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1673A10E2FE; Mon, 6 Mar 2023 12:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678104463; x=1709640463; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=M84jNf4aUyYLv2UQIE5p33djHd9HeOdrxvHzPhsYdfs=; b=Tj3QRhT4j9ottG5h7rx7IrZUspT73DvQBuTm5GmXt0HxWglppu2Ekpju kXeOHOHfHsk/scfWYu1SIzX56n5aE7i9Qnvk6zu06VtnfmdOK5S+3spAN 2E1ST3sayj2/RXYju/Y2rr9OC9w4fhthoO/wLTMv1YYjv0H0Hd8jDmoK9 D6ZCQ/GmR5nvmfvcnY2zY5IG5HHgKQtoZ0EgluIeAHvhkBkLkD+S8RlQx yYvyDX33XsPQgcg5kpTejW2SeZvn/OL2YLHIdawFY8qEGUTD1c0yVXf5z 1qsSbaDGqMVA0er3l/aQG7GdqPu348zDXUXw9fnjrGHqyf9mqMfLazrwN A==; X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="315196917" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="315196917" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 04:07:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="819278243" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="819278243" Received: from nirmoyda-desk.igk.intel.com ([10.102.42.231]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 04:07:41 -0800 From: Nirmoy Das To: intel-gfx@lists.freedesktop.org Subject: [PATCH RFC v2 3/3] drm/i915/display: Implement fb_mmap callback function Date: Mon, 6 Mar 2023 13:07:32 +0100 Message-Id: <20230306120732.28656-3-nirmoy.das@intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230306120732.28656-1-nirmoy.das@intel.com> References: <20230306120732.28656-1-nirmoy.das@intel.com> MIME-Version: 1.0 Organization: Intel Deutschland GmbH, Registered Address: Am Campeon 10, 85579 Neubiberg, Germany, Commercial Register: Amtsgericht Muenchen HRB 186928 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andrzej.hajda@intel.com, andi.shyti@intel.com, matthew.auld@intel.com, dri-devel@lists.freedesktop.org, Nirmoy Das Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" If stolen memory allocation fails for fbdev, the driver will fallback to system memory. Calculation of smem_start is wrong for such framebuffer objs if the platform comes with no gmadr or no aperture. Solve this by adding fb_mmap callback which also gives driver more control. v2: Remove unused var. Signed-off-by: Nirmoy Das --- drivers/gpu/drm/i915/display/intel_fbdev.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c index 98ae3a3a986a..161c2610976a 100644 --- a/drivers/gpu/drm/i915/display/intel_fbdev.c +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c @@ -40,8 +40,10 @@ #include #include #include +#include #include "gem/i915_gem_lmem.h" +#include "gem/i915_gem_mman.h" #include "i915_drv.h" #include "intel_display_types.h" @@ -120,6 +122,22 @@ static int intel_fbdev_pan_display(struct fb_var_screeninfo *var, return ret; } +#define to_intel_fbdev(x) container_of(x, struct intel_fbdev, helper) +static int intel_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma) +{ + struct intel_fbdev *fbdev = to_intel_fbdev(info->par); + struct drm_gem_object *bo = drm_gem_fb_get_obj(&fbdev->fb->base, 0); + struct drm_i915_gem_object *obj = to_intel_bo(bo); + + vma->vm_page_prot = + pgprot_writecombine(vm_get_page_prot(vma->vm_flags)); + + if (obj->stolen) + return vm_iomap_memory(vma, info->fix.smem_start, + info->fix.smem_len); + + return i915_gem_object_mmap(obj, vma); +} static const struct fb_ops intelfb_ops = { .owner = THIS_MODULE, DRM_FB_HELPER_DEFAULT_OPS, @@ -131,6 +149,7 @@ static const struct fb_ops intelfb_ops = { .fb_imageblit = drm_fb_helper_cfb_imageblit, .fb_pan_display = intel_fbdev_pan_display, .fb_blank = intel_fbdev_blank, + .fb_mmap = intel_fbdev_mmap, }; static int intelfb_alloc(struct drm_fb_helper *helper,