From patchwork Sat Feb 22 17:54:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11398277 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 A151A930 for ; Sat, 22 Feb 2020 17:54:45 +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 76526206ED for ; Sat, 22 Feb 2020 17:54:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="h6YvFFfM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76526206ED Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 560B86E96A; Sat, 22 Feb 2020 17:54:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by gabe.freedesktop.org (Postfix) with ESMTPS id E4BAC6E969 for ; Sat, 22 Feb 2020 17:54:40 +0000 (UTC) Received: by mail-wm1-x32e.google.com with SMTP id a9so5211676wmj.3 for ; Sat, 22 Feb 2020 09:54:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lwDm2OlkUyaElN02AldWQQrzxsnfcCauG4tM+zkjPSU=; b=h6YvFFfMBaO84i86fCz/yflsB8VJIPF0XQU8QTyEJvo4UyiQ2NnvRZ1B7wpX6t1j92 NnI6PPYYL3mqzKX/1Yf7/26rLaQWZXev7I+SKmCMVi1YihFPJKPCofQadRisgxI3MM5g cxlZ+dLvUMAydg+aiRtdh8ndtnwJ8jV2By7Rk= 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:mime-version :content-transfer-encoding; bh=lwDm2OlkUyaElN02AldWQQrzxsnfcCauG4tM+zkjPSU=; b=kK5xu5aP0VwNij/4vzHN0QX6b9dpjqE7Fs2i2fAkgggCC0h432vNB/HwLECxQ3zz36 Huh2aCkZx0ZtTXqP1clO/x2vJpIHiaciRhziw8deVbFbwMYOXMtNT2cJ3vffE3oBQhZn U1QA7fwN2qW0dnHi3c2ut7mZ47EusM36b03mdc6YGiet5WrjDbMx96KKPTGlcUS5Kswc 3NN7YBhFVBxf3Q1+Ugjspyxuq2cpYNR9V1HL7VA2fag9aRcIWT7pVC8QiC8Bakept9Yj q5T+zihD5ra/xJv6qlRif5ooB0PUsi/J9HBMRwAoPohTmeDnKb2pVrZBl466v/cPBbsH mUzg== X-Gm-Message-State: APjAAAWmkui9G/AVWysy9UFND5CejkoUCE4BtkPUBcBbIhNjukFqiLEQ ElRLLOrf1jtipAR7ulvH7vFN0EIRIjQ= X-Google-Smtp-Source: APXvYqw+YfcL/1ZT3sTq8eYCYgk5Op69Z/yKfFP1A9oAMZuV8IJeQzev7R7KEy5bV1J6vsqIkXWgkQ== X-Received: by 2002:a7b:cd92:: with SMTP id y18mr11675393wmj.133.1582394079331; Sat, 22 Feb 2020 09:54:39 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l15sm9373405wrv.39.2020.02.22.09.54.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Feb 2020 09:54:38 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 1/3] drm/amdgpu: Drop DRIVER_USE_AGP Date: Sat, 22 Feb 2020 18:54:31 +0100 Message-Id: <20200222175433.2259158-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 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: Daniel Vetter , =?utf-8?b?TWFyZWsgT2zFocOhaw==?= , "Tianci.Yin" , Hawking Zhang , Hans de Goede , Alex Deucher , Daniel Vetter , Evan Quan , =?utf-8?q?Christian_K=C3=B6nig?= , Xiaojie Yuan Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This doesn't do anything except auto-init drm_agp support when you call drm_get_pci_dev(). Which amdgpu stopped doing with commit b58c11314a1706bf094c489ef5cb28f76478c704 Author: Alex Deucher Date: Fri Jun 2 17:16:31 2017 -0400 drm/amdgpu: drop deprecated drm_get_pci_dev and drm_put_dev No idea whether this was intentional or accidental breakage, but I guess anyone who manages to boot a this modern gpu behind an agp bridge deserves a price. A price I never expect anyone to ever collect :-) Cc: Alex Deucher Cc: "Christian König" Cc: Hawking Zhang Cc: Xiaojie Yuan Cc: Evan Quan Cc: "Tianci.Yin" Cc: "Marek Olšák" Cc: Hans de Goede Signed-off-by: Daniel Vetter Reviewed-by: Emil Velikov Reviewed-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 4598836c5fa4..6cea92017109 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1379,7 +1379,7 @@ int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv) static struct drm_driver kms_driver = { .driver_features = - DRIVER_USE_AGP | DRIVER_ATOMIC | + DRIVER_ATOMIC | DRIVER_GEM | DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ | DRIVER_SYNCOBJ_TIMELINE, From patchwork Sat Feb 22 17:54:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11398279 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 E48EF930 for ; Sat, 22 Feb 2020 17:54:49 +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 C39EF206ED for ; Sat, 22 Feb 2020 17:54:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="Xe6ViE0S" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C39EF206ED Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 515746E96B; Sat, 22 Feb 2020 17:54:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3EAE06E969 for ; Sat, 22 Feb 2020 17:54:42 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id w12so5619935wrt.2 for ; Sat, 22 Feb 2020 09:54:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MJWGaxMUKVFJF6qqk3Gzcv8gSfm1oFTteY5HRbRqSd8=; b=Xe6ViE0S3L+FQtUqUyyBUV/mvHKlCG4SkV050TiY3lPiW4s3w70TrVULhHrqnMFPBx vTQbU8ZSnFwhaA+pDLVJRl0syROZ2hLldsXkqns3qKT+MLxWyrQg4NeNGvzNyPdjWPye D3gFvK+jspfTPEqw7L+y600SbXAcMXtQhtRxM= 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=MJWGaxMUKVFJF6qqk3Gzcv8gSfm1oFTteY5HRbRqSd8=; b=ONgMNpPC9dGpjI73+e5Rrf3FctZgSmnHZV8WSVFDu7OxYubq20yaE5KrOY/6HSOMrx I8kBpn5hrPjM/wEd/MMOKTiLu8mxCs+3Gny/Ejnvz3jS//CLQ0+a7cheiuMrDM59ajx3 ScPsKxqOd3w4E2eNRZYInkbjHewQ5K8CGMk32Vd9zpk+sETZI8I+2qIMYdcICEZVCLB9 iT5f52lC8lzQwBxsV4bu20taLFy1Fsyrmv1PcTphTW1knNcO4qT8uiIn9CaNJ9e2BSKm i4uDm+2uF4r9Krs26co+T9pUET29iN2OM1H8auITYCGaZbP1LiR3JKI+83ZlzsUxzzij V/Bg== X-Gm-Message-State: APjAAAXORlmbJZL9TbS/DFKVLqIrCupD2vzINl8M5YNF09tZ1NASgDXP S5KnQ91ehTg6sC8KdcCscgOgcY1V2ew= X-Google-Smtp-Source: APXvYqzcY/7+ZhK3LAgCvZdKQ2CGuNKrKMNl/HiDRDpputuW9Sz6U6N2cmBJDcNCZ5Q4MSOfpvKbEg== X-Received: by 2002:adf:f641:: with SMTP id x1mr3445375wrp.248.1582394080619; Sat, 22 Feb 2020 09:54:40 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l15sm9373405wrv.39.2020.02.22.09.54.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Feb 2020 09:54:40 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 2/3] drm/radeon: Inline drm_get_pci_dev Date: Sat, 22 Feb 2020 18:54:32 +0100 Message-Id: <20200222175433.2259158-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200222175433.2259158-1-daniel.vetter@ffwll.ch> References: <20200222175433.2259158-1-daniel.vetter@ffwll.ch> 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: Daniel Vetter , amd-gfx@lists.freedesktop.org, Alex Deucher , Daniel Vetter , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" It's the last user, and more importantly, it's the last non-legacy user of anything in drm_pci.c. The only tricky bit is the agp initialization. But a close look shows that radeon does not use the drm_agp midlayer (the main use of that is drm_bufs for legacy drivers), and instead could use the agp subsystem directly (like nouveau does already). Hence we can just pull this in too. A further step would be to entirely drop the use of drm_device->agp, but feels like too much churn just for this patch. Signed-off-by: Daniel Vetter Cc: Alex Deucher Cc: "Christian König" Cc: "David (ChunMing) Zhou" Cc: amd-gfx@lists.freedesktop.org --- drivers/gpu/drm/radeon/radeon_drv.c | 43 +++++++++++++++++++++++++++-- drivers/gpu/drm/radeon/radeon_kms.c | 6 ++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 49ce2e7d5f9e..59f8186a2415 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -37,6 +37,7 @@ #include #include +#include #include #include #include @@ -322,6 +323,7 @@ static int radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { unsigned long flags = 0; + struct drm_device *dev; int ret; if (!ent) @@ -362,7 +364,44 @@ static int radeon_pci_probe(struct pci_dev *pdev, if (ret) return ret; - return drm_get_pci_dev(pdev, ent, &kms_driver); + dev = drm_dev_alloc(&kms_driver, &pdev->dev); + if (IS_ERR(dev)) + return PTR_ERR(dev); + + ret = pci_enable_device(pdev); + if (ret) + goto err_free; + + dev->pdev = pdev; +#ifdef __alpha__ + dev->hose = pdev->sysdata; +#endif + + pci_set_drvdata(pdev, dev); + + if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP)) + dev->agp = drm_agp_init(dev); + if (dev->agp) { + dev->agp->agp_mtrr = arch_phys_wc_add( + dev->agp->agp_info.aper_base, + dev->agp->agp_info.aper_size * + 1024 * 1024); + } + + ret = drm_dev_register(dev, ent->driver_data); + if (ret) + goto err_agp; + + return 0; + +err_agp: + if (dev->agp) + arch_phys_wc_del(dev->agp->agp_mtrr); + kfree(dev->agp); + pci_disable_device(pdev); +err_free: + drm_dev_put(dev); + return ret; } static void @@ -562,7 +601,7 @@ static const struct file_operations radeon_driver_kms_fops = { static struct drm_driver kms_driver = { .driver_features = - DRIVER_USE_AGP | DRIVER_GEM | DRIVER_RENDER, + DRIVER_GEM | DRIVER_RENDER, .load = radeon_driver_load_kms, .open = radeon_driver_open_kms, .postclose = radeon_driver_postclose_kms, diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index cab891f86dc0..58176db85952 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -77,6 +78,11 @@ void radeon_driver_unload_kms(struct drm_device *dev) radeon_modeset_fini(rdev); radeon_device_fini(rdev); + if (dev->agp) + arch_phys_wc_del(dev->agp->agp_mtrr); + kfree(dev->agp); + dev->agp = NULL; + done_free: kfree(rdev); dev->dev_private = NULL; From patchwork Sat Feb 22 17:54:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11398281 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 DFA19930 for ; Sat, 22 Feb 2020 17:54:51 +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 BDD23206ED for ; Sat, 22 Feb 2020 17:54:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="hKqORRJT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDD23206ED Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 DF6386E96D; Sat, 22 Feb 2020 17:54:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 28CFD6E96B for ; Sat, 22 Feb 2020 17:54:43 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id c84so5208061wme.4 for ; Sat, 22 Feb 2020 09:54:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QQFvAt89gHl5sehwV/pl0yi99opLB2JHobZcXKnTrO0=; b=hKqORRJTd70oa/J2y02zfUU8qinK6hqjuWEmGltzuSRVM6/MnApX18zlCkMPvcdtUO 9rlkFQ6Ma3xSyZdkLZDpK6sITem52UXq2ReZ49HhvyQhbXkiu2ma9uKaUWbGdZVIJ5UL vOoiP/Tu7Y80NjrdO+cxxDG2Nv0ysm2J4VLYc= 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=QQFvAt89gHl5sehwV/pl0yi99opLB2JHobZcXKnTrO0=; b=nP5o6K6Jo/1vJgIbCMHEwG4qvn8gb1g+GPRDvxkEIDWGsxO3L9yS/8lBA4GME2mHjo +wKx42XvMfZJF53hnFYIDQGNAB8MPIFzf7g0T/HEa9UnSOj6xqINCPgrSUh177mi9Mi9 bXFbDBia+wYXSGnc+DTej9Eo6HyAIemSSeo+IE3b+6JeZ1XSPUQ2p/gOXYhbJoBlIVxS Yc/O0b71wf+5/DAehO5e7RFJ1+eARlhHvGgCncXpwyvW/qzT6tbNnI6VautxwCYD/hiI 6AUqtZEuZlDy3aP8Posgg6V3VlHR/LujHyfm5lyHCYM36aZNm8kd2FuxHBP5OIEIl7rg VjIA== X-Gm-Message-State: APjAAAUT/xU+5p4w0lvRdsNHjup8/P4AzMAhXn8rC2f2ErzWMH+UM6pT M4OEdple6o+Ah6qGxFTPE6R6UlEuLX8= X-Google-Smtp-Source: APXvYqyjt5zA2ve60feeJb2PFCi0UinIIk/AEvSclzkH/YH5W9JBxd2rrV/XuAXEJfdcdJZaP4MziQ== X-Received: by 2002:a05:600c:248:: with SMTP id 8mr11134623wmj.1.1582394081490; Sat, 22 Feb 2020 09:54:41 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l15sm9373405wrv.39.2020.02.22.09.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Feb 2020 09:54:41 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 3/3] drm/pci: Unexport drm_get_pci_dev Date: Sat, 22 Feb 2020 18:54:33 +0100 Message-Id: <20200222175433.2259158-3-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200222175433.2259158-1-daniel.vetter@ffwll.ch> References: <20200222175433.2259158-1-daniel.vetter@ffwll.ch> 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: Daniel Vetter , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Only user left is the shadow attach for legacy drivers. Signed-off-by: Daniel Vetter Reviewed-by: Emil Velikov Reviewed-by: Thomas Zimmermann --- drivers/gpu/drm/drm_pci.c | 22 +++------------------- include/drm/drm_pci.h | 11 ----------- 2 files changed, 3 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index c6bb98729a26..cc5af271a1b1 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -75,7 +75,6 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali return dmah; } - EXPORT_SYMBOL(drm_pci_alloc); /** @@ -191,23 +190,9 @@ void drm_pci_agp_destroy(struct drm_device *dev) } } -/** - * drm_get_pci_dev - Register a PCI device with the DRM subsystem - * @pdev: PCI device - * @ent: entry from the PCI ID table that matches @pdev - * @driver: DRM device driver - * - * Attempt to gets inter module "drm" information. If we are first - * then register the character device and inter module information. - * Try and register, if we fail to register, backout previous work. - * - * NOTE: This function is deprecated, please use drm_dev_alloc() and - * drm_dev_register() instead and remove your &drm_driver.load callback. - * - * Return: 0 on success or a negative error code on failure. - */ -int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, - struct drm_driver *driver) +static int drm_get_pci_dev(struct pci_dev *pdev, + const struct pci_device_id *ent, + struct drm_driver *driver) { struct drm_device *dev; int ret; @@ -250,7 +235,6 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, drm_dev_put(dev); return ret; } -EXPORT_SYMBOL(drm_get_pci_dev); #ifdef CONFIG_DRM_LEGACY diff --git a/include/drm/drm_pci.h b/include/drm/drm_pci.h index 9031e217b506..3941b0255ecf 100644 --- a/include/drm/drm_pci.h +++ b/include/drm/drm_pci.h @@ -45,10 +45,6 @@ struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size, size_t align); void drm_pci_free(struct drm_device *dev, struct drm_dma_handle * dmah); -int drm_get_pci_dev(struct pci_dev *pdev, - const struct pci_device_id *ent, - struct drm_driver *driver); - #else static inline struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, @@ -62,13 +58,6 @@ static inline void drm_pci_free(struct drm_device *dev, { } -static inline int drm_get_pci_dev(struct pci_dev *pdev, - const struct pci_device_id *ent, - struct drm_driver *driver) -{ - return -ENOSYS; -} - #endif #endif /* _DRM_PCI_H_ */