diff mbox series

[v3,1/3] drm/i915/vbt: Fix backlight parsing for VBT 234+

Message ID 20201008211932.24989-1-jose.souza@intel.com (mailing list archive)
State New, archived
Headers show
Series [v3,1/3] drm/i915/vbt: Fix backlight parsing for VBT 234+ | expand

Commit Message

Souza, Jose Oct. 8, 2020, 9:19 p.m. UTC 
Child min_brightness is obsolete from VBT 234+, instead the new
min_brightness field in the main structure should be used.

This new field is 16 bits wide, so backlight_precision_bits is needed
to check if value needs to be scaled down but it is only available in
VBT 236+ so working around it by using the also new backlight_level
in the main struct.

v2:
- missed that backlight_data->level is also obsolete

v3:
- s/backlight/brightness to better match specification
- using u16 to specify brightness level instead of a u32 : 16

BSpec: 20149
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/display/intel_bios.c     | 30 +++++++++++++++++--
 drivers/gpu/drm/i915/display/intel_vbt_defs.h | 12 ++++++--
 2 files changed, 38 insertions(+), 4 deletions(-)

Comments

Souza, Jose Oct. 9, 2020, 9:15 p.m. UTC | #1 
On Fri, 2020-10-09 at 00:42 +0000, Patchwork wrote:
> Patch Details
> Series: series starting with [v3,1/3] drm/i915/vbt: Fix backlight parsing for VBT 234+ URL: https://patchwork.freedesktop.org/series/82482/ State:
> success Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18661/index.html 
> CI Bug Log - changes from CI_DRM_9113_full -> Patchwork_18661_fullSummarySUCCESS
> No regressions found.

Pushed to dinq, thanks for the review.

