From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg Subject: Re: [PATCH v2 2/4] drm/ast: Use simple encoder Date: Thu, 20 Feb 2020 20:09:43 +0100 Message-ID: <20200220190943.GB20011@ravnborg.org> References: <20200218084815.2137-1-tzimmermann@suse.de> <20200218084815.2137-3-tzimmermann@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20200218084815.2137-3-tzimmermann@suse.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" To: Thomas Zimmermann Cc: airlied@linux.ie, dri-devel@lists.freedesktop.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, virtualization@lists.linux-foundation.org, noralf@tronnes.org, daniel@ffwll.ch, alexander.deucher@amd.com, spice-devel@lists.freedesktop.org, emil.velikov@collabora.com List-Id: virtualization@lists.linuxfoundation.org Hi Thomas. On Tue, Feb 18, 2020 at 09:48:13AM +0100, Thomas Zimmermann wrote: > The ast driver uses an empty implementation for its encoder. Replace > the code with the generic simple encoder. > > v2: > * rebase onto new simple-encoder interface > > Signed-off-by: Thomas Zimmermann >From browsign the code - looks good: Acked-by: Sam Ravnborg Sam > --- > drivers/gpu/drm/ast/ast_drv.h | 6 +----- > drivers/gpu/drm/ast/ast_mode.c | 25 ++++++++----------------- > 2 files changed, 9 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h > index f5d8780776ae..656d591b154b 100644 > --- a/drivers/gpu/drm/ast/ast_drv.h > +++ b/drivers/gpu/drm/ast/ast_drv.h > @@ -121,6 +121,7 @@ struct ast_private { > unsigned int next_index; > } cursor; > > + struct drm_encoder encoder; > struct drm_plane primary_plane; > struct drm_plane cursor_plane; > > @@ -238,13 +239,8 @@ struct ast_crtc { > u8 offset_x, offset_y; > }; > > -struct ast_encoder { > - struct drm_encoder base; > -}; > - > #define to_ast_crtc(x) container_of(x, struct ast_crtc, base) > #define to_ast_connector(x) container_of(x, struct ast_connector, base) > -#define to_ast_encoder(x) container_of(x, struct ast_encoder, base) > > struct ast_vbios_stdtable { > u8 misc; > diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c > index 562ea6d9df13..7a9f20a2fd30 100644 > --- a/drivers/gpu/drm/ast/ast_mode.c > +++ b/drivers/gpu/drm/ast/ast_mode.c > @@ -40,6 +40,7 @@ > #include > #include > #include > +#include > > #include "ast_drv.h" > #include "ast_tables.h" > @@ -968,28 +969,18 @@ static int ast_crtc_init(struct drm_device *dev) > * Encoder > */ > > -static void ast_encoder_destroy(struct drm_encoder *encoder) > -{ > - drm_encoder_cleanup(encoder); > - kfree(encoder); > -} > - > -static const struct drm_encoder_funcs ast_enc_funcs = { > - .destroy = ast_encoder_destroy, > -}; > - > static int ast_encoder_init(struct drm_device *dev) > { > - struct ast_encoder *ast_encoder; > + struct ast_private *ast = dev->dev_private; > + struct drm_encoder *encoder = &ast->encoder; > + int ret; > > - ast_encoder = kzalloc(sizeof(struct ast_encoder), GFP_KERNEL); > - if (!ast_encoder) > - return -ENOMEM; > + ret = drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_DAC); > + if (ret) > + return ret; > > - drm_encoder_init(dev, &ast_encoder->base, &ast_enc_funcs, > - DRM_MODE_ENCODER_DAC, NULL); > + encoder->possible_crtcs = 1; > > - ast_encoder->base.possible_crtcs = 1; > return 0; > } > > -- > 2.25.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 X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8DD7C11D0C for ; Thu, 20 Feb 2020 19:09:50 +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 C68352465D for ; Thu, 20 Feb 2020 19:09:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C68352465D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org 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 BE3DE6EE4F; Thu, 20 Feb 2020 19:09:49 +0000 (UTC) Received: from asavdk4.altibox.net (asavdk4.altibox.net [109.247.116.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 00C7F6EE4E; Thu, 20 Feb 2020 19:09:47 +0000 (UTC) Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk4.altibox.net (Postfix) with ESMTPS id F378580A7D; Thu, 20 Feb 2020 20:09:44 +0100 (CET) Date: Thu, 20 Feb 2020 20:09:43 +0100 From: Sam Ravnborg To: Thomas Zimmermann Subject: Re: [PATCH v2 2/4] drm/ast: Use simple encoder Message-ID: <20200220190943.GB20011@ravnborg.org> References: <20200218084815.2137-1-tzimmermann@suse.de> <20200218084815.2137-3-tzimmermann@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200218084815.2137-3-tzimmermann@suse.de> User-Agent: Mutt/1.10.1 (2018-07-13) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=XpTUx2N9 c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=7gkXJVJtAAAA:8 a=MOjwyByp_6yglrnL3V8A:9 a=CjuIK1q_8ugA:10 a=E9Po1WZjFZOl8hwRPBS3:22 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: airlied@linux.ie, dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org, kraxel@redhat.com, alexander.deucher@amd.com, spice-devel@lists.freedesktop.org, emil.velikov@collabora.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Thomas. On Tue, Feb 18, 2020 at 09:48:13AM +0100, Thomas Zimmermann wrote: > The ast driver uses an empty implementation for its encoder. Replace > the code with the generic simple encoder. > > v2: > * rebase onto new simple-encoder interface > > Signed-off-by: Thomas Zimmermann >From browsign the code - looks good: Acked-by: Sam Ravnborg Sam > --- > drivers/gpu/drm/ast/ast_drv.h | 6 +----- > drivers/gpu/drm/ast/ast_mode.c | 25 ++++++++----------------- > 2 files changed, 9 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h > index f5d8780776ae..656d591b154b 100644 > --- a/drivers/gpu/drm/ast/ast_drv.h > +++ b/drivers/gpu/drm/ast/ast_drv.h > @@ -121,6 +121,7 @@ struct ast_private { > unsigned int next_index; > } cursor; > > + struct drm_encoder encoder; > struct drm_plane primary_plane; > struct drm_plane cursor_plane; > > @@ -238,13 +239,8 @@ struct ast_crtc { > u8 offset_x, offset_y; > }; > > -struct ast_encoder { > - struct drm_encoder base; > -}; > - > #define to_ast_crtc(x) container_of(x, struct ast_crtc, base) > #define to_ast_connector(x) container_of(x, struct ast_connector, base) > -#define to_ast_encoder(x) container_of(x, struct ast_encoder, base) > > struct ast_vbios_stdtable { > u8 misc; > diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c > index 562ea6d9df13..7a9f20a2fd30 100644 > --- a/drivers/gpu/drm/ast/ast_mode.c > +++ b/drivers/gpu/drm/ast/ast_mode.c > @@ -40,6 +40,7 @@ > #include > #include > #include > +#include > > #include "ast_drv.h" > #include "ast_tables.h" > @@ -968,28 +969,18 @@ static int ast_crtc_init(struct drm_device *dev) > * Encoder > */ > > -static void ast_encoder_destroy(struct drm_encoder *encoder) > -{ > - drm_encoder_cleanup(encoder); > - kfree(encoder); > -} > - > -static const struct drm_encoder_funcs ast_enc_funcs = { > - .destroy = ast_encoder_destroy, > -}; > - > static int ast_encoder_init(struct drm_device *dev) > { > - struct ast_encoder *ast_encoder; > + struct ast_private *ast = dev->dev_private; > + struct drm_encoder *encoder = &ast->encoder; > + int ret; > > - ast_encoder = kzalloc(sizeof(struct ast_encoder), GFP_KERNEL); > - if (!ast_encoder) > - return -ENOMEM; > + ret = drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_DAC); > + if (ret) > + return ret; > > - drm_encoder_init(dev, &ast_encoder->base, &ast_enc_funcs, > - DRM_MODE_ENCODER_DAC, NULL); > + encoder->possible_crtcs = 1; > > - ast_encoder->base.possible_crtcs = 1; > return 0; > } > > -- > 2.25.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel