From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Siqueira Subject: Re: [PATCH v2 2/3] drm/vkms: Add basic CRTC initialization Date: Sun, 20 May 2018 15:41:14 -0300 Message-ID: References: <20180520062231.GA24701@Haneen> <20180520142837.tyfqair2m7wmyrfh@smtp.gmail.com> <20180520164449.GA3505@Haneen> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1429963907==" Return-path: Received: from mail-io0-x244.google.com (mail-io0-x244.google.com [IPv6:2607:f8b0:4001:c06::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2995A6E294 for ; Sun, 20 May 2018 18:41:15 +0000 (UTC) Received: by mail-io0-x244.google.com with SMTP id a10-v6so11890012ioc.9 for ; Sun, 20 May 2018 11:41:15 -0700 (PDT) In-Reply-To: <20180520164449.GA3505@Haneen> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Haneen Mohammed Cc: dri-devel , Sean Paul , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org --===============1429963907== Content-Type: multipart/alternative; boundary="000000000000ab2cee056ca78745" --000000000000ab2cee056ca78745 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Ahhhh, I got it! Thanks a lot Haneen :) On Sun, May 20, 2018 at 1:44 PM, Haneen Mohammed wrote: > On Sun, May 20, 2018 at 11:28:37AM -0300, Rodrigo Siqueira wrote: > > Hi Haneen, > > > > Thanks for the feedback :) > > > > On 05/20, Haneen Mohammed wrote: > > > On Wed, May 16, 2018 at 08:56:21PM -0300, Rodrigo Siqueira wrote: > > > > This commit adds the essential infrastructure for around CRTCs whic= h > > > > is composed of: a new data struct for output data information, a > > > > function for creating planes, and a simple encoder attached to the > > > > connector. Finally, due to the introduction of a new initialization > > > > function, connectors were moved from vkms_drv.c to vkms_display.c. > > > > > > > > Signed-off-by: Rodrigo Siqueira > > > > --- > > > > drivers/gpu/drm/vkms/Makefile | 2 +- > > > > drivers/gpu/drm/vkms/vkms_crtc.c | 35 ++++++++++++ > > > > drivers/gpu/drm/vkms/vkms_drv.c | 60 ++++++-------------- > > > > drivers/gpu/drm/vkms/vkms_drv.h | 24 +++++++- > > > > drivers/gpu/drm/vkms/vkms_output.c | 91 > ++++++++++++++++++++++++++++++ > > > > drivers/gpu/drm/vkms/vkms_plane.c | 46 +++++++++++++++ > > > > 6 files changed, 211 insertions(+), 47 deletions(-) > > > > create mode 100644 drivers/gpu/drm/vkms/vkms_crtc.c > > > > create mode 100644 drivers/gpu/drm/vkms/vkms_output.c > > > > create mode 100644 drivers/gpu/drm/vkms/vkms_plane.c > > > > > > > > diff --git a/drivers/gpu/drm/vkms/Makefile b/drivers/gpu/drm/vkms/ > Makefile > > > > index 2aef948d3a34..3f774a6a9c58 100644 > > > > --- a/drivers/gpu/drm/vkms/Makefile > > > > +++ b/drivers/gpu/drm/vkms/Makefile > > > > @@ -1,3 +1,3 @@ > > > > -vkms-y :=3D vkms_drv.o > > > > +vkms-y :=3D vkms_drv.o vkms_plane.o vkms_output.o vkms_crtc.o > > > > > > > > obj-$(CONFIG_DRM_VKMS) +=3D vkms.o > > > > diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c > b/drivers/gpu/drm/vkms/vkms_crtc.c > > > > new file mode 100644 > > > > index 000000000000..bf76cd39ece7 > > > > --- /dev/null > > > > +++ b/drivers/gpu/drm/vkms/vkms_crtc.c > > > > @@ -0,0 +1,35 @@ > > > > +// SPDX-License-Identifier: GPL-2.0 > > > > +/* > > > > + * This program is free software; you can redistribute it and/or > modify > > > > + * it under the terms of the GNU General Public License as > published by > > > > + * the Free Software Foundation; either version 2 of the License, = or > > > > + * (at your option) any later version. > > > > + */ > > > > + > > > > +#include "vkms_drv.h" > > > > +#include > > > > +#include > > > > + > > > > +static const struct drm_crtc_funcs vkms_crtc_funcs =3D { > > > > + .set_config =3D drm_atomic_helper_set_config, > > > > + .destroy =3D drm_crtc_cleanup, > > > > + .page_flip =3D drm_atomic_helper_page_flip, > > > > + .reset =3D drm_atomic_helper_crtc_reset, > > > > + .atomic_duplicate_state =3D drm_atomic_helper_crtc_duplicate_stat= e, > > > > + .atomic_destroy_state =3D drm_atomic_helper_crtc_destroy_state, > > > > +}; > > > > + > > > > +int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, > > > > + struct drm_plane *primary, struct drm_plane *cursor) > > > > +{ > > > > + int ret; > > > > + > > > > > > Just as a follow up, I have noticed that vkms breaks when inspecting > > > its state in the debugfs, also when running igt tests with kms and co= re > > > filters, and adding the following fixed that issue: > > > > Could you explain me how you tested the state with debugfs? > > > > I will add the fixes suggested in your comments. > > > > Thanks > > > > I just tried to read this file: /sys/kernel/debug/dri/0/state, which > then caused a null pointer dereference error. > > > > 1) a drm_crtc_helper_funcs with dummy atomic_check. > > > > > > > + ret =3D drm_crtc_init_with_planes(dev, crtc, primary, cursor, > > > > + &vkms_crtc_funcs, NULL); > > > > + if (ret) { > > > > + DRM_ERROR("Failed to init CRTC\n"); > > > > + return ret; > > > > + } > > > > + > > > > + return ret; > > > > +} > > > > diff --git a/drivers/gpu/drm/vkms/vkms_drv.c > b/drivers/gpu/drm/vkms/vkms_drv.c > > > > index aec3f180f96d..070613e32934 100644 > > > > --- a/drivers/gpu/drm/vkms/vkms_drv.c > > > > +++ b/drivers/gpu/drm/vkms/vkms_drv.c > > > > @@ -6,7 +6,6 @@ > > > > */ > > > > > > > > #include > > > > -#include > > > > #include > > > > #include > > > > #include > > > > @@ -59,25 +58,24 @@ static struct drm_driver vkms_driver =3D { > > > > .minor =3D DRIVER_MINOR, > > > > }; > > > > > > > > -static const u32 vkms_formats[] =3D { > > > > - DRM_FORMAT_XRGB8888, > > > > +static const struct drm_mode_config_funcs vkms_mode_funcs =3D { > > > > + .atomic_check =3D drm_atomic_helper_check, > > > > + .atomic_commit =3D drm_atomic_helper_commit, > > > > }; > > > > > > > > -static void vkms_connector_destroy(struct drm_connector *connector= ) > > > > +static int vkms_modeset_init(struct vkms_device *vkmsdev) > > > > { > > > > - drm_connector_unregister(connector); > > > > - drm_connector_cleanup(connector); > > > > -} > > > > + struct drm_device *dev =3D &vkmsdev->drm; > > > > > > > > -static const struct drm_connector_funcs vkms_connector_funcs =3D { > > > > - .fill_modes =3D drm_helper_probe_single_connector_modes, > > > > - .destroy =3D vkms_connector_destroy, > > > > -}; > > > > + drm_mode_config_init(dev); > > > > + dev->mode_config.funcs =3D &vkms_mode_funcs; > > > > + dev->mode_config.min_width =3D XRES_MIN; > > > > + dev->mode_config.min_height =3D YRES_MIN; > > > > + dev->mode_config.max_width =3D XRES_MAX; > > > > + dev->mode_config.max_height =3D YRES_MAX; > > > > > > > > -static const struct drm_mode_config_funcs vkms_mode_funcs =3D { > > > > - .atomic_check =3D drm_atomic_helper_check, > > > > - .atomic_commit =3D drm_atomic_helper_commit, > > > > -}; > > > > + return vkms_output_init(vkmsdev); > > > > +} > > > > > > > > static int __init vkms_init(void) > > > > { > > > > @@ -98,48 +96,24 @@ static int __init vkms_init(void) > > > > goto out_fini; > > > > } > > > > > > > > - drm_mode_config_init(&vkms_device->drm); > > > > - vkms_device->drm.mode_config.funcs =3D &vkms_mode_funcs; > > > > - vkms_device->drm.mode_config.min_width =3D XRES_MIN; > > > > - vkms_device->drm.mode_config.min_height =3D YRES_MIN; > > > > - vkms_device->drm.mode_config.max_width =3D XRES_MAX; > > > > - vkms_device->drm.mode_config.max_height =3D YRES_MAX; > > > > - > > > > - ret =3D drm_connector_init(&vkms_device->drm, > &vkms_device->connector, > > > > - &vkms_connector_funcs, > > > > - DRM_MODE_CONNECTOR_VIRTUAL); > > > > - if (ret < 0) { > > > > - DRM_ERROR("Failed to init connector\n"); > > > > - goto out_unregister; > > > > - } > > > > - > > > > - ret =3D drm_simple_display_pipe_init(&vkms_device->drm, > > > > - &vkms_device->pipe, > > > > - NULL, > > > > - vkms_formats, > > > > - ARRAY_SIZE(vkms_formats), > > > > - NULL, > > > > - &vkms_device->connector); > > > > - if (ret < 0) { > > > > - DRM_ERROR("Cannot setup simple display pipe\n"); > > > > + ret =3D vkms_modeset_init(vkms_device); > > > > + if (ret) > > > > goto out_unregister; > > > > - } > > > > > > > > ret =3D drm_dev_register(&vkms_device->drm, 0); > > > > if (ret) > > > > goto out_unregister; > > > > > > > > - drm_connector_register(&vkms_device->connector); > > > > - > > > > return 0; > > > > > > > > out_unregister: > > > > platform_device_unregister(vkms_device->platform); > > > > + > > > > out_fini: > > > > drm_dev_fini(&vkms_device->drm); > > > > + > > > > out_free: > > > > kfree(vkms_device); > > > > - > > > > return ret; > > > > } > > > > > > > > diff --git a/drivers/gpu/drm/vkms/vkms_drv.h > b/drivers/gpu/drm/vkms/vkms_drv.h > > > > index c77c5bf5032a..b0f9d2e61a42 100644 > > > > --- a/drivers/gpu/drm/vkms/vkms_drv.h > > > > +++ b/drivers/gpu/drm/vkms/vkms_drv.h > > > > @@ -1,13 +1,31 @@ > > > > #ifndef _VKMS_DRV_H_ > > > > #define _VKMS_DRV_H_ > > > > > > > > -#include > > > > +#include > > > > +#include > > > > +#include > > > > + > > > > +static const u32 vkms_formats[] =3D { > > > > + DRM_FORMAT_XRGB8888, > > > > +}; > > > > + > > > > +struct vkms_output { > > > > + struct drm_crtc crtc; > > > > + struct drm_encoder encoder; > > > > + struct drm_connector connector; > > > > +}; > > > > > > > > struct vkms_device { > > > > struct drm_device drm; > > > > struct platform_device *platform; > > > > - struct drm_simple_display_pipe pipe; > > > > - struct drm_connector connector; > > > > + struct vkms_output output; > > > > }; > > > > > > > > +int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, > > > > + struct drm_plane *primary, struct drm_plane *cursor); > > > > + > > > > +int vkms_output_init(struct vkms_device *vkmsdev); > > > > + > > > > +struct drm_plane *vkms_plane_init(struct vkms_device *vkmsdev); > > > > + > > > > #endif /* _VKMS_DRV_H_ */ > > > > diff --git a/drivers/gpu/drm/vkms/vkms_output.c > b/drivers/gpu/drm/vkms/vkms_output.c > > > > new file mode 100644 > > > > index 000000000000..48143eac3c12 > > > > --- /dev/null > > > > +++ b/drivers/gpu/drm/vkms/vkms_output.c > > > > @@ -0,0 +1,91 @@ > > > > +// SPDX-License-Identifier: GPL-2.0 > > > > +/* > > > > + * This program is free software; you can redistribute it and/or > modify > > > > + * it under the terms of the GNU General Public License as > published by > > > > + * the Free Software Foundation; either version 2 of the License, = or > > > > + * (at your option) any later version. > > > > + */ > > > > + > > > > +#include "vkms_drv.h" > > > > +#include > > > > + > > > > +static void vkms_connector_destroy(struct drm_connector *connector= ) > > > > +{ > > > > + drm_connector_unregister(connector); > > > > + drm_connector_cleanup(connector); > > > > +} > > > > + > > > > +static const struct drm_connector_funcs vkms_connector_funcs =3D { > > > > + .fill_modes =3D drm_helper_probe_single_connector_modes, > > > > + .destroy =3D vkms_connector_destroy, > > > > > > 2) adding the following hooks with their drm_atomic_helper_connector_= * > > > counterpart to the vkms_connector_funcs: > > > atomic_duplicate_state, atomic_destroy_state, and reset. > > > > > > > +}; > > > > + > > > > +static const struct drm_encoder_funcs vkms_encoder_funcs =3D { > > > > + .destroy =3D drm_encoder_cleanup, > > > > +}; > > > > + > > > > +int vkms_output_init(struct vkms_device *vkmsdev) > > > > +{ > > > > + struct vkms_output *output =3D &vkmsdev->output; > > > > + struct drm_device *dev =3D &vkmsdev->drm; > > > > + struct drm_connector *connector =3D &output->connector; > > > > + struct drm_encoder *encoder =3D &output->encoder; > > > > + struct drm_crtc *crtc =3D &output->crtc; > > > > + struct drm_plane *primary; > > > > + int ret; > > > > + > > > > + primary =3D vkms_plane_init(vkmsdev); > > > > + if (IS_ERR(primary)) > > > > + return PTR_ERR(primary); > > > > + > > > > + ret =3D vkms_crtc_init(dev, crtc, primary, NULL); > > > > + if (ret) > > > > + goto err_crtc; > > > > + > > > > > > 3) add drm_connector_helper_funcs with dummy {get_modes, mode_valid}. > > > > > > > + ret =3D drm_connector_init(dev, connector, &vkms_connector_funcs, > > > > + DRM_MODE_CONNECTOR_VIRTUAL); > > > > + if (ret) { > > > > + DRM_ERROR("Failed to init connector\n"); > > > > + goto err_connector; > > > > + } > > > > + > > > > + ret =3D drm_connector_register(connector); > > > > + if (ret) { > > > > + DRM_ERROR("Failed to register connector\n"); > > > > + goto err_connector_register; > > > > + } > > > > + > > > > + ret =3D 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; > > > > + } > > > > + encoder->possible_crtcs =3D 1; > > > > + > > > > + ret =3D drm_mode_connector_attach_encoder(connector, encoder); > > > > + if (ret) { > > > > + DRM_ERROR("Failed to attach connector to encoder\n"); > > > > + goto err_attach; > > > > + } > > > > + > > > > + drm_mode_config_reset(dev); > > > > + > > > > + return 0; > > > > + > > > > +err_attach: > > > > + drm_encoder_cleanup(encoder); > > > > + > > > > +err_encoder: > > > > + drm_connector_unregister(connector); > > > > + > > > > +err_connector_register: > > > > + drm_connector_cleanup(connector); > > > > + > > > > +err_connector: > > > > + drm_crtc_cleanup(crtc); > > > > + > > > > +err_crtc: > > > > + drm_plane_cleanup(primary); > > > > + return ret; > > > > +} > > > > diff --git a/drivers/gpu/drm/vkms/vkms_plane.c > b/drivers/gpu/drm/vkms/vkms_plane.c > > > > new file mode 100644 > > > > index 000000000000..2c25b1d6ab5b > > > > --- /dev/null > > > > +++ b/drivers/gpu/drm/vkms/vkms_plane.c > > > > @@ -0,0 +1,46 @@ > > > > +// SPDX-License-Identifier: GPL-2.0 > > > > +/* > > > > + * This program is free software; you can redistribute it and/or > modify > > > > + * it under the terms of the GNU General Public License as > published by > > > > + * the Free Software Foundation; either version 2 of the License, = or > > > > + * (at your option) any later version. > > > > + */ > > > > + > > > > +#include "vkms_drv.h" > > > > +#include > > > > +#include > > > > + > > > > +static const struct drm_plane_funcs vkms_plane_funcs =3D { > > > > + .update_plane =3D drm_atomic_helper_update_plane, > > > > + .disable_plane =3D drm_atomic_helper_disable_plane, > > > > + .destroy =3D drm_plane_cleanup, > > > > + .reset =3D drm_atomic_helper_plane_reset, > > > > + .atomic_duplicate_state =3D drm_atomic_helper_plane_duplicate_sta= te, > > > > + .atomic_destroy_state =3D drm_atomic_helper_plane_destroy_state= , > > > > +}; > > > > + > > > > +struct drm_plane *vkms_plane_init(struct vkms_device *vkmsdev) > > > > +{ > > > > + struct drm_device *dev =3D &vkmsdev->drm; > > > > + struct drm_plane *plane; > > > > + const u32 *formats; > > > > + int ret, nformats; > > > > + > > > > + plane =3D kzalloc(sizeof(*plane), GFP_KERNEL); > > > > + if (!plane) > > > > + return ERR_PTR(-ENOMEM); > > > > + > > > > + formats =3D vkms_formats; > > > > + nformats =3D ARRAY_SIZE(vkms_formats); > > > > + > > > > + ret =3D drm_universal_plane_init(dev, plane, 0, > > > > + &vkms_plane_funcs, > > > > + formats, nformats, > > > > + NULL, DRM_PLANE_TYPE_PRIMARY, NULL= ); > > > > + if (ret) { > > > > + kfree(plane); > > > > + return ERR_PTR(ret); > > > > + } > > > > + > > > > > > 4) add drm_plane_helper_funcs with dummy {atomic_check, prepare_fb, > cleanup_fb}. > > > > > > > + return plane; > > > > +} > > > > -- > > > > 2.17.0 > > > > > > > > > > - Haneen > --=20 Rodrigo Siqueira Graduate Student Department of Computer Science University of S=C3=A3o Paulo --000000000000ab2cee056ca78745 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Ahhhh, I got it!

