From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 391CDC10F13 for ; Tue, 16 Apr 2019 14:52:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0651D2077C for ; Tue, 16 Apr 2019 14:52:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="W2ve5RKe"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=tronnes.org header.i=@tronnes.org header.b="cQE2uTZL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0651D2077C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=tronnes.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/T/dNV+RqlaglHDbYetWkdQME5WJTREEGdp8/CbHtI0=; b=W2ve5RKeWBSRno 7xHVen4DMGr4wUPsJDtY2LxCeXz4lZxtTMU2W0xkhP2uehYuedmpAwRQnt/WNIjRZGcSTrnS9XUZ3 XTvcEfecKPlkpUHwz/5w7F2b/jAP2/hVVvbhTfSIYi4MuIes8LCUjKbbHnrrsKXcy9qpexWvTqKP9 Z0lrY05Wki4s2lIgJO+/50O269VUfFTAa+9gcHypbhNPjmwdmnfgBkmtpnCaYAaMFpTgQRZeYbzvm KpGMttmJbPu/3dkI5l5+gdNvzy8XIScQrKRioh4Xv6jw1gAuWgO2HRTIde3UDGrRjQqjxnIebzFSq KTP3WrvtLez3pa7ivzXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGPRj-0002vo-OH; Tue, 16 Apr 2019 14:52:27 +0000 Received: from smtp.domeneshop.no ([2a01:5b40:0:3005::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGPRg-0002vR-GP for linux-arm-kernel@lists.infradead.org; Tue, 16 Apr 2019 14:52:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tronnes.org; s=ds201810; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To:Subject; bh=21fEKjTjEaWzBDfV7o33E67PfqxbR6sx64Xm2Lc3zHQ=; b=cQE2uTZLnktadIYqSALWUbiAGIDgoVsBeVSAmIF7R1CrIkdjxxbJ+LBgjgXbBRWP+6PHH4yrPOSuIhkw02f4NHxpbzV3s4m078gVZa1Ihl3HMMfIqawQeDrOasfegnuvsIWUKYxkmVi4YGscfEi6CI8stWWyTzecd1nvlcH4yN2CHs5N7atDeEdVwHjh3t5nN605fXlq6mspBJjT0JWgKY91rdqydJSv20n2/pUrEHzUKAZN8QMbCTfo7wXxhul0gbu9oJj8yd/1W5/l2qHFcNZBEfjsP3y7BYQiCO+/nFJS3e66nowChSE8FYn+4VO/XqaBLMtonpnhpjXX6dP00A==; Received: from 211.81-166-168.customer.lyse.net ([81.166.168.211]:63622 helo=[192.168.10.179]) by smtp.domeneshop.no with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1hGPRe-00053L-2t; Tue, 16 Apr 2019 16:52:22 +0200 Subject: Re: [PATCH v2 4/5] drm/modes: Parse overscan properties To: Maxime Ripard , Maarten Lankhorst , Sean Paul , Daniel Vetter , David Airlie References: From: =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= Message-ID: Date: Tue, 16 Apr 2019 16:52:20 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190416_075224_721329_D062F22F X-CRM114-Status: GOOD ( 16.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Kocialkowski , linux-arm-kernel@lists.infradead.org, Thomas Petazzoni , dri-devel@lists.freedesktop.org, eben@raspberrypi.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Den 11.04.2019 15.22, skrev Maxime Ripard: > Properly configuring the overscan properties might be needed for the > initial setup of the framebuffer for display that still have overscan. > Let's allow for more properties on the kernel command line to setup each > margin. > > Signed-off-by: Maxime Ripard > --- > drivers/gpu/drm/drm_fb_helper.c | 47 ++++++++++++++++++++++++++++++++++- > drivers/gpu/drm/drm_modes.c | 44 ++++++++++++++++++++++++++++++++- > include/drm/drm_connector.h | 1 +- > 3 files changed, 92 insertions(+) > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index 8781897559b2..4e403fe1f451 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -2567,6 +2567,51 @@ static void drm_setup_crtc_rotation(struct drm_fb_helper *fb_helper, > fb_helper->sw_rotations |= DRM_MODE_ROTATE_0; > } > > +static void drm_setup_connector_margins(struct drm_connector *connector) > +{ > + struct drm_cmdline_mode *cmdline = &connector->cmdline_mode; > + struct drm_modeset_acquire_ctx ctx; > + struct drm_atomic_state *state; > + struct drm_device *dev = connector->dev; > + int ret; > + > + if (!drm_drv_uses_atomic_modeset(dev)) > + return; > + > + drm_modeset_acquire_init(&ctx, 0); > + > + state = drm_atomic_state_alloc(dev); > + state->acquire_ctx = &ctx; > + > +retry: > + drm_atomic_set_property(state, &connector->base, > + dev->mode_config.tv_left_margin_property, > + cmdline->overscan_left); > + > + drm_atomic_set_property(state, &connector->base, > + dev->mode_config.tv_right_margin_property, > + cmdline->overscan_right); > + > + drm_atomic_set_property(state, &connector->base, > + dev->mode_config.tv_top_margin_property, > + cmdline->overscan_top); > + > + drm_atomic_set_property(state, &connector->base, > + dev->mode_config.tv_bottom_margin_property, > + cmdline->overscan_bottom); > + > + ret = drm_atomic_commit(state); > + if (ret == -EDEADLK) { > + drm_atomic_state_clear(state); > + drm_modeset_backoff(&ctx); > + goto retry; > + } > + > + drm_atomic_state_put(state); > + drm_modeset_drop_locks(&ctx); > + drm_modeset_acquire_fini(&ctx); > +} > + Should we set these property values in drm_connector_init()? I assume that DRM userspace would want to use these values as well. Noralf. > static void drm_setup_crtcs(struct drm_fb_helper *fb_helper, > u32 width, u32 height) > { > @@ -2680,6 +2725,8 @@ static void drm_setup_crtcs_fb(struct drm_fb_helper *fb_helper) > struct drm_connector *connector = > fb_helper->connector_info[i]->connector; > > + drm_setup_connector_margins(connector); > + > /* use first connected connector for the physical dimensions */ > if (connector->status == connector_status_connected) { > info->var.width = connector->display_info.width_mm; > diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c > index ac8d70b92b62..493ba3ccde70 100644 > --- a/drivers/gpu/drm/drm_modes.c > +++ b/drivers/gpu/drm/drm_modes.c > @@ -1586,6 +1586,50 @@ static int drm_mode_parse_cmdline_options(char *str, size_t len, > } else if (!strncmp(option, "reflect_y", delim - option)) { > rotation |= DRM_MODE_REFLECT_Y; > sep = delim; > + } else if (!strncmp(option, "overscan_right", delim - option)) { > + const char *value = delim + 1; > + unsigned int margin; > + > + margin = simple_strtol(value, &sep, 10); > + > + /* Make sure we have parsed something */ > + if (sep == value) > + return -EINVAL; > + > + mode->overscan_right = margin; > + } else if (!strncmp(option, "overscan_left", delim - option)) { > + const char *value = delim + 1; > + unsigned int margin; > + > + margin = simple_strtol(value, &sep, 10); > + > + /* Make sure we have parsed something */ > + if (sep == value) > + return -EINVAL; > + > + mode->overscan_left = margin; > + } else if (!strncmp(option, "overscan_top", delim - option)) { > + const char *value = delim + 1; > + unsigned int margin; > + > + margin = simple_strtol(value, &sep, 10); > + > + /* Make sure we have parsed something */ > + if (sep == value) > + return -EINVAL; > + > + mode->overscan_top = margin; > + } else if (!strncmp(option, "overscan_bottom", delim - option)) { > + const char *value = delim + 1; > + unsigned int margin; > + > + margin = simple_strtol(value, &sep, 10); > + > + /* Make sure we have parsed something */ > + if (sep == value) > + return -EINVAL; > + > + mode->overscan_bottom = margin; > } else { > return -EINVAL; > } > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index dfe7f2304b35..44d9885dd401 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -903,6 +903,7 @@ struct drm_cmdline_mode { > int xres, yres; > int bpp; > int refresh; > + int overscan_right, overscan_top, overscan_left, overscan_bottom; > bool rb; > bool interlace; > bool cvt; > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel