From patchwork Sat Mar 2 13:04:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mamta Shukla X-Patchwork-Id: 10837197 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF6E917EF for ; Sun, 3 Mar 2019 18:30:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC28B29BC1 for ; Sun, 3 Mar 2019 18:30:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AFC4629E88; Sun, 3 Mar 2019 18:30:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3494E29BC1 for ; Sun, 3 Mar 2019 18:30:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EF4E389A94; Sun, 3 Mar 2019 18:30:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE85E89DC9 for ; Sat, 2 Mar 2019 13:04:06 +0000 (UTC) Received: by mail-pl1-x642.google.com with SMTP id g37so316775plb.5 for ; Sat, 02 Mar 2019 05:04:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=3nGz8ge2hdPpIF4taid7KSv3QjKX74dVqaxhohPb8Yw=; b=hQyEVSC9TVA4h/vEXyE23w4GaK/Tys0R2x4+rKgbSq0ShlB2vCqLE7P/dB+tFtDdn0 vU2xW40i+aVGh3njMJEM8Tq3L/6NW7l7uzI4uzwI1KetOZ2+Gxb5mX1Z85KbFoTQiGc2 21Kw/vYupEgURI7RjT1JEqeA+mO6H+7Yn0NEK+gpvNcl6qTpS9qCohNpYS70yrmZQugf czakTJpTB0qQjTzeHAXvNc3Sj5vZbR6Nfy2GKZ23DS0HZ8H+Vulr9crq2s+hhhZQVJSg VO5Gs+9C45pw7lLJ0ALziJ5KKCGWWMMHE3vt959TLB+WadFz7FdDFyOjOFF39fN0N3VY 03SA== X-Gm-Message-State: APjAAAXvj1GehD6UFcwhSxrvXj4hJG92RO9LiPGdm5J4dGtIPk3YmZL6 LAv8C81W4GRSs/z6BwoYAMeszzpaAoo= X-Google-Smtp-Source: APXvYqy/BOiKvdR8ZKKtSrcIaio8j+O3jtUYDm6qDHK64FuXHvEjBegsYlbQaZyq1hDmhZUc7j/iyA== X-Received: by 2002:a17:902:6b49:: with SMTP id g9mr10818128plt.291.1551531846171; Sat, 02 Mar 2019 05:04:06 -0800 (PST) Received: from armorer ([59.92.52.22]) by smtp.gmail.com with ESMTPSA id d188sm1516822pfg.98.2019.03.02.05.04.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Mar 2019 05:04:05 -0800 (PST) Date: Sat, 2 Mar 2019 18:34:02 +0530 From: Mamta Shukla To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/vkms: Add overlay plane support Message-ID: <20190302130402.GA2419@armorer> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-Mailman-Approved-At: Sun, 03 Mar 2019 18:29:59 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=3nGz8ge2hdPpIF4taid7KSv3QjKX74dVqaxhohPb8Yw=; b=LseNopM6rHa0Ri940Od74QoByIz8KjUyKhQOV6h68MsPh2lSVHwxomvQ2P46ELSGZj /DgmU81XPCesH1JYkcjt2xFV/FuWEjHnZGv04INMvG+ueoiITSAsDrAliTBrZlM/p+3H pk1Fyw26ELerPOfyyu4VgomSbGaDoAyeQVFTY6oBGn3+FuXeIxT+OGnvoWIlV25YFmqu gTJk81uA3TUJzigz3AZKKION6ReD1aRz90cA2JimJgce3leeUAXeEqqfhMAAcX4d2OSG b5aLDEJ4zLO8YjhJ1sVzKFAPUE6J1gaJO2ZBHfIYpMKufjpo9ugRNdzBqfJ3jE2rGlWS tkwg== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: manasi.d.navare@intel.com, daniel.vetter@ffwll.ch, rodrigosiqueiramelo@gmail.com, hamohammed.sa@gmail.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add overlay plane support in vkms aligned with cursor and primary plane with module option 'enable_overlay' to enable/disable overlay plane while testing. This currently passes plane-position-covered-pipe-A-plane subtest from IGT kms_plane test. Signed-off-by: Mamta Shukla --- drivers/gpu/drm/vkms/vkms_crc.c | 36 +++++++++++++++++++++++++++---- drivers/gpu/drm/vkms/vkms_drv.c | 4 ++++ drivers/gpu/drm/vkms/vkms_drv.h | 8 +++++++ drivers/gpu/drm/vkms/vkms_plane.c | 36 ++++++++++++++++++++++++++++++- 4 files changed, 79 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_crc.c b/drivers/gpu/drm/vkms/vkms_crc.c index 5135642fb204..a07c50484b3d 100644 --- a/drivers/gpu/drm/vkms/vkms_crc.c +++ b/drivers/gpu/drm/vkms/vkms_crc.c @@ -108,6 +108,25 @@ static void blend(void *vaddr_dst, void *vaddr_src, } } +static void compose_overlay(struct vkms_crc_data *overlay_crc, + struct vkms_crc_data *primary_crc, void *vaddr_out) { + struct drm_gem_object *overlay_obj; + struct vkms_gem_object *overlay_vkms_obj; + + overlay_obj = drm_gem_fb_get_obj(&overlay_crc->fb, 0); + overlay_vkms_obj = drm_gem_to_vkms_gem(overlay_obj); + mutex_lock(&overlay_vkms_obj->pages_lock); + if(!overlay_vkms_obj->vaddr){ + DRM_WARN("overlay palne vaddr is NULL"); + goto out; + } + + blend(vaddr_out, overlay_vkms_obj->vaddr, primary_crc, overlay_crc); + +out: + mutex_unlock(&overlay_vkms_obj->pages_lock); +} + static void compose_cursor(struct vkms_crc_data *cursor_crc, struct vkms_crc_data *primary_crc, void *vaddr_out) { @@ -130,7 +149,8 @@ static void compose_cursor(struct vkms_crc_data *cursor_crc, } static uint32_t _vkms_get_crc(struct vkms_crc_data *primary_crc, - struct vkms_crc_data *cursor_crc) + struct vkms_crc_data *cursor_crc, + struct vkms_crc_data *overlay_crc) { struct drm_framebuffer *fb = &primary_crc->fb; struct drm_gem_object *gem_obj = drm_gem_fb_get_obj(fb, 0); @@ -153,6 +173,8 @@ static uint32_t _vkms_get_crc(struct vkms_crc_data *primary_crc, memcpy(vaddr_out, vkms_obj->vaddr, vkms_obj->gem.size); mutex_unlock(&vkms_obj->pages_lock); + if (overlay_crc) + compose_overlay(overlay_crc, primary_crc, vaddr_out); if (cursor_crc) compose_cursor(cursor_crc, primary_crc, vaddr_out); @@ -183,6 +205,7 @@ void vkms_crc_work_handle(struct work_struct *work) output); struct vkms_crc_data *primary_crc = NULL; struct vkms_crc_data *cursor_crc = NULL; + struct vkms_crc_data *overlay_crc = NULL; struct drm_plane *plane; u32 crc32 = 0; u64 frame_start, frame_end; @@ -209,12 +232,17 @@ void vkms_crc_work_handle(struct work_struct *work) if (plane->type == DRM_PLANE_TYPE_PRIMARY) primary_crc = crc_data; - else + + if (plane->type == DRM_PLANE_TYPE_CURSOR) cursor_crc = crc_data; + + if (plane->type == DRM_PLANE_TYPE_OVERLAY) + overlay_crc = crc_data; } - if (primary_crc) - crc32 = _vkms_get_crc(primary_crc, cursor_crc); + if (primary_crc){ + crc32 = _vkms_get_crc(primary_crc, cursor_crc, overlay_crc); + } frame_end = drm_crtc_accurate_vblank_count(crtc); diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c index b13f99a5c849..90b730b6aa0e 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -34,6 +34,10 @@ bool enable_cursor; module_param_named(enable_cursor, enable_cursor, bool, 0444); MODULE_PARM_DESC(enable_cursor, "Enable/Disable cursor support"); +bool enable_overlay; +module_param_named(enable_overlay, enable_overlay, bool, 0444); +MODULE_PARM_DESC(enable_overlay, "Enable/Disable overlay support"); + static const struct file_operations vkms_driver_fops = { .owner = THIS_MODULE, .open = drm_open, diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index e4469cd3d254..4b1ef94e5bf8 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -18,6 +18,8 @@ extern bool enable_cursor; +extern bool enable_overlay; + static const u32 vkms_formats[] = { DRM_FORMAT_XRGB8888, }; @@ -26,6 +28,10 @@ static const u32 vkms_cursor_formats[] = { DRM_FORMAT_ARGB8888, }; +static const u32 vkms_overlay_formats[] ={ + DRM_FORMAT_ARGB8888, +}; + struct vkms_crc_data { struct drm_framebuffer fb; struct drm_rect src, dst; @@ -116,6 +122,8 @@ int vkms_output_init(struct vkms_device *vkmsdev); struct drm_plane *vkms_plane_init(struct vkms_device *vkmsdev, enum drm_plane_type type); +struct drm_plane *vkms_overlay_init(struct vkms_device *vkmsdev); + /* Gem stuff */ struct drm_gem_object *vkms_gem_create(struct drm_device *dev, struct drm_file *file, diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c index 418817600ad1..0625b9ff8bd3 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -120,7 +120,7 @@ static int vkms_plane_atomic_check(struct drm_plane *plane, if (IS_ERR(crtc_state)) return PTR_ERR(crtc_state); - if (plane->type == DRM_PLANE_TYPE_CURSOR) + if ((plane->type == DRM_PLANE_TYPE_CURSOR)|(plane->type == DRM_PLANE_TYPE_OVERLAY)) can_position = true; ret = drm_atomic_helper_check_plane_state(state, crtc_state, @@ -173,6 +173,40 @@ static const struct drm_plane_helper_funcs vkms_primary_helper_funcs = { .cleanup_fb = vkms_cleanup_fb, }; +struct drm_plane *vkms_overlay_init(struct vkms_device *vkmsdev) +{ + struct drm_device *dev = &vkmsdev->drm; + const struct drm_plane_helper_funcs *funcs; + struct drm_plane *overlay; + const u32 *formats; + int ret, nformats; + unsigned int blend_caps = BIT(DRM_MODE_BLEND_PIXEL_NONE) | + BIT(DRM_MODE_BLEND_PREMULTI); + + overlay = kzalloc(sizeof(*overlay), GFP_KERNEL); + if (!overlay) + return -ENOMEM; + + formats = vkms_overlay_formats; + nformats = ARRAY_SIZE(vkms_overlay_formats); + funcs = &vkms_primary_helper_funcs; + drm_plane_helper_add(overlay, funcs); + drm_plane_create_alpha_property(overlay); + drm_plane_create_blend_mode_property(overlay, blend_caps); + + ret = drm_universal_plane_init(dev, overlay, 0, + &vkms_plane_funcs, + formats, nformats, + NULL, + DRM_PLANE_TYPE_OVERLAY, NULL); + if (ret){ + kfree(overlay); + return ERR_PTR(ret); + } + + return overlay; +} + struct drm_plane *vkms_plane_init(struct vkms_device *vkmsdev, enum drm_plane_type type) {