From: Lyude Paul <lyude@redhat.com>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
nouveau@lists.freedesktop.org
Cc: "Jani Nikula" <jani.nikula@intel.com>,
"Dave Airlie" <airlied@gmail.com>,
greg.depoire@gmail.com, "Rajeev Nandan" <rajeevny@codeaurora.org>,
"Jani Nikula" <jani.nikula@linux.intel.com>,
"Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"David Airlie" <airlied@linux.ie>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Sean Paul" <seanpaul@chromium.org>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
linux-kernel@vger.kernel.org (open list)
Subject: [RFC v5 6/9] drm/i915/dpcd_bl: Return early in vesa_calc_max_backlight if we can't read PWMGEN_BIT_COUNT
Date: Fri, 7 May 2021 19:39:44 -0400 [thread overview]
Message-ID: <20210507233947.751846-7-lyude@redhat.com> (raw)
In-Reply-To: <20210507233947.751846-1-lyude@redhat.com>
If we can't read DP_EDP_PWMGEN_BIT_COUNT in
intel_dp_aux_vesa_calc_max_backlight() but do have a valid PWM frequency
defined in the VBT, we'll keep going in the function until we inevitably
fail on reading DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN. There's not much point in
doing this, so just return early.
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 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 781c7cd98d75..bf8e4ed56847 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
@@ -449,11 +449,14 @@ static u32 intel_dp_aux_vesa_calc_max_backlight(struct intel_connector *connecto
int freq, fxp, fxp_min, fxp_max, fxp_actual, f = 1;
u8 pn, pn_min, pn_max;
- if (drm_dp_dpcd_readb(&intel_dp->aux, DP_EDP_PWMGEN_BIT_COUNT, &pn) == 1) {
- pn &= DP_EDP_PWMGEN_BIT_COUNT_MASK;
- max_backlight = (1 << pn) - 1;
+ if (drm_dp_dpcd_readb(&intel_dp->aux, DP_EDP_PWMGEN_BIT_COUNT, &pn) != 1) {
+ drm_dbg_kms(&i915->drm, "Failed to read pwmgen bit count cap\n");
+ return 0;
}
+ pn &= DP_EDP_PWMGEN_BIT_COUNT_MASK;
+ max_backlight = (1 << pn) - 1;
+
/* Find desired value of (F x P)
* Note that, if F x P is out of supported range, the maximum value or
* minimum value will applied automatically. So no need to check that.
--
2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Lyude Paul <lyude@redhat.com>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
nouveau@lists.freedesktop.org
Cc: "Rajeev Nandan" <rajeevny@codeaurora.org>,
"Jani Nikula" <jani.nikula@intel.com>,
"David Airlie" <airlied@linux.ie>,
"Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
"open list" <linux-kernel@vger.kernel.org>,
"Jani Nikula" <jani.nikula@linux.intel.com>,
greg.depoire@gmail.com, "Sean Paul" <seanpaul@chromium.org>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>
Subject: [Nouveau] [RFC v5 6/9] drm/i915/dpcd_bl: Return early in vesa_calc_max_backlight if we can't read PWMGEN_BIT_COUNT
Date: Fri, 7 May 2021 19:39:44 -0400 [thread overview]
Message-ID: <20210507233947.751846-7-lyude@redhat.com> (raw)
In-Reply-To: <20210507233947.751846-1-lyude@redhat.com>
If we can't read DP_EDP_PWMGEN_BIT_COUNT in
intel_dp_aux_vesa_calc_max_backlight() but do have a valid PWM frequency
defined in the VBT, we'll keep going in the function until we inevitably
fail on reading DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN. There's not much point in
doing this, so just return early.
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 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 781c7cd98d75..bf8e4ed56847 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
@@ -449,11 +449,14 @@ static u32 intel_dp_aux_vesa_calc_max_backlight(struct intel_connector *connecto
int freq, fxp, fxp_min, fxp_max, fxp_actual, f = 1;
u8 pn, pn_min, pn_max;
- if (drm_dp_dpcd_readb(&intel_dp->aux, DP_EDP_PWMGEN_BIT_COUNT, &pn) == 1) {
- pn &= DP_EDP_PWMGEN_BIT_COUNT_MASK;
- max_backlight = (1 << pn) - 1;
+ if (drm_dp_dpcd_readb(&intel_dp->aux, DP_EDP_PWMGEN_BIT_COUNT, &pn) != 1) {
+ drm_dbg_kms(&i915->drm, "Failed to read pwmgen bit count cap\n");
+ return 0;
}
+ pn &= DP_EDP_PWMGEN_BIT_COUNT_MASK;
+ max_backlight = (1 << pn) - 1;
+
/* Find desired value of (F x P)
* Note that, if F x P is out of supported range, the maximum value or
* minimum value will applied automatically. So no need to check that.
--
2.30.2
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau
WARNING: multiple messages have this Message-ID (diff)
From: Lyude Paul <lyude@redhat.com>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
nouveau@lists.freedesktop.org
Cc: Rajeev Nandan <rajeevny@codeaurora.org>,
Jani Nikula <jani.nikula@intel.com>,
David Airlie <airlied@linux.ie>,
open list <linux-kernel@vger.kernel.org>,
greg.depoire@gmail.com, Sean Paul <seanpaul@chromium.org>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [RFC v5 6/9] drm/i915/dpcd_bl: Return early in vesa_calc_max_backlight if we can't read PWMGEN_BIT_COUNT
Date: Fri, 7 May 2021 19:39:44 -0400 [thread overview]
Message-ID: <20210507233947.751846-7-lyude@redhat.com> (raw)
In-Reply-To: <20210507233947.751846-1-lyude@redhat.com>
If we can't read DP_EDP_PWMGEN_BIT_COUNT in
intel_dp_aux_vesa_calc_max_backlight() but do have a valid PWM frequency
defined in the VBT, we'll keep going in the function until we inevitably
fail on reading DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN. There's not much point in
doing this, so just return early.
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 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 781c7cd98d75..bf8e4ed56847 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
@@ -449,11 +449,14 @@ static u32 intel_dp_aux_vesa_calc_max_backlight(struct intel_connector *connecto
int freq, fxp, fxp_min, fxp_max, fxp_actual, f = 1;
u8 pn, pn_min, pn_max;
- if (drm_dp_dpcd_readb(&intel_dp->aux, DP_EDP_PWMGEN_BIT_COUNT, &pn) == 1) {
- pn &= DP_EDP_PWMGEN_BIT_COUNT_MASK;
- max_backlight = (1 << pn) - 1;
+ if (drm_dp_dpcd_readb(&intel_dp->aux, DP_EDP_PWMGEN_BIT_COUNT, &pn) != 1) {
+ drm_dbg_kms(&i915->drm, "Failed to read pwmgen bit count cap\n");
+ return 0;
}
+ pn &= DP_EDP_PWMGEN_BIT_COUNT_MASK;
+ max_backlight = (1 << pn) - 1;
+
/* Find desired value of (F x P)
* Note that, if F x P is out of supported range, the maximum value or
* minimum value will applied automatically. So no need to check that.
--
2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Lyude Paul <lyude@redhat.com>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
nouveau@lists.freedesktop.org
Cc: Rajeev Nandan <rajeevny@codeaurora.org>,
Jani Nikula <jani.nikula@intel.com>,
David Airlie <airlied@linux.ie>,
open list <linux-kernel@vger.kernel.org>,
greg.depoire@gmail.com, Sean Paul <seanpaul@chromium.org>
Subject: [Intel-gfx] [RFC v5 6/9] drm/i915/dpcd_bl: Return early in vesa_calc_max_backlight if we can't read PWMGEN_BIT_COUNT
Date: Fri, 7 May 2021 19:39:44 -0400 [thread overview]
Message-ID: <20210507233947.751846-7-lyude@redhat.com> (raw)
In-Reply-To: <20210507233947.751846-1-lyude@redhat.com>
If we can't read DP_EDP_PWMGEN_BIT_COUNT in
intel_dp_aux_vesa_calc_max_backlight() but do have a valid PWM frequency
defined in the VBT, we'll keep going in the function until we inevitably
fail on reading DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN. There's not much point in
doing this, so just return early.
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 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 781c7cd98d75..bf8e4ed56847 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
@@ -449,11 +449,14 @@ static u32 intel_dp_aux_vesa_calc_max_backlight(struct intel_connector *connecto
int freq, fxp, fxp_min, fxp_max, fxp_actual, f = 1;
u8 pn, pn_min, pn_max;
- if (drm_dp_dpcd_readb(&intel_dp->aux, DP_EDP_PWMGEN_BIT_COUNT, &pn) == 1) {
- pn &= DP_EDP_PWMGEN_BIT_COUNT_MASK;
- max_backlight = (1 << pn) - 1;
+ if (drm_dp_dpcd_readb(&intel_dp->aux, DP_EDP_PWMGEN_BIT_COUNT, &pn) != 1) {
+ drm_dbg_kms(&i915->drm, "Failed to read pwmgen bit count cap\n");
+ return 0;
}
+ pn &= DP_EDP_PWMGEN_BIT_COUNT_MASK;
+ max_backlight = (1 << pn) - 1;
+
/* Find desired value of (F x P)
* Note that, if F x P is out of supported range, the maximum value or
* minimum value will applied automatically. So no need to check that.
--
2.30.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-05-07 23:40 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-07 23:39 [Nouveau] [RFC v5 0/9] drm: Extract DPCD backlight helpers from i915, add support in nouveau Lyude Paul
2021-05-07 23:39 ` [Intel-gfx] " Lyude Paul
2021-05-07 23:39 ` Lyude Paul
2021-05-07 23:39 ` [RFC v5 1/9] drm/i915/dpcd_bl: Remove redundant AUX backlight frequency calculations Lyude Paul
2021-05-07 23:39 ` [Intel-gfx] " Lyude Paul
2021-05-07 23:39 ` Lyude Paul
2021-05-07 23:39 ` [Nouveau] " Lyude Paul
2021-05-07 23:39 ` [RFC v5 2/9] drm/i915/dpcd_bl: Handle drm_dpcd_read/write() return values correctly Lyude Paul
2021-05-07 23:39 ` [Intel-gfx] " Lyude Paul
2021-05-07 23:39 ` Lyude Paul
2021-05-07 23:39 ` [Nouveau] " Lyude Paul
2021-05-07 23:39 ` [RFC v5 3/9] drm/i915/dpcd_bl: Cleanup intel_dp_aux_vesa_enable_backlight() a bit Lyude Paul
2021-05-07 23:39 ` [Intel-gfx] " Lyude Paul
2021-05-07 23:39 ` Lyude Paul
2021-05-07 23:39 ` [Nouveau] " Lyude Paul
2021-05-07 23:39 ` [RFC v5 4/9] drm/i915/dpcd_bl: Cache some backlight capabilities in intel_panel.backlight Lyude Paul
2021-05-07 23:39 ` [Intel-gfx] " Lyude Paul
2021-05-07 23:39 ` Lyude Paul
2021-05-07 23:39 ` [Nouveau] " Lyude Paul
2021-05-07 23:39 ` [RFC v5 5/9] drm/i915/dpcd_bl: Move VESA backlight enabling code closer together Lyude Paul
2021-05-07 23:39 ` [Intel-gfx] " Lyude Paul
2021-05-07 23:39 ` Lyude Paul
2021-05-07 23:39 ` [Nouveau] " Lyude Paul
2021-05-07 23:39 ` Lyude Paul [this message]
2021-05-07 23:39 ` [Intel-gfx] [RFC v5 6/9] drm/i915/dpcd_bl: Return early in vesa_calc_max_backlight if we can't read PWMGEN_BIT_COUNT Lyude Paul
2021-05-07 23:39 ` Lyude Paul
2021-05-07 23:39 ` [Nouveau] " Lyude Paul
2021-05-07 23:39 ` [RFC v5 7/9] drm/i915/dpcd_bl: Print return codes for VESA backlight failures Lyude Paul
2021-05-07 23:39 ` [Intel-gfx] " Lyude Paul
2021-05-07 23:39 ` Lyude Paul
2021-05-07 23:39 ` [Nouveau] " Lyude Paul
2021-05-07 23:39 ` [RFC v5 8/9] drm/dp: Extract i915's eDP backlight code into DRM helpers Lyude Paul
2021-05-07 23:39 ` [Intel-gfx] " Lyude Paul
2021-05-07 23:39 ` Lyude Paul
2021-05-07 23:39 ` [Nouveau] " Lyude Paul
2021-05-07 23:39 ` [RFC v5 9/9] drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau Lyude Paul
2021-05-07 23:39 ` [Intel-gfx] " Lyude Paul
2021-05-07 23:39 ` Lyude Paul
2021-05-07 23:39 ` [Nouveau] " Lyude Paul
2021-05-08 0:15 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm: Extract DPCD backlight helpers from i915, add support in nouveau (rev7) Patchwork
2021-05-08 0:17 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-05-08 0:44 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-05-08 2:24 ` [Intel-gfx] ✓ Fi.CI.IGT: " 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=20210507233947.751846-7-lyude@redhat.com \
--to=lyude@redhat.com \
--cc=airlied@gmail.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=greg.depoire@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=rajeevny@codeaurora.org \
--cc=rodrigo.vivi@intel.com \
--cc=seanpaul@chromium.org \
--cc=ville.syrjala@linux.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: link
Be 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.