Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp5278950pxb; Wed, 19 Jan 2022 15:08:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJyeabtVGEHV8wF/J3hyRwXkSwCZN8RzIjZfWss6M8G5hmiZO+RUZxRmNHkaiKuwuF50e+1F X-Received: by 2002:a63:61d3:: with SMTP id v202mr17832900pgb.246.1642633682511; Wed, 19 Jan 2022 15:08:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642633682; cv=none; d=google.com; s=arc-20160816; b=LTnIDsIUR4zmsFu6R+vIxtd9B7Q11ctziJ0d1kwGa/SY+JhXFW1iD11uR+UT4vIDhO lD3/0HO0wHpGT7D4RwnKNeuiBdvvLjs2kTq/If4aISFCdjfTpotFO5wJbwn6ucmwOo8I dvR+Fz5pojpI9T50rtBEqghcqAtjxbJVDRKVYmadA9YqegG981IPI63KLWLSTEYdkjKH jJT7kK/+lKi71rrsdS3V4xqanuodB6Wk83zMsqDkuw8TzWzIemQIaqI3Hm4E644/oail XjtL3weFo1hm81wmuNeuxt6fqtwe+lMCpWmKBgcGeQ5xmXJTpT/M8UtpvTRg5hWqcbC3 55qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nHubPpVUFbRzFLg8T8kDPGraTUFZHSM+yB+IayI7i+s=; b=TnDcadOaLvmB830tVmvZTtsb/vbd5w7LJE6p3yqSLbptHDX7nCugSAeXb3kdrVn+Aa 7qDD81bqf1NLh1/U4yvNJCUrFMjv4lE2foyJ0gQYB2IwhwB+Tq8jakMqW579aZgf7m+o UlPmcPiJ+uazabpSAoGQoor0vOPra5xA4vYMW9vMy2rc1hQTjdDBK1L/E3Vk8h0KH+Ra QiDSnRO/QLOXuekVHHhDApzgxg4XjkNrIofqlMt+WsZ25gRh1fPq4ECHqZcscyiGTS30 AgEL7Wy/y6uNQr3onlt+hba6+DXlROdME8yQp69ZQ0ZY+4pKD7ShJeXIqzyv49kKEarD vZ9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@igel-co-jp.20210112.gappssmtp.com header.s=20210112 header.b=BNVQLfmQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 200si1215046pga.695.2022.01.19.15.07.50; Wed, 19 Jan 2022 15:08:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@igel-co-jp.20210112.gappssmtp.com header.s=20210112 header.b=BNVQLfmQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344599AbiARIho (ORCPT + 99 others); Tue, 18 Jan 2022 03:37:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344674AbiARIhd (ORCPT ); Tue, 18 Jan 2022 03:37:33 -0500 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 427F8C061748 for ; Tue, 18 Jan 2022 00:37:32 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id ie23-20020a17090b401700b001b38a5318easo2139680pjb.2 for ; Tue, 18 Jan 2022 00:37:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=igel-co-jp.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nHubPpVUFbRzFLg8T8kDPGraTUFZHSM+yB+IayI7i+s=; b=BNVQLfmQk6md7zj5f5A2JZMLlkVY3nsW+rWNMcDQFQSSESG1iJa90hai3eZwmBFsKn IrVMI1n4eyrPuICVT8b+BX/szy3mZ/xRbWkq9V6tQ8FhTSadk5weQSMhQvA7y+4Ve78T Jq9eRUhJyvV8+eBPuLyvaGXkpEBYcxGDqtObjkINyRsC5Rpeh+jrPgikvbbOodrLWtW9 9KBVPKwK7PPvNHOKARO3F6N9clDzEP/XvdHUGp/UyT7ZCemmm8AonZIvKt2vqjIcULbN boomgfHUy5Y968l+0He/v51djOdv4spkhmPe2t6R6dEtt2mTLdDXz8+XqXKKriiZl9Eo ZCww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nHubPpVUFbRzFLg8T8kDPGraTUFZHSM+yB+IayI7i+s=; b=DoEu3qEBdkUF+MwvDDdYcvnDHl/qw495iulvL5ulM9nAGbvpuJqpamZ+jE5Qfd/Y+1 KBV7VNSvBm5HMfwJeqkuOLRmwTxAcSSZ7Hrisp65v9qzEP9qugv9ZMFUx+VcOsvKTnd0 AWRQhDOSYdRRiLCPhbPPDlBHF/+z1Q2fvsOJqk7v5r1TJ4JUBko98EfZ8MczRnYiPTGb jVKRk9/k+taTc+yDbN5pIh6XUYPBnK0bnhBlWoWRn9YCC4FQEQ8PeQJu0o92UG8mGtyZ kpYr6gxM4Ez7N49+ZghHeAZzbxzbOQD7W2g3j8bU1onTb7ZNkrHJfutGg9s05RugU93b O/cg== X-Gm-Message-State: AOAM530f9CKGOdMWvzN704Ty4w8TKzV/ceQhhgd9Ajzkuuq2T4d9iXiN GOCOzXuSfsdXP/cyM0zEw6j5Bg== X-Received: by 2002:a17:90b:1b50:: with SMTP id nv16mr17412800pjb.93.1642495051777; Tue, 18 Jan 2022 00:37:31 -0800 (PST) Received: from aqua.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id c6sm1775615pjo.39.2022.01.18.00.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 00:37:31 -0800 (PST) From: Tomohito Esaki To: dri-devel@lists.freedesktop.org Cc: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Ben Skeggs , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Simon Ser , Qingqing Zhuo , Bas Nieuwenhuizen , Mark Yacoub , Sean Paul , Evan Quan , Andy Shevchenko , Petr Mladek , Sakari Ailus , Lee Jones , Abhinav Kumar , Dmitry Baryshkov , Rob Clark , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, Daniel Stone , Laurent Pinchart , Tomohito Esaki , Damian Hobson-Garcia , Takanari Hayama Subject: [RFC PATCH v4 3/3] drm: remove allow_fb_modifiers Date: Tue, 18 Jan 2022 17:36:52 +0900 Message-Id: <20220118083652.16335-4-etom@igel.co.jp> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220118083652.16335-1-etom@igel.co.jp> References: <20220118083652.16335-1-etom@igel.co.jp> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The allow_fb_modifiers flag is unnecessary since it has been replaced with cannot_support_modifiers flag. Signed-off-by: Tomohito Esaki --- drivers/gpu/drm/drm_plane.c | 9 --------- drivers/gpu/drm/selftests/test-drm_framebuffer.c | 1 - include/drm/drm_mode_config.h | 16 ---------------- 3 files changed, 26 deletions(-) diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 5aa7e241971e..89a3d044ab59 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -288,15 +288,6 @@ static int __drm_universal_plane_init(struct drm_device *dev, } } - /* autoset the cap and check for consistency across all planes */ - if (format_modifier_count) { - drm_WARN_ON(dev, !config->allow_fb_modifiers && - !list_empty(&config->plane_list)); - config->allow_fb_modifiers = true; - } else { - drm_WARN_ON(dev, config->allow_fb_modifiers); - } - plane->modifier_count = format_modifier_count; plane->modifiers = kmalloc_array(format_modifier_count, sizeof(format_modifiers[0]), diff --git a/drivers/gpu/drm/selftests/test-drm_framebuffer.c b/drivers/gpu/drm/selftests/test-drm_framebuffer.c index 61b44d3a6a61..f6d66285c5fc 100644 --- a/drivers/gpu/drm/selftests/test-drm_framebuffer.c +++ b/drivers/gpu/drm/selftests/test-drm_framebuffer.c @@ -323,7 +323,6 @@ static struct drm_device mock_drm_device = { .max_width = MAX_WIDTH, .min_height = MIN_HEIGHT, .max_height = MAX_HEIGHT, - .allow_fb_modifiers = true, .funcs = &mock_config_funcs, }, }; diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h index b73af96e2c96..c41df5932a6b 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -917,22 +917,6 @@ struct drm_mode_config { */ bool async_page_flip; - /** - * @allow_fb_modifiers: - * - * Whether the driver supports fb modifiers in the ADDFB2.1 ioctl call. - * Note that drivers should not set this directly, it is automatically - * set in drm_universal_plane_init(). - * - * IMPORTANT: - * - * If this is set the driver must fill out the full implicit modifier - * information in their &drm_mode_config_funcs.fb_create hook for legacy - * userspace which does not set modifiers. Otherwise the GETFB2 ioctl is - * broken for modifier aware userspace. - */ - bool allow_fb_modifiers; - /** * @fb_modifiers_not_supported: * -- 2.25.1