From patchwork Thu Aug 1 11:19:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vikas C Sajjan X-Patchwork-Id: 2836946 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 07D249F7D6 for ; Thu, 1 Aug 2013 11:19:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5FC6920214 for ; Thu, 1 Aug 2013 11:19:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C318820158 for ; Thu, 1 Aug 2013 11:19:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754699Ab3HALTo (ORCPT ); Thu, 1 Aug 2013 07:19:44 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:45096 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754426Ab3HALTn (ORCPT ); Thu, 1 Aug 2013 07:19:43 -0400 Received: by mail-pa0-f45.google.com with SMTP id bg4so2020987pad.4 for ; Thu, 01 Aug 2013 04:19:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=185x51dJslGVRsw4slrn0FL62nlB4RZwHhFlMWp4XzY=; b=G9md+JnExirzG7HwszUpKykxF5DySmYbQGelP82HCA7/3LWEXYQ+unYSUJOJFS05mZ cBvC7a4nQJLEDzB3Sw3qLDC8Emsx7YQQJCJU6/dyx7S3e+vaSi7k/mOMdqa2Ei4ZGR9M Eb8olgIW9Rb7WOdX5mgYTGNsZj/mwp4lf1Ddh+r1vdL+60yrFegQ19lQ4rXTKY5fa9/A S3f7OdNdpzL9TwCvq0S/MKCuxQ+b3AGdIG4s2dBz4+G/c0dN/gY6C7kNoQTgI4y6+3/Z vO2FG8gDQylCAZ/Hh9but2Qi/Rpmhe0PqfTe79VMH3xDd60qiBszbrOzASsWykrY1q0T 2M7w== X-Received: by 10.66.120.145 with SMTP id lc17mr3315937pab.182.1375355982989; Thu, 01 Aug 2013 04:19:42 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPSA id eq5sm3502220pbc.15.2013.08.01.04.19.38 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 Aug 2013 04:19:41 -0700 (PDT) From: Vikas Sajjan To: linux-samsung-soc@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org, kgene.kim@samsung.com, inki.dae@samsung.com, arun.kk@samsung.com, patches@linaro.org, linaro-kernel@lists.linaro.org Subject: [PATCH] drm/exynos: Add check for IOMMU while passing physically continous memory flag Date: Thu, 1 Aug 2013 16:49:32 +0530 Message-Id: <1375355972-25276-1-git-send-email-vikas.sajjan@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQluu0v+1nNK3Dus0QBUGsSoaLCbPZFn0uPvdiJEoPCUO3/ZgI99POWzNXclr1429s8Kwz67 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-8.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP While trying to get boot-logo up on exynos5420 SMDK which has eDP panel connected with resolution 2560x1600, following error occured even with IOMMU enabled: [0.880000] [drm:lowlevel_buffer_allocate] *ERROR* failed to allocate buffer. [0.890000] [drm] Initialized exynos 1.0.0 20110530 on minor 0 This patch fixes the issue by adding a check for IOMMU. Signed-off-by: Vikas Sajjan Signed-off-by: Arun Kumar --- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index 8e60bd6..2a86666 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -16,6 +16,7 @@ #include #include #include +#include #include "exynos_drm_drv.h" #include "exynos_drm_fb.h" @@ -143,6 +144,7 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper, struct platform_device *pdev = dev->platformdev; unsigned long size; int ret; + unsigned int flag; DRM_DEBUG_KMS("surface width(%d), height(%d) and bpp(%d\n", sizes->surface_width, sizes->surface_height, @@ -166,7 +168,12 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper, size = mode_cmd.pitches[0] * mode_cmd.height; /* 0 means to allocate physically continuous memory */ - exynos_gem_obj = exynos_drm_gem_create(dev, 0, size); + if (!is_drm_iommu_supported(dev)) + flag = 0; + else + flag = EXYNOS_BO_NONCONTIG; + + exynos_gem_obj = exynos_drm_gem_create(dev, flag, size); if (IS_ERR(exynos_gem_obj)) { ret = PTR_ERR(exynos_gem_obj); goto err_release_framebuffer;