Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Thu, 6 Jun 2019 19:40:38 -0300
From:   Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
To:     Brian Starkey <brian.starkey@arm.com>,
        Liviu Dudau <liviu.dudau@arm.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        Haneen Mohammed <hamohammed.sa@gmail.com>,
        Simon Ser <contact@emersion.fr>
Cc:     dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] drm/vkms: Use index instead of 0 in possible crtc
Message-ID: <e3bc263b273d91182e0577ed820b1c4f096834ec.1559860606.git.rodrigosiqueiramelo@gmail.com>
References: <cover.1559860606.git.rodrigosiqueiramelo@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="fku5dw5gt3ggyzpv"
Content-Disposition: inline
In-Reply-To: <cover.1559860606.git.rodrigosiqueiramelo@gmail.com>
User-Agent: NeoMutt/20180716
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--fku5dw5gt3ggyzpv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

When vkms calls drm_universal_plane_init(), it sets 0 for the
possible_crtcs parameter which works well for a single encoder and
connector; however, this approach is not flexible and does not fit well
for vkms. This commit adds an index parameter for vkms_plane_init()
which makes code flexible and enables vkms to support other DRM features.

Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
---
 drivers/gpu/drm/vkms/vkms_drv.c    | 2 +-
 drivers/gpu/drm/vkms/vkms_drv.h    | 4 ++--
 drivers/gpu/drm/vkms/vkms_output.c | 6 +++---
 drivers/gpu/drm/vkms/vkms_plane.c  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr=
v.c
index 738dd6206d85..92296bd8f623 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.c
+++ b/drivers/gpu/drm/vkms/vkms_drv.c
@@ -92,7 +92,7 @@ static int vkms_modeset_init(struct vkms_device *vkmsdev)
 	dev->mode_config.max_height =3D YRES_MAX;
 	dev->mode_config.preferred_depth =3D 24;
=20
-	return vkms_output_init(vkmsdev);
+	return vkms_output_init(vkmsdev, 0);
 }
=20
 static int __init vkms_init(void)
diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr=
v.h
index 81f1cfbeb936..e81073dea154 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.h
+++ b/drivers/gpu/drm/vkms/vkms_drv.h
@@ -113,10 +113,10 @@ bool vkms_get_vblank_timestamp(struct drm_device *dev=
, unsigned int pipe,
 			       int *max_error, ktime_t *vblank_time,
 			       bool in_vblank_irq);
=20
-int vkms_output_init(struct vkms_device *vkmsdev);
+int vkms_output_init(struct vkms_device *vkmsdev, int index);
=20
 struct drm_plane *vkms_plane_init(struct vkms_device *vkmsdev,
-				  enum drm_plane_type type);
+				  enum drm_plane_type type, int index);
=20
 /* Gem stuff */
 struct drm_gem_object *vkms_gem_create(struct drm_device *dev,
diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms=
_output.c
index 3b162b25312e..1442b447c707 100644
--- a/drivers/gpu/drm/vkms/vkms_output.c
+++ b/drivers/gpu/drm/vkms/vkms_output.c
@@ -36,7 +36,7 @@ static const struct drm_connector_helper_funcs vkms_conn_=
helper_funcs =3D {
 	.get_modes    =3D vkms_conn_get_modes,
 };
=20
-int vkms_output_init(struct vkms_device *vkmsdev)
+int vkms_output_init(struct vkms_device *vkmsdev, int index)
 {
 	struct vkms_output *output =3D &vkmsdev->output;
 	struct drm_device *dev =3D &vkmsdev->drm;
@@ -46,12 +46,12 @@ int vkms_output_init(struct vkms_device *vkmsdev)
 	struct drm_plane *primary, *cursor =3D NULL;
 	int ret;
=20
-	primary =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY);
+	primary =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY, index);
 	if (IS_ERR(primary))
 		return PTR_ERR(primary);
=20
 	if (enable_cursor) {
-		cursor =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR);
+		cursor =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, index);
 		if (IS_ERR(cursor)) {
 			ret =3D PTR_ERR(cursor);
 			goto err_cursor;
diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_=
plane.c
index 0e67d2d42f0c..20ffc52f9194 100644
--- a/drivers/gpu/drm/vkms/vkms_plane.c
+++ b/drivers/gpu/drm/vkms/vkms_plane.c
@@ -168,7 +168,7 @@ static const struct drm_plane_helper_funcs vkms_primary=
_helper_funcs =3D {
 };
=20
 struct drm_plane *vkms_plane_init(struct vkms_device *vkmsdev,
-				  enum drm_plane_type type)
+				  enum drm_plane_type type, int index)
 {
 	struct drm_device *dev =3D &vkmsdev->drm;
 	const struct drm_plane_helper_funcs *funcs;
@@ -190,7 +190,7 @@ struct drm_plane *vkms_plane_init(struct vkms_device *v=
kmsdev,
 		funcs =3D &vkms_primary_helper_funcs;
 	}
=20
-	ret =3D drm_universal_plane_init(dev, plane, 0,
+	ret =3D drm_universal_plane_init(dev, plane, 1 << index,
 				       &vkms_plane_funcs,
 				       formats, nformats,
 				       NULL, type, NULL);
--=20
2.21.0

--fku5dw5gt3ggyzpv
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEE4tZ+ii1mjMCMQbfkWJzP/comvP8FAlz5lmYACgkQWJzP/com
vP/GWQ//c4M1YV33fWDqKX2AI2qcXLq01JsMyc1gEebKgdNrDbmUyy0i2sXYJTAV
e0xxvdE7fsg2LFOQWhf4SHh2qggffGzIq0uN45PSxqfIcm6E4YG+6UzgjDkKzly0
5Ak4lfkbIfJHtD2U1BrkBOTYzioP8pjGTCzMuYA1PWQKFbzVtqNQ6Krd1lEkukof
ppEHX9gVSg8APh9SbyOiINQWYMGYRQcEd9LUDs1vESvgrmPCJnfHKA5N1BXGfWd1
Jp1g0YYsl/uxbbKRDcx9l7XRAmb2EWVmGQMpgJRHpW0S2dpjGwYtr4Gvznk8PfCe
9B+OecaDWabkgOYpCaDi+DaFlhV5m4/6bN0vsPwAsEbk+kkjprvjM2aBdHyg89gJ
6an8pqmNc3GTy64aJivZzqOrYsEzSB+WI2OWE7NCUAvLIjfpvcEOqZ3tRloeiqRr
ONXeMQoCSyeboUK0HhoQtI6dFri9Owb4hQzurF7KHs/N/huINE1o/jQ2nijvLWdD
oHB10VAvx3J54VFcIxg0I6Tb20UW3zkMxSspETLpuk9fbcVQMCG7BvhTvXfSmqu1
VEEhyhHA60BBg89IJtzi0jBM+mfUtGzWgBYdJ4hyTC0wFKrg1Pp10QAF9004xLsU
euJQldoAXykA8MC+Wkt1hbL7sDNcXA+FCb7kcPbM/gFShgYCLXk=
=vnl/
-----END PGP SIGNATURE-----

--fku5dw5gt3ggyzpv--