From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C8FB8C76196 for ; Thu, 6 Apr 2023 11:03:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5B15B10EB57; Thu, 6 Apr 2023 11:03:02 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 13EAA10EB57 for ; Thu, 6 Apr 2023 11:02:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680778975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W9PADBV7kdrsYwkgT7yvWF1gcrM9r8sRUlyu8sOkzqE=; b=MDvAhGyBkcudqNTJtkfNA3aNK6aIq1ctKkCATFHeqXa5NMHyQ65Qi+8kHMElt60e4ekOWC qfyc6bOMPUv2cfDh1hNJGTqNGcer32bXur9YKkSHZ5TCJbdx5IgmVeaHv2tJ1n5WPq+kAZ P4+rCaXUylarblOnZz7OLQpeRePWCSg= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-670-snyZeDCLOzeeFsQZ3irOkw-1; Thu, 06 Apr 2023 07:02:54 -0400 X-MC-Unique: snyZeDCLOzeeFsQZ3irOkw-1 Received: by mail-wr1-f69.google.com with SMTP id d5-20020adfa345000000b002d716fc080fso4899807wrb.22 for ; Thu, 06 Apr 2023 04:02:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680778973; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W9PADBV7kdrsYwkgT7yvWF1gcrM9r8sRUlyu8sOkzqE=; b=8IWvgdV8DvsN/GuGCGVFKgqjNnukjpFTunReXovtat92+cl70mov0O3gUHyO6pbVvK dBUo/eD635DzfvnpH6xUwgzeY3oDG+Mp5MDc8J4DeolNbNQ78YvQih4ij4GvRmzrAGlp xvLMpO+Adv4tW5ldbzV9ZYEPknO59gtdOY/AKofgzKELjCbl2mRIcz1CfgZBc9Qbdt87 eDLd/Gxe4gXWPSH5pEVwI4Avq7otqsoH5gXOdszCKd0DGMlVUp9DkxIXfYtA6f1h/L4b ps0effGyUnWv0BoxGMmv3IOK4qjS0ZEug0Ce+nIrg8iJbLhj+GxmEwcYGv9FyCwthPZk 7ZZg== X-Gm-Message-State: AAQBX9e4ug/mzKVLn9jD5EabRGzD09m5pB9+1YmDPKIl9kcBUlgewSc9 f4XPlD83y/KtH47bClsq2OJJNFMsqohO65pNAYjQhNZLaFIvMoze8WSqiMpMFkuGH9uPBELJL6O G/GT4WdZ8IXaqTnekGWRuN6Bvbwqd X-Received: by 2002:adf:f44d:0:b0:2d2:3ca:8c43 with SMTP id f13-20020adff44d000000b002d203ca8c43mr7623952wrp.31.1680778973630; Thu, 06 Apr 2023 04:02:53 -0700 (PDT) X-Google-Smtp-Source: AKy350b6JKhqw/6XDyaEayJzxte+WOAAroTJ4RHjeRqTghA3qFfh8cm9uXUn7uG9fUuRMoP4XtdxlA== X-Received: by 2002:adf:f44d:0:b0:2d2:3ca:8c43 with SMTP id f13-20020adff44d000000b002d203ca8c43mr7623929wrp.31.1680778973292; Thu, 06 Apr 2023 04:02:53 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id b6-20020a05600010c600b002d8566128e5sm1472401wrx.25.2023.04.06.04.02.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 04:02:53 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [PATCH 2/2] drm/vkms: Remove include Date: Thu, 6 Apr 2023 13:02:35 +0200 Message-Id: <20230406110235.3092055-3-javierm@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230406110235.3092055-1-javierm@redhat.com> References: <20230406110235.3092055-1-javierm@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Haneen Mohammed , Thomas Zimmermann , Rodrigo Siqueira , =?UTF-8?q?Ma=C3=ADra=20Canal?= , Javier Martinez Canillas , dri-devel@lists.freedesktop.org, Melissa Wen , Marius Vlad Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The driver doesn't use simple-KMS helpers to set a simple display pipeline but it only uses the drm_simple_encoder_init() helper from simple-KMS that initializes and encoder. That helper is just a wrapper of drm_encoder_init(), but passing a struct drm_encoder_funcs that sets the .destroy handler to drm_encoder_cleanup(). Since the header is only included for this helper and because the connector is initialized with drm_connector_init() as well, do the same for the encoder and drop the header include. Signed-off-by: Javier Martinez Canillas --- drivers/gpu/drm/vkms/vkms_output.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c index 4de6f8ae38be..5ce70dd946aa 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -4,7 +4,6 @@ #include #include #include -#include static const struct drm_connector_funcs vkms_connector_funcs = { .fill_modes = drm_helper_probe_single_connector_modes, @@ -14,6 +13,10 @@ static const struct drm_connector_funcs vkms_connector_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; +static const struct drm_encoder_funcs vkms_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + static int vkms_conn_get_modes(struct drm_connector *connector) { int count; @@ -86,7 +89,8 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index) drm_connector_helper_add(connector, &vkms_conn_helper_funcs); - ret = drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_VIRTUAL); + ret = drm_encoder_init(dev, encoder, &vkms_encoder_funcs, + DRM_MODE_ENCODER_VIRTUAL, NULL); if (ret) { DRM_ERROR("Failed to init encoder\n"); goto err_encoder; -- 2.40.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0189C76196 for ; Thu, 6 Apr 2023 11:03:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236989AbjDFLDr (ORCPT ); Thu, 6 Apr 2023 07:03:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236684AbjDFLDn (ORCPT ); Thu, 6 Apr 2023 07:03:43 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 204E461BF for ; Thu, 6 Apr 2023 04:02:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680778977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W9PADBV7kdrsYwkgT7yvWF1gcrM9r8sRUlyu8sOkzqE=; b=K6T8Cxeusk9tBwuid+TsZsopn1FouKLESD4Y5MiDQQUwYBzmy7ftY25IFwfoXF1noiS7j8 CTabkr8DP4kTnnwGnwCEPUt8XLAYtdjuokUPLUqkxj1NNqPssgTD8/mBeysACPCBhuzwEt efM29HRfNp1tmCukc+lbjIJX8SlUNAo= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-486-gZzYQ7NxOpCeYBN4MSf4iA-1; Thu, 06 Apr 2023 07:02:56 -0400 X-MC-Unique: gZzYQ7NxOpCeYBN4MSf4iA-1 Received: by mail-wr1-f72.google.com with SMTP id bn9-20020a056000060900b002cfe8493fe6so4785263wrb.4 for ; Thu, 06 Apr 2023 04:02:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680778973; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W9PADBV7kdrsYwkgT7yvWF1gcrM9r8sRUlyu8sOkzqE=; b=1hIHOQMOKOj37htjjEqfQzsWCCwqEWHxNMbHOFuu3aQem8MLP/eYFyJ4NwS4n/NgK2 E7ReYqLVHv5xxvfMFO6oUtep7kbTQ+bg/fNr8y/qLKvb1/qws0sE19c5MjT8mHBhmVOL P9zb/YmI7BYemP15qyZFY3nj4pP5eoF7YUcFcWePI6l6ytypyVfLemIzCTwzDJjgcp5h 017AqL8IqSxPkWH440ThRb8xQeh9eKeymOg8kQvCnF4KDoti3KjhUtYsm5aPR9H9VTL0 kGnV3G8CejMo6taJw2KJDsCr9HJ36ph86LZfU97q7udzsn+WoCpz2Bia0RDprej7NBcq sFFg== X-Gm-Message-State: AAQBX9elt8NyqM8F/0K8rQX88OlOVi7jPaD1N/0msRxqE0QCdh0FYzpq e6ssblAhSU3IAbs8p4mxPcT7j1CdrOtb5cZtqWJUizwtBwZNiKLsMoWJZocoKi2CD1SS8Iy/mS6 enrr7H9Uiq5lQ8LCq7j5WriDEpyGwk3bx5goNEPDYay6785TsUT0tA/v7Zxo9Yj8/FJ8Ktzt6Eq qWEj1G5Uo= X-Received: by 2002:adf:f44d:0:b0:2d2:3ca:8c43 with SMTP id f13-20020adff44d000000b002d203ca8c43mr7623967wrp.31.1680778973660; Thu, 06 Apr 2023 04:02:53 -0700 (PDT) X-Google-Smtp-Source: AKy350b6JKhqw/6XDyaEayJzxte+WOAAroTJ4RHjeRqTghA3qFfh8cm9uXUn7uG9fUuRMoP4XtdxlA== X-Received: by 2002:adf:f44d:0:b0:2d2:3ca:8c43 with SMTP id f13-20020adff44d000000b002d203ca8c43mr7623929wrp.31.1680778973292; Thu, 06 Apr 2023 04:02:53 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id b6-20020a05600010c600b002d8566128e5sm1472401wrx.25.2023.04.06.04.02.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 04:02:53 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Thomas Zimmermann , =?UTF-8?q?Ma=C3=ADra=20Canal?= , Marius Vlad , Javier Martinez Canillas , Daniel Vetter , David Airlie , Haneen Mohammed , Melissa Wen , Rodrigo Siqueira , dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/vkms: Remove include Date: Thu, 6 Apr 2023 13:02:35 +0200 Message-Id: <20230406110235.3092055-3-javierm@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230406110235.3092055-1-javierm@redhat.com> References: <20230406110235.3092055-1-javierm@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver doesn't use simple-KMS helpers to set a simple display pipeline but it only uses the drm_simple_encoder_init() helper from simple-KMS that initializes and encoder. That helper is just a wrapper of drm_encoder_init(), but passing a struct drm_encoder_funcs that sets the .destroy handler to drm_encoder_cleanup(). Since the header is only included for this helper and because the connector is initialized with drm_connector_init() as well, do the same for the encoder and drop the header include. Signed-off-by: Javier Martinez Canillas --- drivers/gpu/drm/vkms/vkms_output.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c index 4de6f8ae38be..5ce70dd946aa 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -4,7 +4,6 @@ #include #include #include -#include static const struct drm_connector_funcs vkms_connector_funcs = { .fill_modes = drm_helper_probe_single_connector_modes, @@ -14,6 +13,10 @@ static const struct drm_connector_funcs vkms_connector_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; +static const struct drm_encoder_funcs vkms_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + static int vkms_conn_get_modes(struct drm_connector *connector) { int count; @@ -86,7 +89,8 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index) drm_connector_helper_add(connector, &vkms_conn_helper_funcs); - ret = drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_VIRTUAL); + ret = drm_encoder_init(dev, encoder, &vkms_encoder_funcs, + DRM_MODE_ENCODER_VIRTUAL, NULL); if (ret) { DRM_ERROR("Failed to init encoder\n"); goto err_encoder; -- 2.40.0