From patchwork Mon Mar 26 16:21:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Parrot X-Patchwork-Id: 10308181 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6703860325 for ; Mon, 26 Mar 2018 16:21:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58FDF296A3 for ; Mon, 26 Mar 2018 16:21:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D87029777; Mon, 26 Mar 2018 16:21:45 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 08AB4296A3 for ; Mon, 26 Mar 2018 16:21:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C20286E4CE; Mon, 26 Mar 2018 16:21:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fllnx210.ext.ti.com (fllnx210.ext.ti.com [198.47.19.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id DDAE66E4CC for ; Mon, 26 Mar 2018 16:21:41 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id w2QGLdOR010277; Mon, 26 Mar 2018 11:21:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1522081299; bh=w1H2GMBvet44btulLO2qjEciVqIaK0C3reCXI8zVMvc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=TebhjEcF3+0/HW8h+XbjWJSDeZ8oKakK0wcHkrn+zskN6Wpm+mToH+aWxrXAR1wBS xOohMAiMqeZlJ/t+k2LBUMrOD+Jf5hGnlo32L5AOr3GcLwpLyyG39seOTCgQgdr5qP CpXFlGbPQDSLb5nby0gdzRetZyLyrFr2UOSvr68A= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id w2QGLdVl032251; Mon, 26 Mar 2018 11:21:39 -0500 Received: from DFLE107.ent.ti.com (10.64.6.28) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Mon, 26 Mar 2018 11:21:39 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE107.ent.ti.com (10.64.6.28) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Mon, 26 Mar 2018 11:21:39 -0500 Received: from uda0869644a.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w2QGLUBk002276; Mon, 26 Mar 2018 11:21:39 -0500 From: Benoit Parrot To: , , Laurent Pinchart Subject: [Patch v2 6/6] drm/omap: Allow wider display when a virtual plane is available Date: Mon, 26 Mar 2018 11:21:28 -0500 Message-ID: <20180326162128.8740-7-bparrot@ti.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180326162128.8740-1-bparrot@ti.com> References: <20180326162128.8740-1-bparrot@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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: Peter Ujfalusi , Tomi Valkeinen , Jyri Sarha Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add an exception case when filtering out display mode so that if a virtual wide plane is available then display wider than 2048 can be supported as long as the required timing parameters can also be met. Signed-off-by: Benoit Parrot --- drivers/gpu/drm/omapdrm/omap_connector.c | 3 ++- drivers/gpu/drm/omapdrm/omap_plane.c | 12 ++++++++++++ drivers/gpu/drm/omapdrm/omap_plane.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c index d5e059abb555..517f7fa80ce1 100644 --- a/drivers/gpu/drm/omapdrm/omap_connector.c +++ b/drivers/gpu/drm/omapdrm/omap_connector.c @@ -203,7 +203,8 @@ static int omap_connector_mode_valid(struct drm_connector *connector, u16 width, height; priv->dispc_ops->ovl_get_max_size(&width, &height); - if (mode->hdisplay > width) + if (mode->hdisplay > width && + !omap_have_any_virtual_plane(dev)) r = -EINVAL; } diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c index 21c927bbf5a7..8529abdcdeb8 100644 --- a/drivers/gpu/drm/omapdrm/omap_plane.c +++ b/drivers/gpu/drm/omapdrm/omap_plane.c @@ -209,6 +209,18 @@ bool is_omap_plane_virtual(struct drm_plane *plane) return omap_plane->virtual_plane; } +bool omap_have_any_virtual_plane(struct drm_device *dev) +{ + struct drm_plane *plane; + + drm_for_each_plane(plane, dev) { + if (is_omap_plane_virtual(plane)) + return true; + } + + return false; +} + /* helper to install properties which are common to planes and crtcs */ void omap_plane_install_properties(struct drm_plane *plane, struct drm_mode_object *obj) diff --git a/drivers/gpu/drm/omapdrm/omap_plane.h b/drivers/gpu/drm/omapdrm/omap_plane.h index 48815a05f4fe..86b1c2022231 100644 --- a/drivers/gpu/drm/omapdrm/omap_plane.h +++ b/drivers/gpu/drm/omapdrm/omap_plane.h @@ -35,5 +35,6 @@ struct drm_plane *omap_plane_init(struct drm_device *dev, void omap_plane_install_properties(struct drm_plane *plane, struct drm_mode_object *obj); bool is_omap_plane_virtual(struct drm_plane *plane); +bool omap_have_any_virtual_plane(struct drm_device *dev); #endif /* __OMAPDRM_PLANE_H__ */