Received: by 2002:a05:7208:3228:b0:82:47:81bb with SMTP id cb40csp2625904rbb; Tue, 16 Apr 2024 07:10:06 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUeomL4xqh0Lb6fTqnLtQEtADngcGwz+HN3YE7qS6e2KDjm770BSeYY2kEGcgeVxnv2RBYvNPUZj/Iado1F/H4L4y640qG8AdHWTlGbgg== X-Google-Smtp-Source: AGHT+IHHXDviAgTgRxcbSk52MbcAXmnCKjQvq6EN9xu4LH9Ne31RzwVbE4KO/kdeGi31Lgi14776 X-Received: by 2002:a17:906:a2d9:b0:a52:1635:9d16 with SMTP id by25-20020a170906a2d900b00a5216359d16mr2453571ejb.38.1713276605864; Tue, 16 Apr 2024 07:10:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713276605; cv=pass; d=google.com; s=arc-20160816; b=Ef8xx8ilhLs6jpZKVijhJk6//UBa9IKJMMbj9+KchNuvHgKoqc9Z8Fx9gIxg+IR5KK SxiLoqHLtw0EUOL8FDYJiHEB5QMyS8LQEBS1EnAwYEkKVyATGfQSStXd3bOZLoiN+PUo Gw7Kl0ouZFkgA+r50xMjyX47aMS4JZF+dhFkgUojK9C9jV4mBAot2OO0afuTMBs1Eekq kcwkZV2LY3LSCuim/61vxT+Bgbg/cMUnP9uQQlgrKSxdauK0984wV1BBGe8foatcDInF woHPLVsYcDbVcwtLvU1nK33rrerYi/P4mvTQCEChcbX3v5kHJao3UPtLmhKd/JJ46Qpw iABw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:message-id:subject:cc:to:from:date:dkim-signature; bh=hTJPJeJrhA0M2jFLNetMy3Cz5hmaNIQzEyL7HaBcRx4=; fh=+dbDITxrV4cl/OY2cxN7gTt7/71l5ewCEI+Hqi7Bv2M=; b=LnFgo8MCAHXOFGFqFDntA9eZ5jRi2dcvUHoDuxDK0DtphoFIOP4Ap0pX8TqCESTtsg yUghWtOUsDFZlpD7dkpVt8+5ZCkTOW9JlL2Xg+TG8Cp0HAlF8TBOdGDKJ33kzurhzCTm DFi5SDLfKNGaQ86m8UBPUCq6NZVVdGwmhwVXxmEXLK9W/zSkchMXXsiRc2vwcK8RUh95 fZYijBeV2oyPLuN/TiBJ/GsKfQQXzbP5hgn0HFP0ZQVHrjwVbwDgbylmp8N4ZhlF7m7F FPjvinZJVkOlowxDUlgOCkM462mNQwD4t6BLFNsNt4BxHY+BRjVV/h+wZ23ROQ1SbiUl jDNw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=S6Lqod8w; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-146950-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-146950-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id qk11-20020a1709077f8b00b00a4739d9d28fsi5849442ejc.556.2024.04.16.07.10.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 07:10:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-146950-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=S6Lqod8w; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-146950-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-146950-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 6CE2C1F22E80 for ; Tue, 16 Apr 2024 14:10:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4289112D219; Tue, 16 Apr 2024 14:09:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="S6Lqod8w" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8708212CDB0; Tue, 16 Apr 2024 14:09:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713276590; cv=none; b=LqR8rDbPvSz+cwpESqE5TvjM3loovE647sZ/Uo4AIMcYbMEh1kxuwHjmlTkhW2sAeCHL13qighzLMlaRtd3TjwPUEHz6RSGRUAa9KMPap93pXLTKoU/aKSvKZlsn1vqNcdbktjgpphKmvVzMHhnzU/uCezBhgO4tgTjjXnrTfUk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713276590; c=relaxed/simple; bh=ojzOa7PwYri2Lph1vpvafrvjeVQgZz7o4ByRzv53LDQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=rpr4+qoUTo6zDsOspjjnd9dtqEoHPzsdcrWVk0T9lSBPsnEER2eZ4pi4vXHuubL0bO0GLcD0FLVC0A7wzZbmtoto57xXj2MFKazjBWwzkN95Bdh2Qx9P99DEoKQpCLiynX/V8TrvOdXicfLK/Nzow9bdzLW3ljF6hTpVC7bp+LI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=S6Lqod8w; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713276587; x=1744812587; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=ojzOa7PwYri2Lph1vpvafrvjeVQgZz7o4ByRzv53LDQ=; b=S6Lqod8wk/H0CdQyh5LdJ/89c09gBwZFkYkUtUhrNWP1y4gafNVlIRax sI7F/w+Wx/duU5TlsaMd1Q2fbdNH8hjs7Sy5Y44igHPw448wS7TC4wslS y1o8xcHGb66aDt9F/aaTG79g/2ywigC7RUPlI+ea0VpstJDXe24UI/FyT DM+xpsHBmBKHKfda4JIPiTwiuZ1kNvHBMkpMUPxRGRDcgRhX/e8uThAC+ kfjFO9V3z9PRKlAXYf9TTHjBWeAo4JGoJQLvcpEd3ujMDnnL2CZIDQ57x x2tnEGhxCj6/bduqiTb1mHu46FsO/Wjmh0l90FdQ/W1OjNPNoA9nuhicb A==; X-CSE-ConnectionGUID: mmiiOGdAT52uFsgUB+cEZw== X-CSE-MsgGUID: 6qGLKMSsTg6b81xfCg8baw== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="9268392" X-IronPort-AV: E=Sophos;i="6.07,206,1708416000"; d="scan'208";a="9268392" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 07:09:46 -0700 X-CSE-ConnectionGUID: eAfTqTRwTKu5nLh4//PJXQ== X-CSE-MsgGUID: i+B0PUP9T5awrB+Yrhqn2A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,206,1708416000"; d="scan'208";a="22333147" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by fmviesa008.fm.intel.com with SMTP; 16 Apr 2024 07:09:41 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 16 Apr 2024 17:09:40 +0300 Date: Tue, 16 Apr 2024 17:09:40 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Maxime Ripard Cc: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Daniel Vetter , Jonathan Corbet , Sandy Huang , Heiko =?iso-8859-1?Q?St=FCbner?= , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Hans Verkuil , Sebastian Wick , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, Dave Stevenson Subject: Re: [PATCH v11 19/28] drm/connector: hdmi: Add RGB Quantization Range to the connector state Message-ID: References: <20240326-kms-hdmi-connector-state-v11-0-c5680ffcf261@kernel.org> <20240326-kms-hdmi-connector-state-v11-19-c5680ffcf261@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240326-kms-hdmi-connector-state-v11-19-c5680ffcf261@kernel.org> X-Patchwork-Hint: comment On Tue, Mar 26, 2024 at 04:40:23PM +0100, Maxime Ripard wrote: > HDMI controller drivers will need to figure out the RGB range they need > to configure based on a mode and property values. Let's expose that in > the HDMI connector state so drivers can just use that value. > > Reviewed-by: Dave Stevenson > Signed-off-by: Maxime Ripard > --- > drivers/gpu/drm/display/drm_hdmi_state_helper.c | 29 +++++++++++++++++++++++++ > drivers/gpu/drm/drm_atomic.c | 1 + > include/drm/drm_connector.h | 6 +++++ > 3 files changed, 36 insertions(+) > > diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/drm/display/drm_hdmi_state_helper.c > index c844cbeb675b..e693fe51abf5 100644 > --- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c > +++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c > @@ -49,10 +49,37 @@ connector_state_get_mode(const struct drm_connector_state *conn_state) > return NULL; > > return &crtc_state->mode; > } > > +static bool hdmi_is_full_range(const struct drm_connector *connector, > + const struct drm_connector_state *conn_state) > +{ > + const struct drm_display_info *display = &connector->display_info; We call this 'info' everywhere else. > + const struct drm_display_mode *mode = > + connector_state_get_mode(conn_state); > + > + /* > + * The Broadcast RGB property only applies to RGB format, and > + * i915 just assumes limited range for YCbCr output, so let's > + * just do the same. > + */ > + if (conn_state->hdmi.output_format != HDMI_COLORSPACE_RGB) > + return false; > + > + if (conn_state->hdmi.broadcast_rgb == DRM_HDMI_BROADCAST_RGB_FULL) > + return true; > + > + if (conn_state->hdmi.broadcast_rgb == DRM_HDMI_BROADCAST_RGB_LIMITED) > + return false; > + > + if (!display->is_hdmi) > + return true; > + > + return drm_default_rgb_quant_range(mode) == HDMI_QUANTIZATION_RANGE_FULL ? true : false; Pointless ?: I'd probably use a switch statement to make the whole thing a bit more clear. I was pondering if we could also use this from i915. But we'd have to turn the 'is_hdmi' part into a function argument since we derive that from the current crtc state rather than from the display info. > +} > + > static bool > sink_supports_format_bpc(const struct drm_connector *connector, > const struct drm_display_info *info, > const struct drm_display_mode *mode, > unsigned int format, unsigned int bpc) > @@ -307,10 +334,12 @@ int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector, > drm_atomic_get_new_connector_state(state, connector); > const struct drm_display_mode *mode = > connector_state_get_mode(new_conn_state); > int ret; > > + new_conn_state->hdmi.is_full_range = hdmi_is_full_range(connector, new_conn_state); > + > ret = hdmi_compute_config(connector, new_conn_state, mode); > if (ret) > return ret; > > if (old_conn_state->hdmi.broadcast_rgb != new_conn_state->hdmi.broadcast_rgb || > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index 3e57d98d8418..ec6c6beda5c9 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -1145,10 +1145,11 @@ static void drm_atomic_connector_print_state(struct drm_printer *p, > > if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA || > connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) { > drm_printf(p, "\tbroadcast_rgb=%s\n", > drm_hdmi_connector_get_broadcast_rgb_name(state->hdmi.broadcast_rgb)); > + drm_printf(p, "\tis_full_range=%c\n", state->hdmi.is_full_range ? 'y' : 'n'); > drm_printf(p, "\toutput_bpc=%u\n", state->hdmi.output_bpc); > drm_printf(p, "\toutput_format=%s\n", > drm_hdmi_connector_get_output_format_name(state->hdmi.output_format)); > drm_printf(p, "\ttmds_char_rate=%llu\n", state->hdmi.tmds_char_rate); > } > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index a40eaf3a8ce4..f5e960e89de3 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -1068,10 +1068,16 @@ struct drm_connector_state { > * @broadcast_rgb: Connector property to pass the > * Broadcast RGB selection value. > */ > enum drm_hdmi_broadcast_rgb broadcast_rgb; > > + /** > + * @is_full_range: Is the output supposed to use a full > + * RGB Quantization Range or not? > + */ > + bool is_full_range; I would say limited range is the exception so I would suggest flagging that instead. Feels a bit weird to flag the normal case. Maybe the name should also include 'rgb' to make it clear it only applies to RGB. > + > /** > * @output_bpc: Bits per color channel to output. > */ > unsigned int output_bpc; > > > -- > 2.44.0 -- Ville Syrj?l? Intel