[v2,9/9] drm/edid: s/monitor_rage/vrr_range/

Message ID	20220927170006.27855-10-ville.syrjala@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <dri-devel-bounces@lists.freedesktop.org> From: Ville Syrjala <ville.syrjala@linux.intel.com> To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 9/9] drm/edid: s/monitor_rage/vrr_range/ Date: Tue, 27 Sep 2022 20:00:06 +0300 Message-Id: <20220927170006.27855-10-ville.syrjala@linux.intel.com> In-Reply-To: <20220927170006.27855-1-ville.syrjala@linux.intel.com> References: <20220927170006.27855-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Cc: Leo Li <sunpeng.li@amd.com>, intel-gfx@lists.freedesktop.org, Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>, amd-gfx@lists.freedesktop.org, Manasi Navare <manasi.d.navare@intel.com>, Jani Nikula <jani.nikula@intel.com>, Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
Series	drm/edid: Range descriptor stuff \| expand [v2,0/9] drm/edid: Range descriptor stuff [v2,1/9] drm/edid: Clarify why we only accept the "range limits only" descriptor [v2,2/9] drm/edid: Define more flags [v2,3/9] drm/edid: Only parse VRR range for continuous frequency displays [v2,4/9] drm/edid: Extract drm_gtf2_mode() [v2,5/9] drm/edid: Use GTF2 for inferred modes [v2,6/9] drm/edid: Use the correct formula for standard timings [v2,7/9] drm/edid: Unconfuse preferred timing stuff a bit [v2,8/9] drm/edid: Make version checks less convoluted [v2,9/9] drm/edid: s/monitor_rage/vrr_range/

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 4c73727e0b7d..88758e8c65c6 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -9943,8 +9943,8 @@ void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, amdgpu_dm_connector->min_vfreq = 0; amdgpu_dm_connector->max_vfreq = 0; amdgpu_dm_connector->pixel_clock_mhz = 0; - connector->display_info.monitor_range.min_vfreq = 0; - connector->display_info.monitor_range.max_vfreq = 0; + connector->display_info.vrr_range.min_vfreq = 0; + connector->display_info.vrr_range.max_vfreq = 0; freesync_capable = false; goto update; @@ -9991,8 +9991,8 @@ void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, amdgpu_dm_connector->pixel_clock_mhz = range->pixel_clock_mhz * 10; - connector->display_info.monitor_range.min_vfreq = range->min_vfreq; - connector->display_info.monitor_range.max_vfreq = range->max_vfreq; + connector->display_info.vrr_range.min_vfreq = range->min_vfreq; + connector->display_info.vrr_range.max_vfreq = range->max_vfreq; break; } @@ -10014,8 +10014,8 @@ void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, if (amdgpu_dm_connector->max_vfreq - amdgpu_dm_connector->min_vfreq > 10) freesync_capable = true; - connector->display_info.monitor_range.min_vfreq = vsdb_info.min_refresh_rate_hz; - connector->display_info.monitor_range.max_vfreq = vsdb_info.max_refresh_rate_hz; + connector->display_info.vrr_range.min_vfreq = vsdb_info.min_refresh_rate_hz; + connector->display_info.vrr_range.max_vfreq = vsdb_info.max_refresh_rate_hz; } } diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 01ee3febb813..1437c798b122 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c @@ -377,8 +377,8 @@ static int vrr_range_show(struct seq_file *m, void *data) if (connector->status != connector_status_connected) return -ENODEV; - seq_printf(m, "Min: %u\n", connector->display_info.monitor_range.min_vfreq); - seq_printf(m, "Max: %u\n", connector->display_info.monitor_range.max_vfreq); + seq_printf(m, "Min: %u\n", connector->display_info.vrr_range.min_vfreq); + seq_printf(m, "Max: %u\n", connector->display_info.vrr_range.max_vfreq); return 0; } diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 69485adcc80c..e7f46260dfe7 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6091,11 +6091,11 @@ static void drm_parse_cea_ext(struct drm_connector *connector, } static -void get_monitor_range(const struct detailed_timing *timing, void *c) +void get_vrr_range(const struct detailed_timing *timing, void *c) { struct detailed_mode_closure *closure = c; struct drm_display_info *info = &closure->connector->display_info; - struct drm_monitor_range_info *monitor_range = &info->monitor_range; + struct drm_monitor_range_info *vrr_range = &info->vrr_range; const struct detailed_non_pixel *data = &timing->data.other_data; const struct detailed_data_monitor_range *range = &data->data.range; const struct edid *edid = closure->drm_edid->edid; @@ -6115,19 +6115,19 @@ void get_monitor_range(const struct detailed_timing *timing, void *c) if (range->flags != DRM_EDID_RANGE_LIMITS_ONLY_FLAG) return; - monitor_range->min_vfreq = range->min_vfreq; - monitor_range->max_vfreq = range->max_vfreq; + vrr_range->min_vfreq = range->min_vfreq; + vrr_range->max_vfreq = range->max_vfreq; if (edid->revision >= 4) { if (data->pad2 & DRM_EDID_RANGE_OFFSET_MIN_VFREQ) - monitor_range->min_vfreq += 255; + vrr_range->min_vfreq += 255; if (data->pad2 & DRM_EDID_RANGE_OFFSET_MAX_VFREQ) - monitor_range->max_vfreq += 255; + vrr_range->max_vfreq += 255; } } -static void drm_get_monitor_range(struct drm_connector *connector, - const struct drm_edid *drm_edid) +static void drm_get_vrr_range(struct drm_connector *connector, + const struct drm_edid *drm_edid) { const struct drm_display_info *info = &connector->display_info; struct detailed_mode_closure closure = { @@ -6141,11 +6141,11 @@ static void drm_get_monitor_range(struct drm_connector *connector, if (!(drm_edid->edid->features & DRM_EDID_FEATURE_CONTINUOUS_FREQ)) return; - drm_for_each_detailed_block(drm_edid, get_monitor_range, &closure); + drm_for_each_detailed_block(drm_edid, get_vrr_range, &closure); DRM_DEBUG_KMS("Supported Monitor Refresh rate range is %d Hz - %d Hz\n", - info->monitor_range.min_vfreq, - info->monitor_range.max_vfreq); + info->vrr_range.min_vfreq, + info->vrr_range.max_vfreq); } static void drm_parse_vesa_mso_data(struct drm_connector *connector, @@ -6238,7 +6238,7 @@ static void drm_reset_display_info(struct drm_connector *connector) info->edid_hdmi_ycbcr444_dc_modes = 0; info->non_desktop = 0; - memset(&info->monitor_range, 0, sizeof(info->monitor_range)); + memset(&info->vrr_range, 0, sizeof(info->vrr_range)); memset(&info->luminance_range, 0, sizeof(info->luminance_range)); info->mso_stream_count = 0; @@ -6258,7 +6258,7 @@ static u32 update_display_info(struct drm_connector *connector, info->width_mm = edid->width_cm * 10; info->height_mm = edid->height_cm * 10; - drm_get_monitor_range(connector, drm_edid); + drm_get_vrr_range(connector, drm_edid); if (edid->revision < 3) goto out; diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c index 5eac99021875..b3793403d450 100644 --- a/drivers/gpu/drm/i915/display/intel_vrr.c +++ b/drivers/gpu/drm/i915/display/intel_vrr.c @@ -38,7 +38,7 @@ bool intel_vrr_is_capable(struct intel_connector *connector) } return HAS_VRR(i915) && - info->monitor_range.max_vfreq - info->monitor_range.min_vfreq > 10; + info->vrr_range.max_vfreq - info->vrr_range.min_vfreq > 10; } void @@ -117,9 +117,9 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state, return; vmin = DIV_ROUND_UP(adjusted_mode->crtc_clock * 1000, - adjusted_mode->crtc_htotal * info->monitor_range.max_vfreq); + adjusted_mode->crtc_htotal * info->vrr_range.max_vfreq); vmax = adjusted_mode->crtc_clock * 1000 / - (adjusted_mode->crtc_htotal * info->monitor_range.min_vfreq); + (adjusted_mode->crtc_htotal * info->vrr_range.min_vfreq); vmin = max_t(int, vmin, adjusted_mode->crtc_vtotal); vmax = max_t(int, vmax, adjusted_mode->crtc_vtotal); diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 56aee949c6fa..7ae23d691cd6 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -636,9 +636,9 @@ struct drm_display_info { bool non_desktop; /** - * @monitor_range: Frequency range supported by monitor range descriptor + * @vrr_range: Refresh rate range supported by monitor for VRR */ - struct drm_monitor_range_info monitor_range; + struct drm_monitor_range_info vrr_range; /** * @luminance_range: Luminance range supported by panel

[v2,9/9] drm/edid: s/monitor_rage/vrr_range/

Commit Message

Patch