From ed94f8dc00dd75bf5d88bdf73b9d69a579c0f8ef Mon Sep 17 00:00:00 2001 From: LongChair Date: Sun, 29 Apr 2018 17:46:23 +0200 Subject: drm/atomic: refactor planes names We are currently using primary / overlay planes drm objects, assuming that primary plane is osd and overlay plane is video. This commit is doing two things : - replace the primary / overlay planes members with osd and video planes member without the assumption - Add two more options to determine which one of the primary / overlay is associated to osd / video. - It will default osd to overlay and video to primary if unspecified --- video/out/vo_drm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'video/out/vo_drm.c') diff --git a/video/out/vo_drm.c b/video/out/vo_drm.c index b25f036256..ed41d2aab0 100644 --- a/video/out/vo_drm.c +++ b/video/out/vo_drm.c @@ -420,7 +420,8 @@ static int preinit(struct vo *vo) p->kms = kms_create( vo->log, vo->opts->drm_opts->drm_connector_spec, vo->opts->drm_opts->drm_mode_id, - vo->opts->drm_opts->drm_overlay_id); + vo->opts->drm_opts->drm_osd_plane_id, + vo->opts->drm_opts->drm_video_plane_id); if (!p->kms) { MP_ERR(vo, "Failed to create KMS.\n"); goto err; -- cgit v1.2.3