From: "Jouni Högander" <jouni.hogander@intel.com> To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Cc: "Jouni Högander" <jouni.hogander@intel.com>, "Jani Nikula" <jani.nikula@intel.com>, "Manasi Navare" <manasi.d.navare@intel.com>, "Mika Kahola" <mika.kahola@intel.com> Subject: [PATCH v3 3/3] drm/i915: Use luminance range calculated during edid parsing Date: Tue, 19 Jul 2022 12:57:00 +0300 [thread overview] Message-ID: <20220719095700.14923-4-jouni.hogander@intel.com> (raw) In-Reply-To: <20220719095700.14923-1-jouni.hogander@intel.com> Instead of using fixed 0 - 512 range use luminance range calculated as a part of edid parsing. As a backup fall back to static 0 - 512. v3: Clean-ups suggested by Jani Nikula v2: Use values calculated during edid parsing Cc: Lyude Paul <lyude@redhat.com> Cc: Mika Kahola <mika.kahola@intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Manasi Navare <manasi.d.navare@intel.com> Signed-off-by: Jouni Högander <jouni.hogander@intel.com> --- .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c index c92d5bb2326a..83af95bce98d 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c @@ -278,6 +278,8 @@ intel_dp_aux_hdr_setup_backlight(struct intel_connector *connector, enum pipe pi { struct drm_i915_private *i915 = to_i915(connector->base.dev); struct intel_panel *panel = &connector->panel; + struct drm_luminance_range_info *luminance_range = + &connector->base.display_info.luminance_range; int ret; if (panel->backlight.edp.intel.sdr_uses_aux) { @@ -293,8 +295,17 @@ intel_dp_aux_hdr_setup_backlight(struct intel_connector *connector, enum pipe pi } } - panel->backlight.max = 512; - panel->backlight.min = 0; + if (luminance_range->max_luminance) { + panel->backlight.max = luminance_range->max_luminance; + panel->backlight.min = luminance_range->min_luminance; + } else { + panel->backlight.max = 512; + panel->backlight.min = 0; + } + + drm_dbg_kms(&i915->drm, "Using backlight range %d..%d\n", panel->backlight.min, + panel->backlight.max); + panel->backlight.level = intel_dp_aux_hdr_get_backlight(connector, pipe); panel->backlight.enabled = panel->backlight.level != 0; -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: "Jouni Högander" <jouni.hogander@intel.com> To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Cc: Jani Nikula <jani.nikula@intel.com> Subject: [Intel-gfx] [PATCH v3 3/3] drm/i915: Use luminance range calculated during edid parsing Date: Tue, 19 Jul 2022 12:57:00 +0300 [thread overview] Message-ID: <20220719095700.14923-4-jouni.hogander@intel.com> (raw) In-Reply-To: <20220719095700.14923-1-jouni.hogander@intel.com> Instead of using fixed 0 - 512 range use luminance range calculated as a part of edid parsing. As a backup fall back to static 0 - 512. v3: Clean-ups suggested by Jani Nikula v2: Use values calculated during edid parsing Cc: Lyude Paul <lyude@redhat.com> Cc: Mika Kahola <mika.kahola@intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Manasi Navare <manasi.d.navare@intel.com> Signed-off-by: Jouni Högander <jouni.hogander@intel.com> --- .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c index c92d5bb2326a..83af95bce98d 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c @@ -278,6 +278,8 @@ intel_dp_aux_hdr_setup_backlight(struct intel_connector *connector, enum pipe pi { struct drm_i915_private *i915 = to_i915(connector->base.dev); struct intel_panel *panel = &connector->panel; + struct drm_luminance_range_info *luminance_range = + &connector->base.display_info.luminance_range; int ret; if (panel->backlight.edp.intel.sdr_uses_aux) { @@ -293,8 +295,17 @@ intel_dp_aux_hdr_setup_backlight(struct intel_connector *connector, enum pipe pi } } - panel->backlight.max = 512; - panel->backlight.min = 0; + if (luminance_range->max_luminance) { + panel->backlight.max = luminance_range->max_luminance; + panel->backlight.min = luminance_range->min_luminance; + } else { + panel->backlight.max = 512; + panel->backlight.min = 0; + } + + drm_dbg_kms(&i915->drm, "Using backlight range %d..%d\n", panel->backlight.min, + panel->backlight.max); + panel->backlight.level = intel_dp_aux_hdr_get_backlight(connector, pipe); panel->backlight.enabled = panel->backlight.level != 0; -- 2.25.1
next prev parent reply other threads:[~2022-07-19 9:57 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-19 9:56 [PATCH v3 0/3] HDR aux backlight range calculation Jouni Högander 2022-07-19 9:56 ` Jouni Högander 2022-07-19 9:56 ` [Intel-gfx] " Jouni Högander 2022-07-19 9:56 ` [PATCH v3 1/3] drm: New function to get luminance range based on static hdr metadata Jouni Högander 2022-07-19 9:56 ` Jouni Högander 2022-07-19 9:56 ` [Intel-gfx] " Jouni Högander 2022-07-19 9:56 ` [PATCH v3 2/3] drm/amdgpu_dm: Rely on split out luminance calculation function Jouni Högander 2022-07-19 9:56 ` Jouni Högander 2022-07-19 9:56 ` [Intel-gfx] " Jouni Högander 2022-08-04 9:54 ` Jani Nikula 2022-08-04 9:54 ` Jani Nikula 2022-08-04 9:54 ` Jani Nikula 2022-08-11 17:43 ` [Intel-gfx] " Deucher, Alexander 2022-08-11 17:43 ` Deucher, Alexander 2022-08-11 17:43 ` Deucher, Alexander 2022-08-12 7:04 ` Jani Nikula 2022-08-12 7:04 ` Jani Nikula 2022-08-12 7:04 ` [Intel-gfx] " Jani Nikula 2022-07-19 9:57 ` Jouni Högander [this message] 2022-07-19 9:57 ` [Intel-gfx] [PATCH v3 3/3] drm/i915: Use luminance range calculated during edid parsing Jouni Högander 2022-07-19 14:47 ` [Intel-gfx] ✓ Fi.CI.BAT: success for HDR aux backlight range calculation Patchwork 2022-07-19 23:07 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220719095700.14923-4-jouni.hogander@intel.com \ --to=jouni.hogander@intel.com \ --cc=amd-gfx@lists.freedesktop.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@intel.com \ --cc=manasi.d.navare@intel.com \ --cc=mika.kahola@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.