> Known issuesHere are the changes found in Patchwork_18661_full that come from known issues:
> IGT changesIssues hit * igt@gen9_exec_parse@allowed-single:shard-skl: PASS -> DMESG-WARN (i915#1436 / i915#716)
>  * igt@i915_module_load@reload:shard-hsw: PASS -> DMESG-WARN (i915#1982)
>  * igt@i915_pm_dc@dc6-psr:shard-skl: PASS -> FAIL (i915#454)
>  * igt@i915_suspend@fence-restore-untiled:shard-skl: PASS -> INCOMPLETE (i915#198)
>  * igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic:shard-glk: PASS -> FAIL (i915#72)
>  * igt@kms_flip@flip-vs-blocking-wf-vblank@a-dp1:shard-kbl: PASS -> DMESG-WARN (i915#1982) +1 similar issue
>  * igt@kms_flip@flip-vs-blocking-wf-vblank@a-edp1:shard-skl: PASS -> DMESG-WARN (i915#1982) +5 similar issues
>  * igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1:shard-glk: PASS -> FAIL (i915#79)
>  * igt@kms_flip@flip-vs-expired-vblank@a-edp1:shard-skl: PASS -> FAIL (i915#79) +1 similar issue
>  * igt@kms_flip@flip-vs-suspend@a-dp1:shard-kbl: PASS -> INCOMPLETE (i915#155)
>  * igt@kms_frontbuffer_tracking@fbc-stridechange:shard-tglb: PASS -> DMESG-WARN (i915#1982) +2 similar issuesshard-glk: PASS -> DMESG-WARN
> (i915#1982) +1 similar issue
>  * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:shard-skl: PASS -> FAIL (fdo#108145 / i915#265)
>  * igt@kms_psr@psr2_sprite_mmap_cpu:shard-iclb: PASS -> SKIP (fdo#109441) +1 similar issue
>  * igt@kms_setmode@basic:shard-glk: PASS -> FAIL (i915#31)
>  * igt@kms_vblank@pipe-a-ts-continuation-suspend:shard-kbl: PASS -> DMESG-WARN (i915#180) +5 similar issues
> Possible fixes * {igt@gem_exec_capture@pi@rcs0}:shard-skl: INCOMPLETE -> PASSshard-glk: INCOMPLETE -> PASS
>  * igt@gem_mmap_gtt@basic-small-bo:shard-hsw: INCOMPLETE -> PASS
>  * igt@i915_pm_rpm@system-suspend:shard-skl: INCOMPLETE (i915#151) -> PASS
>  * igt@i915_selftest@live@gt_heartbeat:shard-skl: DMESG-FAIL (i915#541) -> PASS
>  * {igt@kms_async_flips@alternate-sync-async-flip}:shard-kbl: FAIL (i915#2521) -> PASS
>  * {igt@kms_async_flips@async-flip-with-page-flip-events}:shard-glk: FAIL (i915#2521) -> PASS
>  * igt@kms_cursor_legacy@cursor-vs-flip-varying-size:shard-hsw: FAIL (i915#2370) -> PASS
>  * igt@kms_flip@2x-dpms-vs-vblank-race@ab-vga1-hdmi-a1:shard-hsw: DMESG-WARN (i915#1982) -> PASS
>  * igt@kms_flip_tiling@flip-changes-tiling:shard-skl: FAIL (i915#699) -> PASS
>  * igt@kms_frontbuffer_tracking@fbc-farfromfence:shard-glk: FAIL (i915#49) -> PASS
>  * igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-pwrite:shard-tglb: DMESG-WARN (i915#1982) -> PASS
>  * igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-render:shard-skl: FAIL (i915#49) -> PASS
>  * igt@kms_plane@plane-position-covered-pipe-b-planes:shard-skl: DMESG-WARN (i915#1982) -> PASS +3 similar issues
>  * igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:shard-skl: FAIL (fdo#108145 / i915#265) -> PASS
>  * igt@prime_vgem@sync@rcs0:shard-iclb: INCOMPLETE (i915#409) -> PASS
> Warnings * igt@i915_pm_dc@dc5-psr:shard-tglb: DMESG-WARN (i915#2411) -> FAIL (i915#1899)
>  * igt@kms_cursor_legacy@flip-vs-cursor-atomic:shard-skl: DMESG-WARN (i915#1982) -> DMESG-FAIL (i915#1982)
>  * igt@runner@aborted:shard-skl: FAIL (i915#2439) -> FAIL (i915#1436)
> {name}: This element is suppressed. This means it is ignored when computing
>  the status of the difference (SUCCESS, WARNING, or FAILURE).
> Participating hosts (11 -> 11)No changes in participating hosts
> Build changes * Linux: CI_DRM_9113 -> Patchwork_18661
> CI-20190529: 20190529
>  CI_DRM_9113: 412ff15f2b9a97bd0ab32f562ecb7efc84837881 @ git://anongit.freedesktop.org/gfx-ci/linux
>  IGT_5805: 9ce50ffed89a46fa1bc98ee2cfe2271c49801079 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>  Patchwork_18661: ecd320a7fca8607154c837e94ff36024de56c60f @ git://anongit.freedesktop.org/gfx-ci/linux
>  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 5804eb9faf24..b4d99d0bf696 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -425,6 +425,7 @@  parse_lfp_backlight(struct drm_i915_private *dev_priv,
 	const struct bdb_lfp_backlight_data *backlight_data;
 	const struct lfp_backlight_data_entry *entry;
 	int panel_type = dev_priv->vbt.panel_type;
+	u16 level;
 
 	backlight_data = find_section(bdb, BDB_LVDS_BACKLIGHT);
 	if (!backlight_data)
@@ -459,14 +460,39 @@  parse_lfp_backlight(struct drm_i915_private *dev_priv,
 
 	dev_priv->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz;
 	dev_priv->vbt.backlight.active_low_pwm = entry->active_low_pwm;
-	dev_priv->vbt.backlight.min_brightness = entry->min_brightness;
+
+	if (bdb->version >= 234) {
+		u16 min_level;
+		bool scale;
+
+		level = backlight_data->brightness_level[panel_type].level;
+		min_level = backlight_data->brightness_min_level[panel_type].level;
+
+		if (bdb->version >= 236)
+			scale = backlight_data->brightness_precision_bits[panel_type] == 16;
+		else
+			scale = level > 255;
+
+		if (scale)
+			min_level = min_level / 255;
+
+		if (min_level > 255) {
+			drm_warn(&dev_priv->drm, "Brightness min level > 255\n");
+			level = 255;
+		}
+		dev_priv->vbt.backlight.min_brightness = min_level;
+	} else {
+		level = backlight_data->level[panel_type];
+		dev_priv->vbt.backlight.min_brightness = entry->min_brightness;
+	}
+
 	drm_dbg_kms(&dev_priv->drm,
 		    "VBT backlight PWM modulation frequency %u Hz, "
 		    "active %s, min brightness %u, level %u, controller %u\n",
 		    dev_priv->vbt.backlight.pwm_freq_hz,
 		    dev_priv->vbt.backlight.active_low_pwm ? "low" : "high",
 		    dev_priv->vbt.backlight.min_brightness,
-		    backlight_data->level[panel_type],
+		    level,
 		    dev_priv->vbt.backlight.controller);
 }
 
diff --git a/drivers/gpu/drm/i915/display/intel_vbt_defs.h b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
index 54bcc6a6947c..5df23e1848a6 100644
--- a/drivers/gpu/drm/i915/display/intel_vbt_defs.h
+++ b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
@@ -782,7 +782,7 @@  struct lfp_backlight_data_entry {
 	u8 active_low_pwm:1;
 	u8 obsolete1:5;
 	u16 pwm_freq_hz;
-	u8 min_brightness;
+	u8 min_brightness; /* Obsolete from 234+ */
 	u8 obsolete2;
 	u8 obsolete3;
 } __packed;
@@ -792,11 +792,19 @@  struct lfp_backlight_control_method {
 	u8 controller:4;
 } __packed;
 
+struct lfp_brightness_level {
+	u16 level;
+	u16 reserved;
+} __packed;
+
 struct bdb_lfp_backlight_data {
 	u8 entry_size;
 	struct lfp_backlight_data_entry data[16];
-	u8 level[16];
+	u8 level[16]; /* Obsolete from 234+ */
 	struct lfp_backlight_control_method backlight_control[16];
+	struct lfp_brightness_level brightness_level[16];		/* 234+ */
+	struct lfp_brightness_level brightness_min_level[16];	/* 234+ */
+	u8 brightness_precision_bits[16];						/* 236+ */
 } __packed;
 
 /*