Commit 5afe8239 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Thomas Zimmermann
Browse files

drm: shmobile: Switch to drm_crtc_init_with_planes() 



The SH-Mobile DRM driver uses the legacy drm_crtc_init(), which
advertizes only the formats in safe_modeset_formats[] (XR24 and AR24) as
being supported.

Switch to drm_crtc_init_with_planes(), and advertize all supported
(A)RGB modes, so we can use RGB565 as the default mode for the console.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/2098de3d33bc479a8569da7dcbafdb685ff0a13a.1684854992.git.geert+renesas@glider.be
parent 2a98bad7

drivers/gpu/drm/shmobile/shmob_drm_crtc.c

+28 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <drm/drm_gem_dma_helper.h>

#include <drm/drm_modeset_helper.h>

#include <drm/drm_modeset_helper_vtables.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>

#include <drm/drm_vblank.h>
@@ -478,16 +479,41 @@ static const struct drm_crtc_funcs crtc_funcs = { 
	.disable_vblank = shmob_drm_disable_vblank,

};



static const uint32_t modeset_formats[] = {

	DRM_FORMAT_RGB565,

	DRM_FORMAT_RGB888,

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_XRGB8888,

};



static const struct drm_plane_funcs primary_plane_funcs = {

	DRM_PLANE_NON_ATOMIC_FUNCS,

};



int shmob_drm_crtc_create(struct shmob_drm_device *sdev)

{

	struct drm_crtc *crtc = &sdev->crtc.crtc;

	struct drm_plane *primary;

	int ret;



	sdev->crtc.dpms = DRM_MODE_DPMS_OFF;



	ret = drm_crtc_init(sdev->ddev, crtc, &crtc_funcs);

	if (ret < 0)

	primary = __drm_universal_plane_alloc(sdev->ddev, sizeof(*primary), 0,

					      0, &primary_plane_funcs,

					      modeset_formats,

					      ARRAY_SIZE(modeset_formats),

					      NULL, DRM_PLANE_TYPE_PRIMARY,

					      NULL);

	if (IS_ERR(primary))

		return PTR_ERR(primary);



	ret = drm_crtc_init_with_planes(sdev->ddev, crtc, primary, NULL,

					&crtc_funcs, NULL);

	if (ret < 0) {

		drm_plane_cleanup(primary);

		kfree(primary);

		return ret;

	}



	drm_crtc_helper_add(crtc, &crtc_helper_funcs);