From patchwork Wed Jan 25 06:26:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9536443 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 189426042B for ; Wed, 25 Jan 2017 06:28:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1088C27D85 for ; Wed, 25 Jan 2017 06:28:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 05CBF27D9B; Wed, 25 Jan 2017 06:28:24 +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_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable 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 C50B027D85 for ; Wed, 25 Jan 2017 06:28:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CBFAC6E95F; Wed, 25 Jan 2017 06:27:26 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id EBD886E941 for ; Wed, 25 Jan 2017 06:27:19 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id c85so40094032wmi.1 for ; Tue, 24 Jan 2017 22:27:19 -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; bh=Zs1pBCUEOwBT/4Ixpft9N7unmGaIJPwPvcpApeJISg8=; b=IJtb8LajSK/3+BWG85xFvLaW5ZactHOIdwIDjDeXc2ubV43+tCd4ZN1zv2zsQUq5yk 4KCc8hYC0dj4Et/S73xiCqOaopw4VFG3d+sLlwh2uyrn3ugfU6bZK7RjtvBlhxcr00vn G+2EYr8zsc1lVcji2ButvccCcKDXm39I5s7Mc= 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; bh=Zs1pBCUEOwBT/4Ixpft9N7unmGaIJPwPvcpApeJISg8=; b=KpIvbqmSOxNfavbrP2FonAT8upl27/WoxtWsEwVq/6u/UyKro+VwOnrYfvA11ZX6j+ eeVQumbojDmjW9WoJm6PH7y3IJhlmVZgxcNrfKTVClw1Pmy8uDt+/aHarNE5s+pNUFBe sYpP87u6Ql6FpKXIVB0cgw8+1OCeoznBwxGzZ2ZnSC6Z9qBTa36OpWGpNFFgVWy1UngP lXougkvMcvRuPYr51kzXlEnxkCsW9I4vQ62S34FwAxZ0bX4iiQnaPr/1uiXD8x9sMND9 q9sec/0fIS817aUj9wBJqpPfC62i1gLHNls86jXV47/XLqOghiT0IHyJajs++FVUc6m6 ajkw== X-Gm-Message-State: AIkVDXJn9zLo2mfushDYHoxcvpMyzRXcJGP2ETA2ETuxUbkgkCC3LJ/PZ2KvvN/VdxqkUw== X-Received: by 10.223.134.68 with SMTP id 4mr38059981wrw.49.1485325638501; Tue, 24 Jan 2017 22:27:18 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:56c9:0:decc:6e78:7e96:b452]) by smtp.gmail.com with ESMTPSA id o42sm23252617wrb.18.2017.01.24.22.27.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 22:27:18 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Wed, 25 Jan 2017 07:26:54 +0100 Message-Id: <20170125062657.19270-13-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170125062657.19270-1-daniel.vetter@ffwll.ch> References: <20170125062657.19270-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH 12/15] drm/moc: Mark legacy fields in drm_driver as such X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP No point in documenting these, they only confuse. Signed-off-by: Daniel Vetter Reviewed-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 - include/drm/drm_drv.h | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 2534adaebe30..38c22c3c0d54 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -686,7 +686,6 @@ static struct drm_driver kms_driver = { DRIVER_USE_AGP | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET, - .dev_priv_size = 0, .load = amdgpu_driver_load_kms, .open = amdgpu_driver_open_kms, .preclose = amdgpu_driver_preclose_kms, diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index 8391135b95f2..732e85652d1e 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -81,7 +81,6 @@ struct drm_driver { * Zero on success, non-zero value on failure. */ int (*load) (struct drm_device *, unsigned long flags); - int (*firstopen) (struct drm_device *); int (*open) (struct drm_device *, struct drm_file *); void (*preclose) (struct drm_device *, struct drm_file *file_priv); void (*postclose) (struct drm_device *, struct drm_file *); @@ -103,9 +102,6 @@ struct drm_driver { * */ void (*unload) (struct drm_device *); - int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv); - int (*dma_quiescent) (struct drm_device *); - int (*context_dtor) (struct drm_device *dev, int context); int (*set_busid)(struct drm_device *dev, struct drm_master *master); /** @@ -413,13 +409,20 @@ struct drm_driver { char *date; u32 driver_features; - int dev_priv_size; const struct drm_ioctl_desc *ioctls; int num_ioctls; const struct file_operations *fops; + /* Everything below here is for legacy driver, never use! */ + /* private: */ + /* List of devices hanging off this driver with stealth attach. */ struct list_head legacy_dev_list; + int (*firstopen) (struct drm_device *); + int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv); + int (*dma_quiescent) (struct drm_device *); + int (*context_dtor) (struct drm_device *dev, int context); + int dev_priv_size; }; extern __printf(6, 7)