> As the crtc mask is dynamic, avoid hardcoding it. It is already computed
> once all the planes are created, so it should be a no-op
>
> Signed-off-by: Louis Chauvet <louis.chau...@bootlin.com>
> ---
> drivers/gpu/drm/vkms/vkms_drv.c | 10 +++++-----
> drivers/gpu/drm/vkms/vkms_plane.c | 5 +++--
> drivers/gpu/drm/vkms/vkms_plane.h | 4 +---
> 3 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c
> index 7ac3ab7e16e5..e71b45fcb9b8 100644
> --- a/drivers/gpu/drm/vkms/vkms_drv.c
> +++ b/drivers/gpu/drm/vkms/vkms_drv.c
> @@ -166,7 +166,7 @@ static const struct drm_connector_helper_funcs
> vkms_conn_helper_funcs = {
> .get_modes = vkms_conn_get_modes,
> };
>
> -static int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc)
> +static int vkms_output_init(struct vkms_device *vkmsdev)
> {
> struct drm_device *dev = &vkmsdev->drm;
> struct drm_connector *connector;
> @@ -184,20 +184,20 @@ static int vkms_output_init(struct vkms_device
> *vkmsdev, int possible_crtc)
> * The overlay and cursor planes are not mandatory, but can be used to
> perform complex
> * composition.
> */
> - primary = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY,
> possible_crtc);
> + primary = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY);
> if (IS_ERR(primary))
> return PTR_ERR(primary);
>
> if (vkmsdev->config->overlay) {
> for (n = 0; n < NUM_OVERLAY_PLANES; n++) {
> - overlay = vkms_plane_init(vkmsdev,
> DRM_PLANE_TYPE_OVERLAY, possible_crtc);
> + overlay = vkms_plane_init(vkmsdev,
> DRM_PLANE_TYPE_OVERLAY);
> if (IS_ERR(overlay))
> return PTR_ERR(overlay);
> }
> }
>
> if (vkmsdev->config->cursor) {
> - cursor = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR,
> possible_crtc);
> + cursor = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR);
> if (IS_ERR(cursor))
> return PTR_ERR(cursor);
> }
> @@ -284,7 +284,7 @@ static int vkms_modeset_init(struct vkms_device *vkmsdev)
> dev->mode_config.preferred_depth = 0;
> dev->mode_config.helper_private = &vkms_mode_config_helpers;
>
> - return vkms_output_init(vkmsdev, 0);
> + return vkms_output_init(vkmsdev);
> }
>
> static int vkms_create(struct vkms_config *config)
> diff --git a/drivers/gpu/drm/vkms/vkms_plane.c
> b/drivers/gpu/drm/vkms/vkms_plane.c
> index e549c9523a34..b5740c27180b 100644
> --- a/drivers/gpu/drm/vkms/vkms_plane.c
> +++ b/drivers/gpu/drm/vkms/vkms_plane.c
> @@ -5,6 +5,7 @@
> #include <drm/drm_atomic.h>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_blend.h>
> +#include <drm/drm_plane.h>
> #include <drm/drm_fourcc.h>
> #include <drm/drm_gem_atomic_helper.h>
> #include <drm/drm_gem_framebuffer_helper.h>
> @@ -222,12 +223,12 @@ static const struct drm_plane_helper_funcs
> vkms_plane_helper_funcs = {
> };
>
> struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev,
> - enum drm_plane_type type, int
> possible_crtc_index)
> + enum drm_plane_type type)
> {
> struct drm_device *dev = &vkmsdev->drm;
> struct vkms_plane *plane;
>
> - plane = drmm_universal_plane_alloc(dev, struct vkms_plane, base, 1 <<
> possible_crtc_index,
> + plane = drmm_universal_plane_alloc(dev, struct vkms_plane, base, 0,
Shouldn't the index be BIT(0)? I see in the commit message that
possible_crtcs is computed once all planes are added, but I
couldn't find where. It'd be nice if you could point to the
function that sets the correct CRTC mask in the commit message.
> &vkms_plane_funcs,
> vkms_formats,
> ARRAY_SIZE(vkms_formats),
> NULL, type, NULL);
> diff --git a/drivers/gpu/drm/vkms/vkms_plane.h
> b/drivers/gpu/drm/vkms/vkms_plane.h
> index 90554c9fe250..95b2428331b8 100644
> --- a/drivers/gpu/drm/vkms/vkms_plane.h
> +++ b/drivers/gpu/drm/vkms/vkms_plane.h
> @@ -52,11 +52,9 @@ struct vkms_frame_info {
> *
> * @vkmsdev: vkms device containing the plane
> * @type: type of plane to initialize
> - * @possible_crtc_index: Crtc which can be attached to the plane. The caller
> must ensure that
> - * possible_crtc_index is positive and less or equals to 31.
> */
> struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev,
> - enum drm_plane_type type, int
> possible_crtc_index);
> + enum drm_plane_type type);
>
> #define drm_plane_state_to_vkms_plane_state(target) \
> container_of(target, struct vkms_plane_state, base.base)
>
