* [PATCH 0/3] DPCD Backlight Control
@ 2016-03-07 12:58 Yetunde Adebisi
2016-03-07 12:58 ` [PATCH 1/3] drm/dp: Add definition for Display Control DPCD Registers capability size Yetunde Adebisi
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Yetunde Adebisi @ 2016-03-07 12:58 UTC (permalink / raw)
To: intel-gfx; +Cc: Yetunde Adebisi
These patches add support for Backlight Control using DPCD registers on eDP
displays.
- Patch 1 adds macro for DPCD registers capability size to drm_dp_helper.h
A copy of this patch has also been sent to dri-devel list.
- Patch 2 Implements functionaly for DPCD Backlight Control
- Patch 3 Implements functionaly for DPCD Backlight Control for special
DP-LVDS add-on cards.
Yetunde Adebisi (3):
drm/dp: Add definition for Display Control DPCD Registers capability
size
drm/i915: Add Backlight Control using DPCD for eDP connectors (v7)
drm/i915: Add backlight Control using DPCD registers for DP connectors
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/i915_params.c | 5 +
drivers/gpu/drm/i915/i915_params.h | 1 +
drivers/gpu/drm/i915/intel_dp.c | 42 +++++-
drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 177 ++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_drv.h | 8 ++
drivers/gpu/drm/i915/intel_panel.c | 38 ++++--
include/drm/drm_dp_helper.h | 1 +
8 files changed, 257 insertions(+), 16 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.c
--
1.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/3] drm/dp: Add definition for Display Control DPCD Registers capability size
2016-03-07 12:58 [PATCH 0/3] DPCD Backlight Control Yetunde Adebisi
@ 2016-03-07 12:58 ` Yetunde Adebisi
2016-03-07 12:58 ` [PATCH 2/3] drm/i915: Add Backlight Control using DPCD for eDP connectors (v7) Yetunde Adebisi
` (2 subsequent siblings)
3 siblings, 0 replies; 11+ messages in thread
From: Yetunde Adebisi @ 2016-03-07 12:58 UTC (permalink / raw)
To: intel-gfx; +Cc: Yetunde Adebisi, Jani Nikula
This is used when reading Display Control capability Registers on the sink
device.
cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Yetunde Adebisi <yetundex.adebisi@intel.com>
---
include/drm/drm_dp_helper.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index 1252108..92d9a52 100644
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -621,6 +621,7 @@ u8 drm_dp_get_adjust_request_pre_emphasis(const u8 link_status[DP_LINK_STATUS_SI
#define DP_BRANCH_OUI_HEADER_SIZE 0xc
#define DP_RECEIVER_CAP_SIZE 0xf
#define EDP_PSR_RECEIVER_CAP_SIZE 2
+#define EDP_DISPLAY_CTL_CAP_SIZE 3
void drm_dp_link_train_clock_recovery_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]);
void drm_dp_link_train_channel_eq_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]);
--
1.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/3] drm/i915: Add Backlight Control using DPCD for eDP connectors (v7)
2016-03-07 12:58 [PATCH 0/3] DPCD Backlight Control Yetunde Adebisi
2016-03-07 12:58 ` [PATCH 1/3] drm/dp: Add definition for Display Control DPCD Registers capability size Yetunde Adebisi
@ 2016-03-07 12:58 ` Yetunde Adebisi
2016-03-07 12:58 ` [PATCH 3/3] drm/i915: Add backlight Control using DPCD registers for DP connectors Yetunde Adebisi
2016-03-07 17:55 ` ✗ Fi.CI.BAT: failure for DPCD Backlight Control (rev4) Patchwork
3 siblings, 0 replies; 11+ messages in thread
From: Yetunde Adebisi @ 2016-03-07 12:58 UTC (permalink / raw)
To: intel-gfx; +Cc: Yetunde Adebisi, Jani Nikula
This patch adds support for eDP backlight control using DPCD registers to
backlight hooks in intel_panel.
It checks for backlight control over AUX channel capability and sets up
function pointers to get and set the backlight brightness level if
supported.
v2: Moved backlight functions from intel_dp.c into a new file
intel_dp_aux_backlight.c. Also moved reading of eDP display control
registers to intel_dp_get_dpcd
v3: Correct some formatting mistakes
v4: Updated to use AUX backlight control if PWM control is not possible
(Jani)
v5: Moved call to initialize backlight registers to dp_aux_setup_backlight
v6: Check DP_EDP_BACKLIGHT_PIN_ENABLE_CAP is disabled before setting up AUX
backlight control. To fix BLM_PWM_ENABLE igt test warnings on bdw_ultra
v7: Add enable_dpcd_backlight module parameter.
This patch depends on http://patchwork.freedesktop.org/patch/64253/
Cc: Bob Paauwe <bob.j.paauwe@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Yetunde Adebisi <yetundex.adebisi@intel.com>
---
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/i915_params.c | 5 +
drivers/gpu/drm/i915/i915_params.h | 1 +
drivers/gpu/drm/i915/intel_dp.c | 17 ++-
drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 170 ++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_drv.h | 6 +
drivers/gpu/drm/i915/intel_panel.c | 5 +
7 files changed, 199 insertions(+), 6 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.c
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 0851de07..41250cc 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -77,6 +77,7 @@ i915-y += dvo_ch7017.o \
dvo_tfp410.o \
intel_crt.o \
intel_ddi.o \
+ intel_dp_aux_backlight.o \
intel_dp_link_training.o \
intel_dp_mst.o \
intel_dp.o \
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 278c9c4..b10317e 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -56,6 +56,7 @@ struct i915_params i915 __read_mostly = {
.edp_vswing = 0,
.enable_guc_submission = false,
.guc_log_level = -1,
+ .enable_dpcd_backlight = false,
};
module_param_named(modeset, i915.modeset, int, 0400);
@@ -201,3 +202,7 @@ MODULE_PARM_DESC(enable_guc_submission, "Enable GuC submission (default:false)")
module_param_named(guc_log_level, i915.guc_log_level, int, 0400);
MODULE_PARM_DESC(guc_log_level,
"GuC firmware logging level (-1:disabled (default), 0-3:enabled)");
+
+module_param_named(enable_dpcd_backlight, i915.enable_dpcd_backlight, bool, 0600);
+MODULE_PARM_DESC(enable_dpcd_backlight,
+ "Enable support for DPCD backlight control (default:false)");
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index bd5026b..a40b8d9 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -59,6 +59,7 @@ struct i915_params {
bool enable_guc_submission;
bool verbose_state_checks;
bool nuclear_pageflip;
+ bool enable_dpcd_backlight;
};
extern struct i915_params i915 __read_mostly;
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 94b4a5b..9ccc581 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -3180,7 +3180,7 @@ static void chv_dp_post_pll_disable(struct intel_encoder *encoder)
* Sinks are *supposed* to come up within 1ms from an off state, but we're also
* supposed to retry 3 times per the spec.
*/
-static ssize_t
+ssize_t
intel_dp_dpcd_read_wake(struct drm_dp_aux *aux, unsigned int offset,
void *buffer, size_t size)
{
@@ -3847,7 +3847,6 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
struct drm_device *dev = dig_port->base.base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
- uint8_t rev;
if (intel_dp_dpcd_read_wake(&intel_dp->aux, 0x000, intel_dp->dpcd,
sizeof(intel_dp->dpcd)) < 0)
@@ -3883,6 +3882,15 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)
DRM_DEBUG_KMS("PSR2 %s on sink",
dev_priv->psr.psr2_support ? "supported" : "not supported");
}
+
+ /* Read the eDP Display control capabilities registers */
+ memset(intel_dp->edp_dpcd, 0, sizeof(intel_dp->edp_dpcd));
+ if ((intel_dp->dpcd[DP_EDP_CONFIGURATION_CAP] & DP_DPCD_DISPLAY_CONTROL_CAPABLE) &&
+ (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_EDP_DPCD_REV,
+ intel_dp->edp_dpcd, sizeof(intel_dp->edp_dpcd)) ==
+ sizeof(intel_dp->edp_dpcd)))
+ DRM_DEBUG_KMS("EDP DPCD : %*ph\n", (int) sizeof(intel_dp->edp_dpcd),
+ intel_dp->edp_dpcd);
}
DRM_DEBUG_KMS("Display Port TPS3 support: source %s, sink %s\n",
@@ -3890,10 +3898,7 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)
yesno(drm_dp_tps3_supported(intel_dp->dpcd)));
/* Intermediate frequency support */
- if (is_edp(intel_dp) &&
- (intel_dp->dpcd[DP_EDP_CONFIGURATION_CAP] & DP_DPCD_DISPLAY_CONTROL_CAPABLE) &&
- (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_EDP_DPCD_REV, &rev, 1) == 1) &&
- (rev >= 0x03)) { /* eDp v1.4 or higher */
+ if (is_edp(intel_dp) && (intel_dp->edp_dpcd[0] >= 0x03)) { /* eDp v1.4 or higher */
__le16 sink_rates[DP_MAX_SUPPORTED_RATES];
int i;
diff --git a/drivers/gpu/drm/i915/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/intel_dp_aux_backlight.c
new file mode 100644
index 0000000..a5361d6
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_dp_aux_backlight.c
@@ -0,0 +1,170 @@
+/*
+ * Copyright © 2015 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#include "intel_drv.h"
+
+static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)
+{
+ uint8_t reg_val = 0;
+
+ if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_EDP_DISPLAY_CONTROL_REGISTER,
+ ®_val, sizeof(reg_val)) < 0) {
+ DRM_DEBUG_KMS("Failed to read DPCD register 0x%x\n",
+ DP_EDP_DISPLAY_CONTROL_REGISTER);
+ return;
+ }
+ if (enable)
+ reg_val |= DP_EDP_BACKLIGHT_ENABLE;
+ else
+ reg_val &= ~(DP_EDP_BACKLIGHT_ENABLE);
+
+ if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_EDP_DISPLAY_CONTROL_REGISTER,
+ reg_val) < 0) {
+ DRM_DEBUG_KMS("Failed to %s aux backlight\n",
+ enable ? "enable" : "disable");
+ }
+}
+
+/*
+ * Read the current backlight value from DPCD register(s) based
+ * on if 8-bit(MSB) or 16-bit(MSB and LSB) values are supported
+ */
+static uint32_t intel_dp_aux_get_backlight(struct intel_connector *connector)
+{
+ struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);
+ uint8_t read_val[2] = { 0x0 };
+ uint16_t level = 0;
+
+ if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_EDP_BACKLIGHT_BRIGHTNESS_MSB,
+ &read_val, sizeof(read_val)) < 0) {
+ DRM_DEBUG_KMS("Failed to read DPCD register 0x%x\n",
+ DP_EDP_BACKLIGHT_BRIGHTNESS_MSB);
+ return 0;
+ }
+ level = read_val[0];
+ if (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_BYTE_COUNT)
+ level = (read_val[0] << 8 | read_val[1]);
+
+ return level;
+}
+
+/*
+ * Sends the current backlight level over the aux channel, checking if its using
+ * 8-bit or 16 bit value (MSB and LSB)
+ */
+static void
+intel_dp_aux_set_backlight(struct intel_connector *connector, u32 level)
+{
+ struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);
+ uint8_t vals[2] = { 0x0 };
+
+ vals[0] = level;
+
+ /* Write the MSB and/or LSB */
+ if (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_BYTE_COUNT) {
+ vals[0] = (level & 0xFF00) >> 8;
+ vals[1] = (level & 0xFF);
+ }
+ if (drm_dp_dpcd_write(&intel_dp->aux, DP_EDP_BACKLIGHT_BRIGHTNESS_MSB,
+ vals, sizeof(vals)) < 0) {
+ DRM_DEBUG_KMS("Failed to write aux backlight level\n");
+ return;
+ }
+}
+
+static void intel_dp_aux_enable_backlight(struct intel_connector *connector)
+{
+ struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);
+ uint8_t dpcd_buf = 0;
+
+ set_aux_backlight_enable(intel_dp, true);
+
+ if ((intel_dp_dpcd_read_wake(&intel_dp->aux,
+ DP_EDP_BACKLIGHT_MODE_SET_REGISTER, &dpcd_buf, 1) == 1) &&
+ ((dpcd_buf & DP_EDP_BACKLIGHT_CONTROL_MODE_MASK) ==
+ DP_EDP_BACKLIGHT_CONTROL_MODE_PRESET))
+ drm_dp_dpcd_writeb(&intel_dp->aux, DP_EDP_BACKLIGHT_MODE_SET_REGISTER,
+ (dpcd_buf | DP_EDP_BACKLIGHT_CONTROL_MODE_DPCD));
+}
+
+static void intel_dp_aux_disable_backlight(struct intel_connector *connector)
+{
+ set_aux_backlight_enable(enc_to_intel_dp(&connector->encoder->base), false);
+}
+
+static int intel_dp_aux_setup_backlight(struct intel_connector *connector,
+ enum pipe pipe)
+{
+ struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);
+ struct intel_panel *panel = &connector->panel;
+
+ intel_dp_aux_enable_backlight(connector);
+
+ if (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_BYTE_COUNT)
+ panel->backlight.max = 0xFFFF;
+ else
+ panel->backlight.max = 0xFF;
+
+ panel->backlight.min = 0;
+ panel->backlight.level = intel_dp_aux_get_backlight(connector);
+
+ panel->backlight.enabled = panel->backlight.level != 0;
+
+ return 0;
+}
+
+static bool
+intel_dp_aux_display_control_capable(struct intel_connector *connector)
+{
+ struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);
+
+ /* Check the eDP Display control capabilities registers to determine if
+ * the panel can support backlight control over the aux channel
+ */
+ if (intel_dp->edp_dpcd[1] & DP_EDP_TCON_BACKLIGHT_ADJUSTMENT_CAP &&
+ (intel_dp->edp_dpcd[1] & DP_EDP_BACKLIGHT_AUX_ENABLE_CAP) &&
+ !((intel_dp->edp_dpcd[1] & DP_EDP_BACKLIGHT_PIN_ENABLE_CAP) ||
+ (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_PWM_PIN_CAP))) {
+
+ DRM_DEBUG_KMS("AUX Backlight Control Supported!\n");
+ return true;
+ }
+ return false;
+}
+
+int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector)
+{
+ struct intel_panel *panel = &intel_connector->panel;
+
+ if (!intel_dp_aux_display_control_capable(intel_connector))
+ return -ENODEV;
+
+ panel->backlight.setup = intel_dp_aux_setup_backlight;
+ panel->backlight.enable = intel_dp_aux_enable_backlight;
+ panel->backlight.disable = intel_dp_aux_disable_backlight;
+ panel->backlight.set = intel_dp_aux_set_backlight;
+ panel->backlight.get = intel_dp_aux_get_backlight;
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index cd0b4ea..6dd24c4 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -816,6 +816,7 @@ struct intel_dp {
uint8_t dpcd[DP_RECEIVER_CAP_SIZE];
uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE];
uint8_t downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
+ uint8_t edp_dpcd[EDP_DISPLAY_CTL_CAP_SIZE];
/* sink rates as reported by DP_SUPPORTED_LINK_RATES */
uint8_t num_sink_rates;
int sink_rates[DP_MAX_SUPPORTED_RATES];
@@ -1336,6 +1337,11 @@ void intel_dp_compute_rate(struct intel_dp *intel_dp, int port_clock,
bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp);
bool
intel_dp_get_link_status(struct intel_dp *intel_dp, uint8_t link_status[DP_LINK_STATUS_SIZE]);
+ssize_t intel_dp_dpcd_read_wake(struct drm_dp_aux *aux, unsigned int offset,
+ void *buffer, size_t size);
+
+/* intel_dp_aux_backlight.c */
+int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector);
/* intel_dp_mst.c */
int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 0fe059b..68fb3bd 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1718,6 +1718,11 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)
container_of(panel, struct intel_connector, panel);
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
+ if (i915.enable_dpcd_backlight &&
+ (connector->base.connector_type == DRM_MODE_CONNECTOR_eDP &&
+ intel_dp_aux_init_backlight_funcs(connector) == 0))
+ return;
+
if (IS_BROXTON(dev_priv)) {
panel->backlight.setup = bxt_setup_backlight;
panel->backlight.enable = bxt_enable_backlight;
--
1.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/3] drm/i915: Add backlight Control using DPCD registers for DP connectors
2016-03-07 12:58 [PATCH 0/3] DPCD Backlight Control Yetunde Adebisi
2016-03-07 12:58 ` [PATCH 1/3] drm/dp: Add definition for Display Control DPCD Registers capability size Yetunde Adebisi
2016-03-07 12:58 ` [PATCH 2/3] drm/i915: Add Backlight Control using DPCD for eDP connectors (v7) Yetunde Adebisi
@ 2016-03-07 12:58 ` Yetunde Adebisi
2016-03-07 17:55 ` ✗ Fi.CI.BAT: failure for DPCD Backlight Control (rev4) Patchwork
3 siblings, 0 replies; 11+ messages in thread
From: Yetunde Adebisi @ 2016-03-07 12:58 UTC (permalink / raw)
To: intel-gfx; +Cc: Yetunde Adebisi
This patch enables support for DPCD backlight control for DP connectors.
The VESA spec defines DPCD backlight control only for eDP but some add-on
cards like the Chrontel CH7511B DP-LVDS cards have the display control
DPCD registers enabled.
This patch registers a backlight device exposed via sysfs that controls the
connected panel backlight by writing to DPCD registers on the CH7511B
add-on card
Signed-off-by: Yetunde Adebisi <yetundex.adebisi@intel.com>
---
drivers/gpu/drm/i915/intel_dp.c | 25 ++++++++++++++++++++
drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 7 ++++++
drivers/gpu/drm/i915/intel_drv.h | 2 ++
drivers/gpu/drm/i915/intel_panel.c | 33 +++++++++++++++++++--------
4 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 9ccc581..bf79ef4 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5718,6 +5718,30 @@ intel_dp_drrs_init(struct intel_connector *intel_connector,
return downclock_mode;
}
+/*
+ * Called on DP connector initialization to check for aux backlight control
+ * capability on the sink device and if present, initialize it.
+ */
+static void intel_dp_init_aux_backlight(struct intel_dp *intel_dp,
+ struct drm_connector *connector)
+{
+ struct intel_connector *intel_connector = to_intel_connector(connector);
+
+ if (is_edp(intel_dp))
+ return;
+
+ if (i915.enable_dpcd_backlight &&
+ (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_EDP_DPCD_REV,
+ intel_dp->edp_dpcd, sizeof(intel_dp->edp_dpcd)) ==
+ sizeof(intel_dp->edp_dpcd)) &&
+ intel_dp_aux_init_backlight_funcs(intel_connector) == 0) {
+ intel_panel_setup_backlight(connector, INVALID_PIPE);
+
+ intel_connector->panel.backlight.power = intel_dp_aux_backlight_power;
+ intel_connector->panel.backlight.enabled = true;
+ }
+}
+
static bool intel_edp_init_connector(struct intel_dp *intel_dp,
struct intel_connector *intel_connector)
{
@@ -5955,6 +5979,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
goto fail;
}
+ intel_dp_init_aux_backlight(intel_dp, connector);
intel_dp_add_properties(intel_dp, connector);
/* For G4X desktop chip, PEG_BAND_GAP_DATA 3:0 must first be written
diff --git a/drivers/gpu/drm/i915/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/intel_dp_aux_backlight.c
index a5361d6..efa657f 100644
--- a/drivers/gpu/drm/i915/intel_dp_aux_backlight.c
+++ b/drivers/gpu/drm/i915/intel_dp_aux_backlight.c
@@ -168,3 +168,10 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector)
return 0;
}
+
+void intel_dp_aux_backlight_power(struct intel_connector *connector,
+ bool enable)
+{
+ set_aux_backlight_enable(enc_to_intel_dp(&connector->encoder->base),
+ enable);
+}
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 6dd24c4..1b03c77 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1342,6 +1342,8 @@ ssize_t intel_dp_dpcd_read_wake(struct drm_dp_aux *aux, unsigned int offset,
/* intel_dp_aux_backlight.c */
int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector);
+void intel_dp_aux_backlight_power(struct intel_connector *connector,
+ bool enable);
/* intel_dp_mst.c */
int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 68fb3bd..5074457 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1193,16 +1193,29 @@ static int intel_backlight_device_register(struct intel_connector *connector)
else
props.power = FB_BLANK_POWERDOWN;
- /*
- * Note: using the same name independent of the connector prevents
- * registration of multiple backlight devices in the driver.
- */
- panel->backlight.device =
- backlight_device_register("intel_backlight",
- connector->base.kdev,
- connector,
- &intel_backlight_device_ops, &props);
-
+ if (connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
+ char *name = kasprintf(GFP_KERNEL, "intel_aux_backlight-%s",
+ connector->base.name);
+ if (!name)
+ return -ENOMEM;
+
+ panel->backlight.device =
+ backlight_device_register(name,
+ connector->base.kdev,
+ connector,
+ &intel_backlight_device_ops, &props);
+ kfree(name);
+ } else {
+ /*
+ * Note: using the same name independent of the connector prevents
+ * registration of multiple backlight devices in the driver.
+ */
+ panel->backlight.device =
+ backlight_device_register("intel_backlight",
+ connector->base.kdev,
+ connector,
+ &intel_backlight_device_ops, &props);
+ }
if (IS_ERR(panel->backlight.device)) {
DRM_ERROR("Failed to register backlight: %ld\n",
PTR_ERR(panel->backlight.device));
--
1.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* ✗ Fi.CI.BAT: failure for DPCD Backlight Control (rev4)
2016-03-07 12:58 [PATCH 0/3] DPCD Backlight Control Yetunde Adebisi
` (2 preceding siblings ...)
2016-03-07 12:58 ` [PATCH 3/3] drm/i915: Add backlight Control using DPCD registers for DP connectors Yetunde Adebisi
@ 2016-03-07 17:55 ` Patchwork
2016-03-14 14:38 ` Adebisi, YetundeX
3 siblings, 1 reply; 11+ messages in thread
From: Patchwork @ 2016-03-07 17:55 UTC (permalink / raw)
To: Yetunde Adebisi; +Cc: intel-gfx
== Series Details ==
Series: DPCD Backlight Control (rev4)
URL : https://patchwork.freedesktop.org/series/1864/
State : failure
== Summary ==
Series 1864v4 DPCD Backlight Control
http://patchwork.freedesktop.org/api/1.0/series/1864/revisions/4/mbox/
Test kms_flip:
Subgroup basic-flip-vs-dpms:
pass -> DMESG-WARN (bdw-ultra)
Subgroup basic-flip-vs-modeset:
dmesg-warn -> PASS (bdw-ultra)
Subgroup basic-flip-vs-wf_vblank:
dmesg-warn -> PASS (hsw-gt2)
skip -> DMESG-WARN (hsw-brixbox)
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a:
pass -> DMESG-WARN (snb-x220t)
Subgroup suspend-read-crc-pipe-a:
pass -> SKIP (byt-nuc)
Subgroup suspend-read-crc-pipe-c:
dmesg-warn -> PASS (bsw-nuc-2)
Test pm_rpm:
Subgroup basic-pci-d3-state:
dmesg-fail -> FAIL (snb-x220t)
dmesg-warn -> PASS (bsw-nuc-2)
Subgroup basic-rte:
pass -> DMESG-WARN (bsw-nuc-2)
dmesg-warn -> PASS (snb-dellxps)
bdw-nuci7 total:183 pass:172 dwarn:0 dfail:0 fail:0 skip:11
bdw-ultra total:183 pass:164 dwarn:1 dfail:0 fail:0 skip:18
bsw-nuc-2 total:183 pass:148 dwarn:1 dfail:0 fail:0 skip:34
byt-nuc total:183 pass:151 dwarn:0 dfail:0 fail:0 skip:32
hsw-brixbox total:183 pass:163 dwarn:1 dfail:0 fail:0 skip:19
hsw-gt2 total:183 pass:169 dwarn:0 dfail:0 fail:0 skip:14
ivb-t430s total:183 pass:162 dwarn:0 dfail:0 fail:0 skip:21
skl-i5k-2 total:183 pass:163 dwarn:0 dfail:0 fail:0 skip:20
skl-i7k-2 total:183 pass:163 dwarn:0 dfail:0 fail:0 skip:20
snb-dellxps total:183 pass:153 dwarn:1 dfail:0 fail:0 skip:29
snb-x220t total:183 pass:153 dwarn:1 dfail:0 fail:1 skip:28
Results at /archive/results/CI_IGT_test/Patchwork_1536/
0fd8a4bae2f65cf961a055bd40ad5083c6fb483a drm-intel-nightly: 2016y-03m-07d-16h-40m-01s UTC integration manifest
9a6e2273023028048b8fd0b2870c4528d77b8a85 drm/i915: Add backlight Control using DPCD registers for DP connectors
b2eb6e0a2948737aefcfa5d3d2f4e1ad236fb389 drm/i915: Add Backlight Control using DPCD for eDP connectors (v7)
6609c0fbeb01f51631a56a39c4f95e37ec294978 drm/dp: Add definition for Display Control DPCD Registers capability size
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for DPCD Backlight Control (rev4)
2016-03-07 17:55 ` ✗ Fi.CI.BAT: failure for DPCD Backlight Control (rev4) Patchwork
@ 2016-03-14 14:38 ` Adebisi, YetundeX
0 siblings, 0 replies; 11+ messages in thread
From: Adebisi, YetundeX @ 2016-03-14 14:38 UTC (permalink / raw)
To: intel-gfx
It doesn’t look like any of these warnings have anything to do with my patch.
They mostly have to do with " Device suspended during HW access" from drm_atomic_commit call.
The fail on snb-x220t is a pre-existing one and the last one is " *ERROR* Unclaimed access detected prior to suspending" on bdw-ultra which is also pre-existing.
-----Original Message-----
From: Patchwork [mailto:patchwork@emeril.freedesktop.org]
Sent: Monday, March 07, 2016 5:55 PM
To: Adebisi, YetundeX
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for DPCD Backlight Control (rev4)
== Series Details ==
Series: DPCD Backlight Control (rev4)
URL : https://patchwork.freedesktop.org/series/1864/
State : failure
== Summary ==
Series 1864v4 DPCD Backlight Control
http://patchwork.freedesktop.org/api/1.0/series/1864/revisions/4/mbox/
Test kms_flip:
Subgroup basic-flip-vs-dpms:
pass -> DMESG-WARN (bdw-ultra)
Subgroup basic-flip-vs-modeset:
dmesg-warn -> PASS (bdw-ultra)
Subgroup basic-flip-vs-wf_vblank:
dmesg-warn -> PASS (hsw-gt2)
skip -> DMESG-WARN (hsw-brixbox)
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a:
pass -> DMESG-WARN (snb-x220t)
Subgroup suspend-read-crc-pipe-a:
pass -> SKIP (byt-nuc)
Subgroup suspend-read-crc-pipe-c:
dmesg-warn -> PASS (bsw-nuc-2)
Test pm_rpm:
Subgroup basic-pci-d3-state:
dmesg-fail -> FAIL (snb-x220t)
dmesg-warn -> PASS (bsw-nuc-2)
Subgroup basic-rte:
pass -> DMESG-WARN (bsw-nuc-2)
dmesg-warn -> PASS (snb-dellxps)
bdw-nuci7 total:183 pass:172 dwarn:0 dfail:0 fail:0 skip:11
bdw-ultra total:183 pass:164 dwarn:1 dfail:0 fail:0 skip:18
bsw-nuc-2 total:183 pass:148 dwarn:1 dfail:0 fail:0 skip:34
byt-nuc total:183 pass:151 dwarn:0 dfail:0 fail:0 skip:32
hsw-brixbox total:183 pass:163 dwarn:1 dfail:0 fail:0 skip:19
hsw-gt2 total:183 pass:169 dwarn:0 dfail:0 fail:0 skip:14
ivb-t430s total:183 pass:162 dwarn:0 dfail:0 fail:0 skip:21
skl-i5k-2 total:183 pass:163 dwarn:0 dfail:0 fail:0 skip:20
skl-i7k-2 total:183 pass:163 dwarn:0 dfail:0 fail:0 skip:20
snb-dellxps total:183 pass:153 dwarn:1 dfail:0 fail:0 skip:29
snb-x220t total:183 pass:153 dwarn:1 dfail:0 fail:1 skip:28
Results at /archive/results/CI_IGT_test/Patchwork_1536/
0fd8a4bae2f65cf961a055bd40ad5083c6fb483a drm-intel-nightly: 2016y-03m-07d-16h-40m-01s UTC integration manifest
9a6e2273023028048b8fd0b2870c4528d77b8a85 drm/i915: Add backlight Control using DPCD registers for DP connectors
b2eb6e0a2948737aefcfa5d3d2f4e1ad236fb389 drm/i915: Add Backlight Control using DPCD for eDP connectors (v7)
6609c0fbeb01f51631a56a39c4f95e37ec294978 drm/dp: Add definition for Display Control DPCD Registers capability size
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/3] DPCD Backlight Control
2016-04-05 14:10 Yetunde Adebisi
@ 2016-04-26 12:33 ` Jani Nikula
0 siblings, 0 replies; 11+ messages in thread
From: Jani Nikula @ 2016-04-26 12:33 UTC (permalink / raw)
To: Yetunde Adebisi, intel-gfx
On Tue, 05 Apr 2016, Yetunde Adebisi <yetundex.adebisi@intel.com> wrote:
> These patches add support for Backlight Control using DPCD registers on eDP
> displays.
Pushed to drm-intel-next-queued, thanks for the patches, and, again,
apologies for the way too long delay with getting these merged.
I fixed some whitespace issues while applying. Please learn to use
scripts/checkpatch.pl to get the details right next time.
BR,
Jani.
>
> - Patch 1 Adds macro for DPCD registers capability size to drm_dp_helper.h
> - Patch 2 Reads the eDP DPCD Display Control capability registers.
> - Patch 2 Implements functionaly for DPCD Backlight Control
>
> Yetunde Adebisi (3):
> drm/dp: Add definition for Display Control DPCD Registers capability
> size
> drm/i915: Read eDP Display control capability registers
> drm/i915: Add Backlight Control using DPCD for eDP connectors (v9)
>
> drivers/gpu/drm/i915/Makefile | 1 +
> drivers/gpu/drm/i915/i915_params.c | 4 +
> drivers/gpu/drm/i915/i915_params.h | 1 +
> drivers/gpu/drm/i915/intel_dp.c | 15 ++-
> drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 173 ++++++++++++++++++++++++++
> drivers/gpu/drm/i915/intel_drv.h | 4 +
> drivers/gpu/drm/i915/intel_panel.c | 4 +
> include/drm/drm_dp_helper.h | 1 +
> 8 files changed, 198 insertions(+), 5 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.c
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/3] DPCD Backlight Control
@ 2016-04-26 11:25 Yetunde Adebisi
0 siblings, 0 replies; 11+ messages in thread
From: Yetunde Adebisi @ 2016-04-26 11:25 UTC (permalink / raw)
To: intel-gfx; +Cc: isg-gms
These patches add support for Backlight Control using DPCD registers on eDP
displays.
- Patch 1 Adds macro for DPCD registers capability size to drm_dp_helper.h
- Patch 2 Reads the eDP DPCD Display Control capability registers.
- Patch 3 Implements functionaly for DPCD Backlight Control
Yetunde Adebisi (3):
drm/dp: Add definition for Display Control DPCD Registers capability
size
drm/i915: Read eDP Display control capability registers
drm/i915: Add Backlight Control using DPCD for eDP connectors (v9)
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/i915_params.c | 4 +
drivers/gpu/drm/i915/i915_params.h | 1 +
drivers/gpu/drm/i915/intel_dp.c | 15 ++-
drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 173 ++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_drv.h | 4 +
drivers/gpu/drm/i915/intel_panel.c | 4 +
include/drm/drm_dp_helper.h | 1 +
8 files changed, 198 insertions(+), 5 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.c
--
1.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/3] DPCD Backlight Control
@ 2016-04-05 14:10 Yetunde Adebisi
2016-04-26 12:33 ` Jani Nikula
0 siblings, 1 reply; 11+ messages in thread
From: Yetunde Adebisi @ 2016-04-05 14:10 UTC (permalink / raw)
To: intel-gfx
These patches add support for Backlight Control using DPCD registers on eDP
displays.
- Patch 1 Adds macro for DPCD registers capability size to drm_dp_helper.h
- Patch 2 Reads the eDP DPCD Display Control capability registers.
- Patch 2 Implements functionaly for DPCD Backlight Control
Yetunde Adebisi (3):
drm/dp: Add definition for Display Control DPCD Registers capability
size
drm/i915: Read eDP Display control capability registers
drm/i915: Add Backlight Control using DPCD for eDP connectors (v9)
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/i915_params.c | 4 +
drivers/gpu/drm/i915/i915_params.h | 1 +
drivers/gpu/drm/i915/intel_dp.c | 15 ++-
drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 173 ++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_drv.h | 4 +
drivers/gpu/drm/i915/intel_panel.c | 4 +
include/drm/drm_dp_helper.h | 1 +
8 files changed, 198 insertions(+), 5 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.c
--
1.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/3] DPCD Backlight Control
@ 2016-04-05 13:50 Yetunde Adebisi
0 siblings, 0 replies; 11+ messages in thread
From: Yetunde Adebisi @ 2016-04-05 13:50 UTC (permalink / raw)
To: intel-gfx; +Cc: isg-gms
These patches add support for Backlight Control using DPCD registers on eDP
displays.
- Patch 1 Adds macro for DPCD registers capability size to drm_dp_helper.h
- Patch 2 Reads the eDP DPCD Display Control capability registers.
- Patch 2 Implements functionaly for DPCD Backlight Control
Yetunde Adebisi (3):
drm/dp: Add definition for Display Control DPCD Registers capability
size
drm/i915: Read eDP Display control capability registers
drm/i915: Add Backlight Control using DPCD for eDP connectors (v9)
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/i915_params.c | 4 +
drivers/gpu/drm/i915/i915_params.h | 1 +
drivers/gpu/drm/i915/intel_dp.c | 15 ++-
drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 173 ++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_drv.h | 4 +
drivers/gpu/drm/i915/intel_panel.c | 4 +
include/drm/drm_dp_helper.h | 1 +
8 files changed, 198 insertions(+), 5 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.c
--
1.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/3] DPCD Backlight Control
@ 2016-03-30 14:27 Yetunde Adebisi
0 siblings, 0 replies; 11+ messages in thread
From: Yetunde Adebisi @ 2016-03-30 14:27 UTC (permalink / raw)
To: intel-gfx; +Cc: Yetunde Adebisi, isg-gms
These patches add support for Backlight Control using DPCD registers on eDP
displays.
- Patch 1 adds macro for DPCD registers capability size to drm_dp_helper.h
A copy of this patch has also been sent to dri-devel list.
- Patch 2 Implements functionaly for DPCD Backlight Control
- Patch 3 Implements functionaly for DPCD Backlight Control for special
DP-LVDS add-on cards.
Yetunde Adebisi (3):
drm/dp: Add definition for Display Control DPCD Registers capability
size
drm/i915: Add Backlight Control using DPCD for eDP connectors (v8)
drm/i915: Add backlight Control using DPCD registers for DP connectors
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/i915_params.c | 4 +
drivers/gpu/drm/i915/i915_params.h | 1 +
drivers/gpu/drm/i915/intel_dp.c | 42 +++++-
drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 177 ++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_drv.h | 8 ++
drivers/gpu/drm/i915/intel_panel.c | 38 ++++--
include/drm/drm_dp_helper.h | 1 +
8 files changed, 256 insertions(+), 16 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.c
--
1.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-04-26 12:33 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-07 12:58 [PATCH 0/3] DPCD Backlight Control Yetunde Adebisi
2016-03-07 12:58 ` [PATCH 1/3] drm/dp: Add definition for Display Control DPCD Registers capability size Yetunde Adebisi
2016-03-07 12:58 ` [PATCH 2/3] drm/i915: Add Backlight Control using DPCD for eDP connectors (v7) Yetunde Adebisi
2016-03-07 12:58 ` [PATCH 3/3] drm/i915: Add backlight Control using DPCD registers for DP connectors Yetunde Adebisi
2016-03-07 17:55 ` ✗ Fi.CI.BAT: failure for DPCD Backlight Control (rev4) Patchwork
2016-03-14 14:38 ` Adebisi, YetundeX
2016-03-30 14:27 [PATCH 0/3] DPCD Backlight Control Yetunde Adebisi
2016-04-05 13:50 Yetunde Adebisi
2016-04-05 14:10 Yetunde Adebisi
2016-04-26 12:33 ` Jani Nikula
2016-04-26 11:25 Yetunde Adebisi
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.