From patchwork Thu Jul 16 12:50:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 11667387 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6D45113B1 for ; Thu, 16 Jul 2020 12:50:59 +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 4A10F20739 for ; Thu, 16 Jul 2020 12:50:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AW/huOfS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A10F20739 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF17C6E2EC; Thu, 16 Jul 2020 12:50:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id C0D4F6EC52 for ; Thu, 16 Jul 2020 12:50:45 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id g75so10178344wme.5 for ; Thu, 16 Jul 2020 05:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MVt2UIP9z62sIXejPtAZcSw37yhcfnBWkAmW3FivEeA=; b=AW/huOfSPeOD0OSs/yEe+txByn/6DykdE6z+LT2LlxV4//EnKvijLvt8GAEynEP3QN MhPAFlI2Ysw8cZ6niHaVpOOzeQv4PtTsW0kA4xD0jbRtfgTZG1QKVytjGIzaX0Tr3Cip CNvk7f4JJYI6dUsgxztzf2UxCwUBkaeeRUPMVRR+diVppYwKGXpiJTNvPQ3UVVuQqYwe S888ImcfCBN24XVeS7Uo1WZ9sdYtLq8HWxoqY6SBrnKVby1ou98Q4ZXYFcvz6SFSMAN1 qjFfQYOW+WpVlGNIC3a6pfFlO3Ex4QtnDtU3euzIEiwmcoU+TjfNLgDxhZDD1vs5tWvg gm1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MVt2UIP9z62sIXejPtAZcSw37yhcfnBWkAmW3FivEeA=; b=NZSGV2SvRvP0tIWH/nP5Tl0jZgcL03R/1jfmWl1L1Yw6KHkhrGF781h+bUNKwzNjEY taAIiNNlyFjDjAfdFEG05ZvvwdF7tkxVbsHV4c7lkqvd8tgnzE5hJeJG2AQqtJOIVs+S 9QJT1ZFAx/ereaAVCJb4/1sasvr2zmf2pY+TTS4zGZBeOfs4xPxP1PbKsYIbii9JfKBL K5a5ZM8f31W/5CSBJBuu5Y5mBWJQ3nNYbr2N3cXzEJR8svMUnR0MYJL1PkGrJdqpEiBN RcRu4jKB20AtvWyJQDFJbkEWMiseX/oIYG1chHbg+gkjI+skETdGqwbaPPhVWEd5P+s7 64aA== X-Gm-Message-State: AOAM5325M95tajK4FXJQg12oGujZ5Gkfcfp2nhXg00pmEbd9sHmOEWRJ RyYOHnStIgHf1QGIMuvT1tnotOD+ X-Google-Smtp-Source: ABdhPJx7tjPKzcVsRQcQHvVEgAaTnz5OB18EbhXl4ryhc2QxIr4aAG86CcAgnnrEq8xRrIHWfrUQZQ== X-Received: by 2002:a7b:c4d8:: with SMTP id g24mr4023199wmk.127.1594903844032; Thu, 16 Jul 2020 05:50:44 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:efc1:eb01:18eb:bff2]) by smtp.gmail.com with ESMTPSA id z25sm7669872wmk.28.2020.07.16.05.50.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2020 05:50:43 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org Subject: [PATCH 6/8] drm/qxl: stop using TTM_MEMTYPE_FLAG_MAPPABLE Date: Thu, 16 Jul 2020 14:50:35 +0200 Message-Id: <20200716125037.67437-6-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200716125037.67437-1-christian.koenig@amd.com> References: <20200716125037.67437-1-christian.koenig@amd.com> MIME-Version: 1.0 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: Madhav.Chauhan@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The driver doesn't expose any not-mapable memory resources. Signed-off-by: Christian König --- drivers/gpu/drm/qxl/qxl_ttm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c index a6e67149ef4a..820eb190d292 100644 --- a/drivers/gpu/drm/qxl/qxl_ttm.c +++ b/drivers/gpu/drm/qxl/qxl_ttm.c @@ -54,7 +54,7 @@ static int qxl_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, switch (type) { case TTM_PL_SYSTEM: /* System memory */ - man->flags = TTM_MEMTYPE_FLAG_MAPPABLE; + man->flags = 0; man->available_caching = TTM_PL_MASK_CACHING; man->default_caching = TTM_PL_FLAG_CACHED; break; @@ -62,8 +62,7 @@ static int qxl_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, case TTM_PL_PRIV: /* "On-card" video ram */ man->func = &ttm_bo_manager_func; - man->flags = TTM_MEMTYPE_FLAG_FIXED | - TTM_MEMTYPE_FLAG_MAPPABLE; + man->flags = TTM_MEMTYPE_FLAG_FIXED; man->available_caching = TTM_PL_MASK_CACHING; man->default_caching = TTM_PL_FLAG_CACHED; break; @@ -107,8 +106,7 @@ int qxl_ttm_io_mem_reserve(struct ttm_bo_device *bdev, mem->bus.size = mem->num_pages << PAGE_SHIFT; mem->bus.base = 0; mem->bus.is_iomem = false; - if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE)) - return -EINVAL; + switch (mem->mem_type) { case TTM_PL_SYSTEM: /* system memory */