From patchwork Wed Jan 17 13:53:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10169309 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 6EBDC6055D for ; Wed, 17 Jan 2018 13:53:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 605B2251F4 for ; Wed, 17 Jan 2018 13:53:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5523728555; Wed, 17 Jan 2018 13:53:20 +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=ham 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 3F733251F4 for ; Wed, 17 Jan 2018 13:53:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DB9B96E456; Wed, 17 Jan 2018 13:53:15 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 D286E6E456 for ; Wed, 17 Jan 2018 13:53:14 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id i186so15316812wmi.4 for ; Wed, 17 Jan 2018 05:53:14 -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=AAfyMsBYL/XUcmiwlrgsB6guwEhnUiUMfHCkt0++UL4=; b=MMGP7JoRgNXfQhbBVeu/y3YwknmhGfN2cpE1FlCTduf67SkLpHdEyaiuMwyEYjUafJ 7+tYZsozJ/k+jYObBrizvT/GTyj2UUqReJMqGaTMiwEiiQQfQ+IPC402jXmGF+cMuHB+ OJQPf920DARbns/FkZuMo/swbWYuswlxvx+6I= 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=AAfyMsBYL/XUcmiwlrgsB6guwEhnUiUMfHCkt0++UL4=; b=W1TvBQgobQtutZB9o8+gKaYU/jXhnOJN2I7+lJaZ6wf7iPBym9aAmzQ5jSKjPaxRi9 tZhyy+x485TcHW64dK3uzqKJgUZfjuFXv/Vg9wzOVaHUdBhxWFPuZuF8F70bmKbUH7+V m4Qv/9vmX9SZyYwrkBkFgH83do6eP9rUTGKEVw7AnwWScC3nO6XDkXu6aWZ0eYe2wHeO JTO4tA2VG6Quam6hwb6y0gMA01IMQLwda5HywOZWvbcxYkiSkVpcrlc+iwbzey43opYz J7uyn8mc3iw31vvGDFDr0PReLokSH+aUUkBX5Zh7+eZFoRCRMPMB1WQNbMriy+yntxFD p/Cw== X-Gm-Message-State: AKwxytdtfo7QGHr1PnfpFQK7QF86+8Fm4uMEhZmhSiGReAsMPHz5veMq aeFPEIghVY3S9jAsrnsjZ0kJ+MkM X-Google-Smtp-Source: ACJfBovbGdhBgLuSBa+EPY5m0yRWdlD1ODcglm102A83J4qEmJkuI/Qep6jw0xBAY9R9KQq5LCI2xA== X-Received: by 10.80.245.10 with SMTP id t10mr2962187edm.168.1516197193088; Wed, 17 Jan 2018 05:53:13 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:56e6:0:e4bc:76a0:8042:669e]) by smtp.gmail.com with ESMTPSA id k42sm3471208edb.44.2018.01.17.05.53.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2018 05:53:12 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/arcpgu: remove drm_encoder_slave Date: Wed, 17 Jan 2018 14:53:07 +0100 Message-Id: <20180117135307.26660-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180117134347.27582-1-daniel.vetter@ffwll.ch> References: <20180117134347.27582-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Alexey Brodkin , Laurent Pinchart , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP drm_encoder_slave is the old way to write bridge drivers, for i2c bridges only. It's deprecated, and definitely should not be used in new drivers. What's even strange is that arcpgu doesn't even use any of this, it really only wants a plain normal drm_encoder. Nuke all the surplus real estate. v2: Actually git add after compile testing ... Cc: Laurent Pinchart Cc: Alexey Brodkin Signed-off-by: Daniel Vetter Reviewed-by: Laurent Pinchart --- drivers/gpu/drm/arc/arcpgu_sim.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/arc/arcpgu_sim.c b/drivers/gpu/drm/arc/arcpgu_sim.c index bca3a678c955..19f5a781666d 100644 --- a/drivers/gpu/drm/arc/arcpgu_sim.c +++ b/drivers/gpu/drm/arc/arcpgu_sim.c @@ -29,7 +29,6 @@ struct arcpgu_drm_connector { struct drm_connector connector; - struct drm_encoder_slave *encoder_slave; }; static int arcpgu_drm_connector_get_modes(struct drm_connector *connector) @@ -68,7 +67,7 @@ static struct drm_encoder_funcs arcpgu_drm_encoder_funcs = { int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np) { struct arcpgu_drm_connector *arcpgu_connector; - struct drm_encoder_slave *encoder; + struct drm_encoder *encoder; struct drm_connector *connector; int ret; @@ -76,10 +75,10 @@ int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np) if (encoder == NULL) return -ENOMEM; - encoder->base.possible_crtcs = 1; - encoder->base.possible_clones = 0; + encoder->possible_crtcs = 1; + encoder->possible_clones = 0; - ret = drm_encoder_init(drm, &encoder->base, &arcpgu_drm_encoder_funcs, + ret = drm_encoder_init(drm, encoder, &arcpgu_drm_encoder_funcs, DRM_MODE_ENCODER_VIRTUAL, NULL); if (ret) return ret; @@ -101,21 +100,19 @@ int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np) goto error_encoder_cleanup; } - ret = drm_mode_connector_attach_encoder(connector, &encoder->base); + ret = drm_mode_connector_attach_encoder(connector, encoder); if (ret < 0) { dev_err(drm->dev, "could not attach connector to encoder\n"); drm_connector_unregister(connector); goto error_connector_cleanup; } - arcpgu_connector->encoder_slave = encoder; - return 0; error_connector_cleanup: drm_connector_cleanup(connector); error_encoder_cleanup: - drm_encoder_cleanup(&encoder->base); + drm_encoder_cleanup(encoder); return ret; }