From patchwork Thu Feb 22 11:15:38 2018 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: 10235167 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 61A4660224 for ; Thu, 22 Feb 2018 11:16:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66AC328B85 for ; Thu, 22 Feb 2018 11:16:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B87428B8C; Thu, 22 Feb 2018 11:16:01 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 03F0B28B85 for ; Thu, 22 Feb 2018 11:16:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BE94A6ED3C; Thu, 22 Feb 2018 11:15:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9DEDC6ED47 for ; Thu, 22 Feb 2018 11:15:47 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id f3so2997805wmc.1 for ; Thu, 22 Feb 2018 03:15:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=nKz59ELIQ55kQvkknJF/mkHHpH7sNAP8WwxjUNVhx0M=; b=hEe8eJriuXWeXNDLEkB+ELr7YlpcC4er+3z24uYRmzjOd5y8T0X3sMa+1xYMkuefgb jcDMyaWS/m31wWdq4kAC4IyDUHBAmurJ9QrN15xFh2/M4G9ruyOn8cihaLf8Q+ETKOBQ rpMDSduGe7E1C8i7JeFgtIjNp+NidEx21X6CR8SPCrtWVndR6+WiS8t0uZuYXbWdKAUn yZBIWkU2yKJrnn50X7QdwWFJkTKkEJ+GU2f/qkkkU5wn9MG8Bg98qsVJOiKyBN4gF+gR Y1SSGR1JTWKOrpvHMBKdymmVg2uSEAevg5LFYg5MRc6epLanNi6mEKWiBmjn5KZzbLgh lJ4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nKz59ELIQ55kQvkknJF/mkHHpH7sNAP8WwxjUNVhx0M=; b=R7UtWQaLpMz3Zs7Kf7G92A4sRMk7Jhhn4wOB+3rqtVerDYexho3ZPS12G9Gpcm5x/r m3xPUQQMR3zYY7UIlFXBJqfAi6otZTLrm2UL8MSF8EbwGe8CJsDywEOSNDBSWJJWvXHT D92e3TmvbQNaq/HS9ROYSD+VjctLCt12Tp+DcGnUiBqI0LjwJrejBGSeF9Zi9X+XYmZ6 loe5zGpOi+URJ7bOJrXmGSZQq3W0KNVj4fNFqRbFAhlRwWKCGRVJTxg1oD0537iO0Osp G5322J8gv1ugIH9p5PhjfSvB9dAg6xRsdwobYLlCjq7vXnnu9Bib3DgIRmv2YEN2jDJE i2Sw== X-Gm-Message-State: APf1xPD7P4/HC2z4T/tpkfgKRKC3GdwNb4UK7JcJ35ULV1Q1UNfzOTrt 6fYUn2pVtTurBP26s35CglNbRg== X-Google-Smtp-Source: AH8x227YunNOSbO5nYKdHmmj3NxSibkxZhxyZCtjCtT8O0oVlsgLGPZtSDtsUfAwM3khuz5MXbYoYw== X-Received: by 10.28.45.151 with SMTP id t145mr4776020wmt.129.1519298146128; Thu, 22 Feb 2018 03:15:46 -0800 (PST) Received: from baker.fritz.box ([2a02:908:1251:8fc0:88c:4715:87af:fa74]) by smtp.gmail.com with ESMTPSA id m71sm238696wmd.6.2018.02.22.03.15.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2018 03:15:45 -0800 (PST) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: dri-devel@lists.freedesktop.org Subject: [PATCH 6/8] drm/qxl: remove ttm_pool_* wrappers Date: Thu, 22 Feb 2018 12:15:38 +0100 Message-Id: <20180222111540.43479-6-christian.koenig@amd.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180222111540.43479-1-christian.koenig@amd.com> References: <20180222111540.43479-1-christian.koenig@amd.com> MIME-Version: 1.0 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP TTM calls the default implementation now. Signed-off-by: Christian König --- drivers/gpu/drm/qxl/qxl_ttm.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c index 59cd74c3f3af..07d4f3fde6c1 100644 --- a/drivers/gpu/drm/qxl/qxl_ttm.c +++ b/drivers/gpu/drm/qxl/qxl_ttm.c @@ -291,26 +291,6 @@ static struct ttm_backend_func qxl_backend_func = { .destroy = &qxl_ttm_backend_destroy, }; -static int qxl_ttm_tt_populate(struct ttm_tt *ttm, - struct ttm_operation_ctx *ctx) -{ - int r; - - if (ttm->state != tt_unpopulated) - return 0; - - r = ttm_pool_populate(ttm, ctx); - if (r) - return r; - - return 0; -} - -static void qxl_ttm_tt_unpopulate(struct ttm_tt *ttm) -{ - ttm_pool_unpopulate(ttm); -} - static struct ttm_tt *qxl_ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size, uint32_t page_flags, struct page *dummy_read_page) @@ -379,8 +359,6 @@ static void qxl_bo_move_notify(struct ttm_buffer_object *bo, static struct ttm_bo_driver qxl_bo_driver = { .ttm_tt_create = &qxl_ttm_tt_create, - .ttm_tt_populate = &qxl_ttm_tt_populate, - .ttm_tt_unpopulate = &qxl_ttm_tt_unpopulate, .invalidate_caches = &qxl_invalidate_caches, .init_mem_type = &qxl_init_mem_type, .eviction_valuable = ttm_bo_eviction_valuable,