From patchwork Mon Dec 2 17:28:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 11269419 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 CE378109A for ; Mon, 2 Dec 2019 17:29:54 +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 B637920848 for ; Mon, 2 Dec 2019 17:29:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B637920848 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 A47B66E287; Mon, 2 Dec 2019 17:29:53 +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 D0A606E290 for ; Mon, 2 Dec 2019 17:29:51 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id w15so139933wru.4 for ; Mon, 02 Dec 2019 09:29:51 -0800 (PST) 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=q6xOsIVEpmTEM/MXwaq1zb46mExyiH314du/gb6pfek=; b=EDCuRFeb3w5ruIrzlBxyivHjlJAiDHE8qKgdl7REEVN1pvP6WZbuwH/WnrA4Li0QKG K+R5U9z1ptogTfC8xxvBy+qlzG9t6h5FuSAOmLYQMA7BPfSsyT3neWE/zJkPhJ8XCWyb Vf0I29FAkJ1GB2nN7tjXSYKhgzy6PRLHgB12YI2A6dgxz7cvr9Q+Oj/hHuDbq3gAlHY5 Xp1LPTssAMbiHqmOk2LA7E7w2s2c7lW8K8kTXEuBjTkVdVOZ1bHWwJMj0VmmdmHzV50d Xu8z5Pa19udGhsjUVsdJfdJ8nRRVJUWIbqaw8M4fwEg+7Wwce6V8NFMbPRB7HGPF2wx/ KM2Q== X-Gm-Message-State: APjAAAV+UcUfvwoLnD5jd5MZmHimPatOG0W4kfDWFVgY5x7iVJ/HNuKO SwNCERIiC3Q8ipaP2VvDXAf5vUav X-Google-Smtp-Source: APXvYqxlE2kvb1fbewJM4/J8bUUsnVZCt4DWJM9fYUSVQYJ4GNec2MJudDeYYg8gp/yyQ1CrwwS/og== X-Received: by 2002:adf:fc08:: with SMTP id i8mr34196wrr.82.1575307790205; Mon, 02 Dec 2019 09:29:50 -0800 (PST) Received: from arch-x1c3.cbg.collabora.co.uk ([2a00:5f00:102:0:9665:9cff:feee:aa4d]) by smtp.gmail.com with ESMTPSA id r63sm438800wma.2.2019.12.02.09.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 09:29:49 -0800 (PST) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm: remove no longer used .master_{create, destroy} callbacks Date: Mon, 2 Dec 2019 17:28:53 +0000 Message-Id: <20191202172853.19569-1-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=q6xOsIVEpmTEM/MXwaq1zb46mExyiH314du/gb6pfek=; b=FEHDqWzTPCbk3OqStoWev/OQw6Qh7gm5/wP0r/2MwdI2VaaA9UB1nBGdxmzd99c1ll 6H3C3stmG0ZrwcskbetfGySFsROrRr9RSNqJUoop4CwgvT7PTmy8LsYKnJDEAfutW1QK 9JGv2h5o0my895LcyCa9Xzfty/kgeLv0l9MBaJ14s9/x8uk+uNSfo3I9pGyBCJ5T/EYa R477afg4C9aAAB8ZQ/TDCeEjqMQ8cPPawEmdKsRnpDZGzUzvBeKGWKwjDKcijK/LSms3 7uYW3rwb8k6AXL+CCY/b18W9sjEiGbMVFFDcRkHuK233NRjd+cWyuPjFS7KhwY9nxwET 2TiQ== 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: , Cc: Daniel Vetter , Thomas Hellstrom , emil.l.velikov@gmail.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Emil Velikov Up-to recently the only driver which required these was vmwgfx. With commit 9c84aeba67cc ("drm/vmwgfx: Kill unneeded legacy security features") the driver no longer sets them, so we can drop the unused infra. Cc: Thomas Hellstrom Cc: Daniel Vetter Signed-off-by: Emil Velikov Reviewed-by: Daniel Vetter --- drivers/gpu/drm/drm_auth.c | 8 -------- include/drm/drm_drv.h | 14 -------------- 2 files changed, 22 deletions(-) diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index cc9acd986c68..531b876d0ed8 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -153,11 +153,6 @@ static int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv) return -ENOMEM; } - if (dev->driver->master_create) { - ret = dev->driver->master_create(dev, fpriv->master); - if (ret) - goto out_err; - } fpriv->is_master = 1; fpriv->authenticated = 1; @@ -332,9 +327,6 @@ static void drm_master_destroy(struct kref *kref) if (drm_core_check_feature(dev, DRIVER_MODESET)) drm_lease_destroy(master); - if (dev->driver->master_destroy) - dev->driver->master_destroy(dev, master); - drm_legacy_master_rmmaps(dev, master); idr_destroy(&master->magic_map); diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index cf13470810a5..4300e85db457 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -457,20 +457,6 @@ struct drm_driver { */ void (*irq_uninstall) (struct drm_device *dev); - /** - * @master_create: - * - * Called whenever a new master is created. Only used by vmwgfx. - */ - int (*master_create)(struct drm_device *dev, struct drm_master *master); - - /** - * @master_destroy: - * - * Called whenever a master is destroyed. Only used by vmwgfx. - */ - void (*master_destroy)(struct drm_device *dev, struct drm_master *master); - /** * @master_set: *