Thanks a lot Haneen :)<= br>

On Sun, = May 20, 2018 at 1:44 PM, Haneen Mohammed <hamohammed.sa@gmail.com> wrote:
On Sun, May 20, 2018 at 11:28:37AM -0300, Rodrigo Siquei= ra wrote:
> Hi Haneen,
>
> Thanks for the feedback :)
>
> On 05/20, Haneen Mohammed wrote:
> > On Wed, May 16, 2018 at 08:56:21PM -0300, Rodrigo Siqueira wrote:=
> > > This commit adds the essential infrastructure for around CRT= Cs which
> > > is composed of: a new data struct for output data informatio= n, a
> > > function for creating planes, and a simple encoder attached = to the
> > > connector. Finally, due to the introduction of a new initial= ization
> > > function, connectors were moved from vkms_drv.c to vkms_disp= lay.c.
> > >
> > > Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
> > > ---
> > >=C2=A0 drivers/gpu/drm/vkms/Makefile=C2=A0 =C2=A0 =C2=A0 |=C2= =A0 2 +-
> > >=C2=A0 drivers/gpu/drm/vkms/vkms_crtc.c=C2=A0 =C2=A0| 35= ++++++++++++
> > >=C2=A0 drivers/gpu/drm/vkms/vkms_drv.c=C2=A0 =C2=A0 | 60= ++++++--------------
> > >=C2=A0 drivers/gpu/drm/vkms/vkms_drv.h=C2=A0 =C2=A0 | 24= +++++++-
> > >=C2=A0 drivers/gpu/drm/vkms/vkms_output.c | 91 +++++++++= +++++++++++++++++++++
> > >=C2=A0 drivers/gpu/drm/vkms/vkms_plane.c=C2=A0 | 46 ++++= +++++++++++
> > >=C2=A0 6 files changed, 211 insertions(+), 47 deletions(-) > > >=C2=A0 create mode 100644 drivers/gpu/drm/vkms/vkms_crtc= .c
> > >=C2=A0 create mode 100644 drivers/gpu/drm/vkms/vkms_outp= ut.c
> > >=C2=A0 create mode 100644 drivers/gpu/drm/vkms/vkms_plan= e.c
> > >
> > > diff --git a/drivers/gpu/drm/vkms/Makefile b/drivers/gp= u/drm/vkms/Makefile
> > > index 2aef948d3a34..3f774a6a9c58 100644
> > > --- a/drivers/gpu/drm/vkms/Makefile
> > > +++ b/drivers/gpu/drm/vkms/Makefile
> > > @@ -1,3 +1,3 @@
> > > -vkms-y :=3D vkms_drv.o
> > > +vkms-y :=3D vkms_drv.o vkms_plane.o vkms_output.o vkms_crtc= .o
> > >=C2=A0
> > >=C2=A0 obj-$(CONFIG_DRM_VKMS) +=3D vkms.o
> > > diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers= /gpu/drm/vkms/vkms_crtc.c
> > > new file mode 100644
> > > index 000000000000..bf76cd39ece7
> > > --- /dev/null
> > > +++ b/drivers/gpu/drm/vkms/vkms_crtc.c
> > > @@ -0,0 +1,35 @@
> > > +// SPDX-License-Identifier: GPL-2.0
> > > +/*
> > > + * This program is free software; you can redistribute it a= nd/or modify
> > > + * it under the terms of the GNU General Public License as = published by
> > > + * the Free Software Foundation; either version 2 of the Li= cense, or
> > > + * (at your option) any later version.
> > > + */
> > > +
> > > +#include "vkms_drv.h"
> > > +#include <drm/drm_atomic_helper.h>
> > > +#include <drm/drm_crtc_helper.h>
> > > +
> > > +static const struct drm_crtc_funcs vkms_crtc_funcs =3D { > > > + .set_config=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0=3D drm_atomic_helper_set_config,
> > > + .destroy=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =3D drm_crtc_cleanup,
> > > + .page_flip=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =3D drm_atomic_helper_page_flip,
> > > + .reset=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =3D drm_atomic_helper_crtc_reset,
> > > + .atomic_duplicate_state =3D drm_atomic_helper_crtc_du= plicate_state,
> > > + .atomic_destroy_state=C2=A0 =C2=A0=3D drm_atomic_helper_cr= tc_destroy_state,
> > > +};
> > > +
> > > +int vkms_crtc_init(struct drm_device *dev, struct drm_crtc = *crtc,
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 struct drm_plane = *primary, struct drm_plane *cursor)
> > > +{
> > > + int ret;
> > > +
> >
> > Just as a follow up, I have noticed that vkms breaks when inspect= ing
> > its state in the debugfs, also when running igt tests with kms an= d core
> > filters, and adding the following fixed that issue:
>
> Could you explain me how you tested the state with debugfs?
>
> I will add the fixes suggested in your comments.
>
> Thanks
>=C2=A0

I just tried to read this file: /sys/kernel/debug/dri/0/state, = which
then caused a null pointer dereference error.

> > 1) a drm_crtc_helper_funcs with dummy atomic_check.
> >
> > > + ret =3D drm_crtc_init_with_planes(dev, crtc, primary, curs= or,
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&vkms_crtc_f= uncs, NULL);
> > > + if (ret) {
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0DRM_ERROR("Failed to= init CRTC\n");
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return ret;
> > > + }
> > > +
> > > + return ret;
> > > +}
> > > diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/= gpu/drm/vkms/vkms_drv.c
> > > index aec3f180f96d..070613e32934 100644
> > > --- a/drivers/gpu/drm/vkms/vkms_drv.c
> > > +++ b/drivers/gpu/drm/vkms/vkms_drv.c
> > > @@ -6,7 +6,6 @@
> > >=C2=A0 =C2=A0*/
> > >=C2=A0
> > >=C2=A0 #include <linux/module.h>
> > > -#include <drm/drmP.h>
> > >=C2=A0 #include <drm/drm_gem.h>
> > >=C2=A0 #include <drm/drm_crtc_helper.h>
> > >=C2=A0 #include <drm/drm_atomic_helper.h>
> > > @@ -59,25 +58,24 @@ static struct drm_driver vkms_driver =3D= {
> > >=C2=A0 =C2=A0.minor=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =3D DRIVER_MINOR,
> > >=C2=A0 };
> > >=C2=A0
> > > -static const u32 vkms_formats[] =3D {
> > > - DRM_FORMAT_XRGB8888,
> > > +static const struct drm_mode_config_funcs vkms_mode_funcs = =3D {
> > > + .atomic_check =3D drm_atomic_helper_check,
> > > + .atomic_commit =3D drm_atomic_helper_commit,
> > >=C2=A0 };
> > >=C2=A0
> > > -static void vkms_connector_destroy(struct drm_connector *co= nnector)
> > > +static int vkms_modeset_init(struct vkms_device *vkmsdev) > > >=C2=A0 {
> > > - drm_connector_unregister(connector);
> > > - drm_connector_cleanup(connector);
> > > -}
> > > + struct drm_device *dev =3D &vkmsdev->drm;
> > >=C2=A0
> > > -static const struct drm_connector_funcs vkms_connector_func= s =3D {
> > > - .fill_modes =3D drm_helper_probe_single_connector_mod= es,
> > > - .destroy =3D vkms_connector_destroy,
> > > -};
> > > + drm_mode_config_init(dev);
> > > + dev->mode_config.funcs =3D &vkms_mode_funcs;
> > > + dev->mode_config.min_width =3D XRES_MIN;
> > > + dev->mode_config.min_height =3D YRES_MIN;
> > > + dev->mode_config.max_width =3D XRES_MAX;
> > > + dev->mode_config.max_height =3D YRES_MAX;
> > >=C2=A0
> > > -static const struct drm_mode_config_funcs vkms_mode_funcs = =3D {
> > > - .atomic_check =3D drm_atomic_helper_check,
> > > - .atomic_commit =3D drm_atomic_helper_commit,
> > > -};
> > > + return vkms_output_init(vkmsdev);
> > > +}
> > >=C2=A0
> > >=C2=A0 static int __init vkms_init(void)
> > >=C2=A0 {
> > > @@ -98,48 +96,24 @@ static int __init vkms_init(void)
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out_fini;
> > >=C2=A0 =C2=A0}
> > >=C2=A0
> > > - drm_mode_config_init(&vkms_device->drm);
> > > - vkms_device->drm.mode_config.funcs =3D &vkms_m= ode_funcs;
> > > - vkms_device->drm.mode_config.min_width =3D XRES_MI= N;
> > > - vkms_device->drm.mode_config.min_height =3D YRES_M= IN;
> > > - vkms_device->drm.mode_config.max_width =3D XRES_MA= X;
> > > - vkms_device->drm.mode_config.max_height =3D YRES_M= AX;
> > > -
> > > - ret =3D drm_connector_init(&vkms_device->drm, = &vkms_device->connector,
> > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &vkms_connector_funcs,
> > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 DRM_MODE_CONNECTOR_VIRTUAL);
> > > - if (ret < 0) {
> > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0DRM_ERROR("Failed to= init connector\n");
> > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out_unregister;
> > > - }
> > > -
> > > - ret =3D drm_simple_display_pipe_init(&vkms_device= ->drm,
> > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &vkm= s_device->pipe,
> > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 NULL, > > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 vkms_for= mats,
> > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ARRAY_SI= ZE(vkms_formats),
> > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 NULL, > > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &vkm= s_device->connector);
> > > - if (ret < 0) {
> > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0DRM_ERROR("Cannot se= tup simple display pipe\n");
> > > + ret =3D vkms_modeset_init(vkms_device);
> > > + if (ret)
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out_unregister;=
> > > - }
> > >=C2=A0
> > >=C2=A0 =C2=A0ret =3D drm_dev_register(&vkms_device-&= gt;drm, 0);
> > >=C2=A0 =C2=A0if (ret)
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out_unregister;=
> > >=C2=A0
> > > - drm_connector_register(&vkms_device->connector= );
> > > -
> > >=C2=A0 =C2=A0return 0;
> > >=C2=A0
> > >=C2=A0 out_unregister:
> > >=C2=A0 =C2=A0platform_device_unregister(vkms_device->= platform);
> > > +
> > >=C2=A0 out_fini:
> > >=C2=A0 =C2=A0drm_dev_fini(&vkms_device->drm);
> > > +
> > >=C2=A0 out_free:
> > >=C2=A0 =C2=A0kfree(vkms_device);
> > > -
> > >=C2=A0 =C2=A0return ret;
> > >=C2=A0 }
> > >=C2=A0
> > > diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/= gpu/drm/vkms/vkms_drv.h
> > > index c77c5bf5032a..b0f9d2e61a42 100644
> > > --- a/drivers/gpu/drm/vkms/vkms_drv.h
> > > +++ b/drivers/gpu/drm/vkms/vkms_drv.h
> > > @@ -1,13 +1,31 @@
> > >=C2=A0 #ifndef _VKMS_DRV_H_
> > >=C2=A0 #define _VKMS_DRV_H_
> > >=C2=A0
> > > -#include <drm/drm_simple_kms_helper.h>
> > > +#include <drm/drmP.h>
> > > +#include <drm/drm.h>
> > > +#include <drm/drm_encoder.h>
> > > +
> > > +static const u32 vkms_formats[] =3D {
> > > + DRM_FORMAT_XRGB8888,
> > > +};
> > > +
> > > +struct vkms_output {
> > > + struct drm_crtc crtc;
> > > + struct drm_encoder encoder;
> > > + struct drm_connector connector;
> > > +};
> > >=C2=A0
> > >=C2=A0 struct vkms_device {
> > >=C2=A0 =C2=A0struct drm_device drm;
> > >=C2=A0 =C2=A0struct platform_device *platform;
> > > - struct drm_simple_display_pipe pipe;
> > > - struct drm_connector connector;
> > > + struct vkms_output output;
> > >=C2=A0 };
> > >=C2=A0
> > > +int vkms_crtc_init(struct drm_device *dev, struct drm_crtc = *crtc,
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 struct drm_plane = *primary, struct drm_plane *cursor);
> > > +
> > > +int vkms_output_init(struct vkms_device *vkmsdev);
> > > +
> > > +struct drm_plane *vkms_plane_init(struct vkms_device *vkmsd= ev);
> > > +
> > >=C2=A0 #endif /* _VKMS_DRV_H_ */
> > > diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drive= rs/gpu/drm/vkms/vkms_output.c
> > > new file mode 100644
> > > index 000000000000..48143eac3c12
> > > --- /dev/null
> > > +++ b/drivers/gpu/drm/vkms/vkms_output.c
> > > @@ -0,0 +1,91 @@
> > > +// SPDX-License-Identifier: GPL-2.0
> > > +/*
> > > + * This program is free software; you can redistribute it a= nd/or modify
> > > + * it under the terms of the GNU General Public License as = published by
> > > + * the Free Software Foundation; either version 2 of the Li= cense, or
> > > + * (at your option) any later version.
> > > + */
> > > +
> > > +#include "vkms_drv.h"
> > > +#include <drm/drm_crtc_helper.h>
> > > +
> > > +static void vkms_connector_destroy(struct drm_connector *co= nnector)
> > > +{
> > > + drm_connector_unregister(connector);
> > > + drm_connector_cleanup(connector);
> > > +}
> > > +
> > > +static const struct drm_connector_funcs vkms_connector_func= s =3D {
> > > + .fill_modes =3D drm_helper_probe_single_connector_mod= es,
> > > + .destroy =3D vkms_connector_destroy,
> >
> > 2) adding the following hooks with their drm_atomic_helper_connec= tor_*
> > counterpart to the vkms_connector_funcs:
> > atomic_duplicate_state, atomic_destroy_state, and reset.
> >
> > > +};
> > > +
> > > +static const struct drm_encoder_funcs vkms_encoder_funcs = =3D {
> > > + .destroy =3D drm_encoder_cleanup,
> > > +};
> > > +
> > > +int vkms_output_init(struct vkms_device *vkmsdev)
> > > +{
> > > + struct vkms_output *output =3D &vkmsdev->output; > > > + struct drm_device *dev =3D &vkmsdev->drm;
> > > + struct drm_connector *connector =3D &output->connec= tor;
> > > + struct drm_encoder *encoder =3D &output->encoder; > > > + struct drm_crtc *crtc =3D &output->crtc;
> > > + struct drm_plane *primary;
> > > + int ret;
> > > +
> > > + primary =3D vkms_plane_init(vkmsdev);
> > > + if (IS_ERR(primary))
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return PTR_ERR(primary);<= br> > > > +
> > > + ret =3D vkms_crtc_init(dev, crtc, primary, NULL);
> > > + if (ret)
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto err_crtc;
> > > +
> >
> > 3) add drm_connector_helper_funcs with dummy {get_modes, mode_val= id}.
> >
> > > + ret =3D drm_connector_init(dev, connector, &vkms_conne= ctor_funcs,
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 DRM_MODE_CONNECTOR_VIRTUAL);
> > > + if (ret) {
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0DRM_ERROR("Failed to= init connector\n");
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto err_connector;
> > > + }
> > > +
> > > + ret =3D drm_connector_register(connector);
> > > + if (ret) {
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0DRM_ERROR("Failed to= register connector\n");
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto err_connector_regist= er;
> > > + }
> > > +
> > > + ret =3D drm_encoder_init(dev, encoder, &vkms_encoder_f= uncs,
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 DRM_MODE_ENCODER_VIRTUAL, NULL);
> > > + if (ret) {
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0DRM_ERROR("Failed to= init encoder\n");
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto err_encoder;
> > > + }
> > > + encoder->possible_crtcs =3D 1;
> > > +
> > > + ret =3D drm_mode_connector_attach_encoder(connector, = encoder);
> > > + if (ret) {
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0DRM_ERROR("Failed to= attach connector to encoder\n");
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto err_attach;
> > > + }
> > > +
> > > + drm_mode_config_reset(dev);
> > > +
> > > + return 0;
> > > +
> > > +err_attach:
> > > + drm_encoder_cleanup(encoder);
> > > +
> > > +err_encoder:
> > > + drm_connector_unregister(connector);
> > > +
> > > +err_connector_register:
> > > + drm_connector_cleanup(connector);
> > > +
> > > +err_connector:
> > > + drm_crtc_cleanup(crtc);
> > > +
> > > +err_crtc:
> > > + drm_plane_cleanup(primary);
> > > + return ret;
> > > +}
> > > diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/driver= s/gpu/drm/vkms/vkms_plane.c
> > > new file mode 100644
> > > index 000000000000..2c25b1d6ab5b
> > > --- /dev/null
> > > +++ b/drivers/gpu/drm/vkms/vkms_plane.c
> > > @@ -0,0 +1,46 @@
> > > +// SPDX-License-Identifier: GPL-2.0
> > > +/*
> > > + * This program is free software; you can redistribute it a= nd/or modify
> > > + * it under the terms of the GNU General Public License as = published by
> > > + * the Free Software Foundation; either version 2 of the Li= cense, or
> > > + * (at your option) any later version.
> > > + */
> > > +
> > > +#include "vkms_drv.h"
> > > +#include <drm/drm_plane_helper.h>
> > > +#include <drm/drm_atomic_helper.h>
> > > +
> > > +static const struct drm_plane_funcs vkms_plane_funcs =3D {<= br> > > > + .update_plane=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=3D = drm_atomic_helper_update_plane,
> > > + .disable_plane=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =3D drm_a= tomic_helper_disable_plane,
> > > + .destroy=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =3D drm_plane_cleanup,
> > > + .reset=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =3D drm_atomic_helper_plane_reset,
> > > + .atomic_duplicate_state =3D drm_atomic_helper_plane_d= uplicate_state,
> > > + .atomic_destroy_state=C2=A0 =C2=A0=3D drm_atomic_helper_pl= ane_destroy_state,
> > > +};
> > > +
> > > +struct drm_plane *vkms_plane_init(struct vkms_device *vkmsd= ev)
> > > +{
> > > + struct drm_device *dev =3D &vkmsdev->drm;
> > > + struct drm_plane *plane;
> > > + const u32 *formats;
> > > + int ret, nformats;
> > > +
> > > + plane =3D kzalloc(sizeof(*plane), GFP_KERNEL);
> > > + if (!plane)
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return ERR_PTR(-ENOMEM);<= br> > > > +
> > > + formats =3D vkms_formats;
> > > + nformats =3D ARRAY_SIZE(vkms_formats);
> > > +
> > > + ret =3D drm_universal_plane_init(dev, plane, 0,
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &vkms_plane_funcs,=
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 formats, nformats,
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 NULL, DRM_PLANE_TYPE_P= RIMARY, NULL);
> > > + if (ret) {
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(plane);
> > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return ERR_PTR(ret);
> > > + }
> > > +
> >
> > 4) add drm_plane_helper_funcs with dummy {atomic_check, prepare_f= b, cleanup_fb}.
> >
> > > + return plane;
> > > +}
> > > --
> > > 2.17.0
> > >
> >
> > - Haneen



--
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0
Rodri= go Siqueira
Graduate Student
Department of Computer ScienceUniversity of S=C3=A3o Paulo
<= /div>
--000000000000ab2cee056ca78745-- --===============1429963907== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== --===============1429963907==--