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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 564C2C636CC for ; Wed, 8 Feb 2023 14:16:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD7FB10E21B; Wed, 8 Feb 2023 14:16:23 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id B174410E21B for ; Wed, 8 Feb 2023 14:16:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675865782; x=1707401782; h=message-id:date:mime-version:subject:to:references:from: in-reply-to:content-transfer-encoding; bh=PgqzZJtGgfs+H94xepeFKStzpQS2VJIF217G6R0JLnw=; b=eip/Fwj6J2WMgn7nH8KjW3rstlN6BCJjgtkl41I/fkxRoph+m+L86JTW 9eHhH/mctbn+lczo+4FTta+u/X8/Ce7Eeyw0SqhO6G1lG9OqHQSNi/TmT Iv/VGH/DxJ4Lr22KAiDo8n2rGC/dgQCHDnvVz+DjfIP9YTZByCRPD+JmJ r5VAvDFcK4QAZb1YsM7szluAbt9JqmuJejSSxaVcLjQYTzsAtov1gH+zn mBfb0yFdGVR1hZllOt+IBKExgzch38t2ALREDU3YcC+HN4gPrBDHrG0jw vc1Eigsbn6nkOD/GW2eBx1ZaVihr0Xc8ZDC3TBzvTCwnCeehqazvQCQp+ Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10615"; a="317806975" X-IronPort-AV: E=Sophos;i="5.97,281,1669104000"; d="scan'208";a="317806975" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2023 06:16:22 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10615"; a="699660242" X-IronPort-AV: E=Sophos;i="5.97,281,1669104000"; d="scan'208";a="699660242" Received: from swatish2-mobl2.gar.corp.intel.com (HELO [10.213.113.150]) ([10.213.113.150]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2023 06:16:20 -0800 Message-ID: Date: Wed, 8 Feb 2023 19:46:17 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 To: Jani Nikula , Suraj Kandpal , intel-gfx@lists.freedesktop.org References: <20230207074416.3209722-1-suraj.kandpal@intel.com> <20230207074416.3209722-8-suraj.kandpal@intel.com> <87a61pzxcj.fsf@intel.com> Content-Language: en-US From: Swati Sharma Organization: Intel In-Reply-To: <87a61pzxcj.fsf@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Intel-gfx] [PATCH v9 7/7] drm/i915/dsc: Add debugfs entry to validate DSC output formats X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi Jani, Thanks for the reviews. Please find my replies inline. On 07-Feb-23 2:05 PM, Jani Nikula wrote: > On Tue, 07 Feb 2023, Suraj Kandpal wrote: >> From: Swati Sharma >> >> DSC_Output_Format_Sink_Support entry is added to i915_dsc_fec_support_show >> to depict if sink supports DSC output formats (RGB/YCbCr420/YCbCr444). >> Also, new debugfs entry is created to enforce output format. This is >> required because of our driver policy. For ex. if a mode is supported >> in both RGB and YCbCr420 output formats by the sink, our policy is to >> try RGB first and fall back to YCbCr420, if mode cannot be shown >> using RGB. So, to test other output formats like YCbCr420 or YCbCr444, >> we need a debugfs entry (force_dsc_output_format) to force this >> output format. >> >> Signed-off-by: Swati Sharma >> --- >> .../drm/i915/display/intel_crtc_state_dump.c | 4 +- >> .../drm/i915/display/intel_crtc_state_dump.h | 2 + >> .../drm/i915/display/intel_display_debugfs.c | 77 +++++++++++++++++++ >> .../drm/i915/display/intel_display_types.h | 1 + >> drivers/gpu/drm/i915/display/intel_dp.c | 11 +++ >> 5 files changed, 93 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c >> index 2422d6ef5777..9913f22e0f79 100644 >> --- a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c >> +++ b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c >> @@ -115,13 +115,13 @@ static void snprintf_output_types(char *buf, size_t len, >> WARN_ON_ONCE(output_types != 0); >> } >> >> -static const char * const output_format_str[] = { >> +const char * const output_format_str[] = { > > Why? > >> [INTEL_OUTPUT_FORMAT_RGB] = "RGB", >> [INTEL_OUTPUT_FORMAT_YCBCR420] = "YCBCR4:2:0", >> [INTEL_OUTPUT_FORMAT_YCBCR444] = "YCBCR4:4:4", >> }; >> >> -static const char *output_formats(enum intel_output_format format) >> +const char *output_formats(enum intel_output_format format) > > output_formats is too generic a name to be non-static. Is intel_output_formats name okay? > >> { >> if (format >= ARRAY_SIZE(output_format_str)) >> return "invalid"; >> diff --git a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.h b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.h >> index 9399c35b7e5e..daf0a7cc0702 100644 >> --- a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.h >> +++ b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.h >> @@ -8,9 +8,11 @@ >> >> struct intel_crtc_state; >> struct intel_atomic_state; >> +enum intel_output_format; >> >> void intel_crtc_state_dump(const struct intel_crtc_state *crtc_state, >> struct intel_atomic_state *state, >> const char *context); >> +const char *output_formats(enum intel_output_format format); > > And maybe the place for the function is not here at all if it's needed > in multiple places. Can I create an inline static function in intel_display_types.h instead? > >> >> #endif /* __INTEL_CRTC_STATE_H__ */ >> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> index 9e2fb8626c96..27b7d8dafe66 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> @@ -12,6 +12,7 @@ >> #include "i915_irq.h" >> #include "i915_reg.h" >> #include "intel_de.h" >> +#include "intel_crtc_state_dump.h" >> #include "intel_display_debugfs.h" >> #include "intel_display_power.h" >> #include "intel_display_power_well.h" >> @@ -1770,6 +1771,13 @@ static int i915_dsc_fec_support_show(struct seq_file *m, void *data) >> str_yes_no(crtc_state->dsc.compression_enable)); >> seq_printf(m, "DSC_Sink_Support: %s\n", >> str_yes_no(drm_dp_sink_supports_dsc(intel_dp->dsc_dpcd))); >> + seq_printf(m, "DSC_Output_Format_Sink_Support: RGB: %s YCBCR420: %s YCBCR444: %s\n", >> + str_yes_no(drm_dp_dsc_sink_supports_format(intel_dp->dsc_dpcd, >> + DP_DSC_RGB)), >> + str_yes_no(drm_dp_dsc_sink_supports_format(intel_dp->dsc_dpcd, >> + DP_DSC_YCbCr420_Native)), >> + str_yes_no(drm_dp_dsc_sink_supports_format(intel_dp->dsc_dpcd, >> + DP_DSC_YCbCr444))); >> seq_printf(m, "Force_DSC_Enable: %s\n", >> str_yes_no(intel_dp->force_dsc_en)); >> if (!intel_dp_is_edp(intel_dp)) >> @@ -1895,6 +1903,72 @@ static const struct file_operations i915_dsc_bpc_fops = { >> .write = i915_dsc_bpc_write >> }; >> >> +static int i915_dsc_output_format_show(struct seq_file *m, void *data) >> +{ >> + struct drm_connector *connector = m->private; >> + struct drm_device *dev = connector->dev; >> + struct drm_crtc *crtc; >> + struct intel_crtc_state *crtc_state; >> + struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector)); >> + int ret; >> + >> + if (!encoder) >> + return -ENODEV; >> + >> + ret = drm_modeset_lock_single_interruptible(&dev->mode_config.connection_mutex); >> + if (ret) >> + return ret; >> + >> + crtc = connector->state->crtc; >> + if (connector->status != connector_status_connected || !crtc) { >> + ret = -ENODEV; >> + goto out; >> + } >> + >> + crtc_state = to_intel_crtc_state(crtc->state); >> + seq_printf(m, "DSC_Output_Format: %s\n", output_formats(crtc_state->output_format)); >> + >> +out: drm_modeset_unlock(&dev->mode_config.connection_mutex); >> + >> + return ret; >> +} >> + >> +static ssize_t i915_dsc_output_format_write(struct file *file, >> + const char __user *ubuf, >> + size_t len, loff_t *offp) >> +{ >> + struct drm_connector *connector = >> + ((struct seq_file *)file->private_data)->private; >> + struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector)); >> + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); >> + int dsc_output_format = 0; >> + int ret; >> + >> + ret = kstrtoint_from_user(ubuf, len, 0, &dsc_output_format); >> + if (ret < 0) >> + return ret; >> + >> + intel_dp->force_dsc_output_format = dsc_output_format; >> + *offp += len; >> + >> + return len; >> +} >> + >> +static int i915_dsc_output_format_open(struct inode *inode, >> + struct file *file) >> +{ >> + return single_open(file, i915_dsc_output_format_show, inode->i_private); >> +} >> + >> +static const struct file_operations i915_dsc_output_format_fops = { >> + .owner = THIS_MODULE, >> + .open = i915_dsc_output_format_open, >> + .read = seq_read, >> + .llseek = seq_lseek, >> + .release = single_release, >> + .write = i915_dsc_output_format_write >> +}; >> + >> /* >> * Returns the Current CRTC's bpc. >> * Example usage: cat /sys/kernel/debug/dri/0/crtc-0/i915_current_bpc >> @@ -1966,6 +2040,9 @@ void intel_connector_debugfs_add(struct intel_connector *intel_connector) >> >> debugfs_create_file("i915_dsc_bpc", 0644, root, >> connector, &i915_dsc_bpc_fops); >> + >> + debugfs_create_file("i915_dsc_output_format", 0644, root, >> + connector, &i915_dsc_output_format_fops); >> } >> >> if (connector->connector_type == DRM_MODE_CONNECTOR_DSI || >> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h >> index 9ccae7a46020..9f7951b49c42 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display_types.h >> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h >> @@ -1743,6 +1743,7 @@ struct intel_dp { >> >> /* Display stream compression testing */ >> bool force_dsc_en; >> + int force_dsc_output_format; >> int force_dsc_bpc; >> >> bool hobl_failed; >> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c >> index 250d9cdd14b8..bd2d3d11e85b 100644 >> --- a/drivers/gpu/drm/i915/display/intel_dp.c >> +++ b/drivers/gpu/drm/i915/display/intel_dp.c >> @@ -76,6 +76,7 @@ >> #include "intel_tc.h" >> #include "intel_vdsc.h" >> #include "intel_vrr.h" >> +#include "intel_crtc_state_dump.h" >> >> /* DP DSC throughput values used for slice count calculations KPixels/s */ >> #define DP_DSC_PEAK_PIXEL_RATE 2720000 >> @@ -2063,6 +2064,16 @@ intel_dp_compute_output_format(struct intel_encoder *encoder, >> bool ycbcr_420_only; >> int ret; >> >> + if (intel_dp->force_dsc_output_format) { >> + crtc_state->output_format = intel_dp->force_dsc_output_format; >> + drm_dbg_kms(&i915->drm, "DSC output format forced to %s", >> + output_formats(crtc_state->output_format)); >> + >> + ret = intel_dp_compute_link_config(encoder, crtc_state, conn_state, >> + respect_downstream_limits); > > Please don't duplicate the call to > intel_dp_compute_output_format(). Force the output format and try to use > the regular path otherwise. With the above approach, testing with the > forced output format uses a different path than is used otherwise. Jani, crtc_state->output_format will be set to force_dsc_output_format in case we are forcing o/p format and in normal case output format is computed from intel_dp_output_format(). That's it. We are not using different path. Please suggest if you see this otherwise. > > BR, > Jani. > >> + return ret; >> + } >> + >> ycbcr_420_only = drm_mode_is_420_only(info, adjusted_mode); >> >> crtc_state->output_format = intel_dp_output_format(connector, ycbcr_420_only); > -- ~Swati Sharma