* [PATCH 1/7] drm/i915: move opregion asle request handling to a work queue
2013-10-31 16:55 [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs Jani Nikula
@ 2013-10-31 16:55 ` Jani Nikula
2013-11-05 17:50 ` Jesse Barnes
2013-11-06 17:07 ` Joe Konno
2013-10-31 16:55 ` [PATCH 2/7] drm/i915: make backlight functions take a connector Jani Nikula
` (6 subsequent siblings)
7 siblings, 2 replies; 19+ messages in thread
From: Jani Nikula @ 2013-10-31 16:55 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, jesse.barnes
Doing this has been long overdue anyway, but now we really need it in
preparation for per connector backlight handling.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/intel_opregion.c | 20 ++++++++++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 2c1921d..6308711 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -242,6 +242,7 @@ struct intel_opregion {
struct opregion_asle __iomem *asle;
void __iomem *vbt;
u32 __iomem *lid_state;
+ struct work_struct asle_work;
};
#define OPREGION_SIZE (8*1024)
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index b82050c..892d520 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -486,9 +486,13 @@ static u32 asle_isct_state(struct drm_device *dev)
return ASLC_ISCT_STATE_FAILED;
}
-void intel_opregion_asle_intr(struct drm_device *dev)
+static void asle_work(struct work_struct *work)
{
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_opregion *opregion =
+ container_of(work, struct intel_opregion, asle_work);
+ struct drm_i915_private *dev_priv =
+ container_of(opregion, struct drm_i915_private, opregion);
+ struct drm_device *dev = dev_priv->dev;
struct opregion_asle __iomem *asle = dev_priv->opregion.asle;
u32 aslc_stat = 0;
u32 aslc_req;
@@ -535,6 +539,14 @@ void intel_opregion_asle_intr(struct drm_device *dev)
iowrite32(aslc_stat, &asle->aslc);
}
+void intel_opregion_asle_intr(struct drm_device *dev)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+
+ if (dev_priv->opregion.asle)
+ schedule_work(&dev_priv->opregion.asle_work);
+}
+
#define ACPI_EV_DISPLAY_SWITCH (1<<0)
#define ACPI_EV_LID (1<<1)
#define ACPI_EV_DOCK (1<<2)
@@ -735,6 +747,8 @@ void intel_opregion_fini(struct drm_device *dev)
if (opregion->asle)
iowrite32(ASLE_ARDY_NOT_READY, &opregion->asle->ardy);
+ cancel_work_sync(&dev_priv->opregion.asle_work);
+
if (opregion->acpi) {
iowrite32(0, &opregion->acpi->drdy);
@@ -828,6 +842,8 @@ int intel_opregion_setup(struct drm_device *dev)
return -ENOTSUPP;
}
+ INIT_WORK(&opregion->asle_work, asle_work);
+
base = acpi_os_ioremap(asls, OPREGION_SIZE);
if (!base)
return -ENOMEM;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 1/7] drm/i915: move opregion asle request handling to a work queue
2013-10-31 16:55 ` [PATCH 1/7] drm/i915: move opregion asle request handling to a work queue Jani Nikula
@ 2013-11-05 17:50 ` Jesse Barnes
2013-11-06 17:07 ` Joe Konno
1 sibling, 0 replies; 19+ messages in thread
From: Jesse Barnes @ 2013-11-05 17:50 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Thu, 31 Oct 2013 18:55:48 +0200
Jani Nikula <jani.nikula@intel.com> wrote:
> Doing this has been long overdue anyway, but now we really need it in
> preparation for per connector backlight handling.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 1 +
> drivers/gpu/drm/i915/intel_opregion.c | 20 ++++++++++++++++++--
> 2 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 2c1921d..6308711 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -242,6 +242,7 @@ struct intel_opregion {
> struct opregion_asle __iomem *asle;
> void __iomem *vbt;
> u32 __iomem *lid_state;
> + struct work_struct asle_work;
> };
> #define OPREGION_SIZE (8*1024)
>
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index b82050c..892d520 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -486,9 +486,13 @@ static u32 asle_isct_state(struct drm_device *dev)
> return ASLC_ISCT_STATE_FAILED;
> }
>
> -void intel_opregion_asle_intr(struct drm_device *dev)
> +static void asle_work(struct work_struct *work)
> {
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct intel_opregion *opregion =
> + container_of(work, struct intel_opregion, asle_work);
> + struct drm_i915_private *dev_priv =
> + container_of(opregion, struct drm_i915_private, opregion);
> + struct drm_device *dev = dev_priv->dev;
> struct opregion_asle __iomem *asle = dev_priv->opregion.asle;
> u32 aslc_stat = 0;
> u32 aslc_req;
> @@ -535,6 +539,14 @@ void intel_opregion_asle_intr(struct drm_device *dev)
> iowrite32(aslc_stat, &asle->aslc);
> }
>
> +void intel_opregion_asle_intr(struct drm_device *dev)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> +
> + if (dev_priv->opregion.asle)
> + schedule_work(&dev_priv->opregion.asle_work);
> +}
> +
> #define ACPI_EV_DISPLAY_SWITCH (1<<0)
> #define ACPI_EV_LID (1<<1)
> #define ACPI_EV_DOCK (1<<2)
> @@ -735,6 +747,8 @@ void intel_opregion_fini(struct drm_device *dev)
> if (opregion->asle)
> iowrite32(ASLE_ARDY_NOT_READY, &opregion->asle->ardy);
>
> + cancel_work_sync(&dev_priv->opregion.asle_work);
> +
> if (opregion->acpi) {
> iowrite32(0, &opregion->acpi->drdy);
>
> @@ -828,6 +842,8 @@ int intel_opregion_setup(struct drm_device *dev)
> return -ENOTSUPP;
> }
>
> + INIT_WORK(&opregion->asle_work, asle_work);
> +
> base = acpi_os_ioremap(asls, OPREGION_SIZE);
> if (!base)
> return -ENOMEM;
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 1/7] drm/i915: move opregion asle request handling to a work queue
2013-10-31 16:55 ` [PATCH 1/7] drm/i915: move opregion asle request handling to a work queue Jani Nikula
2013-11-05 17:50 ` Jesse Barnes
@ 2013-11-06 17:07 ` Joe Konno
1 sibling, 0 replies; 19+ messages in thread
From: Joe Konno @ 2013-11-06 17:07 UTC (permalink / raw)
To: intel-gfx
On 10/31/2013 09:55 AM, Jani Nikula wrote:
> Doing this has been long overdue anyway, but now we really need it in
> preparation for per connector backlight handling.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 1 +
> drivers/gpu/drm/i915/intel_opregion.c | 20 ++++++++++++++++++--
> 2 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 2c1921d..6308711 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -242,6 +242,7 @@ struct intel_opregion {
> struct opregion_asle __iomem *asle;
> void __iomem *vbt;
> u32 __iomem *lid_state;
> + struct work_struct asle_work;
> };
> #define OPREGION_SIZE (8*1024)
>
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index b82050c..892d520 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -486,9 +486,13 @@ static u32 asle_isct_state(struct drm_device *dev)
> return ASLC_ISCT_STATE_FAILED;
> }
>
> -void intel_opregion_asle_intr(struct drm_device *dev)
> +static void asle_work(struct work_struct *work)
> {
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct intel_opregion *opregion =
> + container_of(work, struct intel_opregion, asle_work);
> + struct drm_i915_private *dev_priv =
> + container_of(opregion, struct drm_i915_private, opregion);
> + struct drm_device *dev = dev_priv->dev;
> struct opregion_asle __iomem *asle = dev_priv->opregion.asle;
> u32 aslc_stat = 0;
> u32 aslc_req;
> @@ -535,6 +539,14 @@ void intel_opregion_asle_intr(struct drm_device *dev)
> iowrite32(aslc_stat, &asle->aslc);
> }
>
> +void intel_opregion_asle_intr(struct drm_device *dev)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> +
> + if (dev_priv->opregion.asle)
> + schedule_work(&dev_priv->opregion.asle_work);
> +}
> +
> #define ACPI_EV_DISPLAY_SWITCH (1<<0)
> #define ACPI_EV_LID (1<<1)
> #define ACPI_EV_DOCK (1<<2)
> @@ -735,6 +747,8 @@ void intel_opregion_fini(struct drm_device *dev)
> if (opregion->asle)
> iowrite32(ASLE_ARDY_NOT_READY, &opregion->asle->ardy);
>
> + cancel_work_sync(&dev_priv->opregion.asle_work);
> +
> if (opregion->acpi) {
> iowrite32(0, &opregion->acpi->drdy);
>
> @@ -828,6 +842,8 @@ int intel_opregion_setup(struct drm_device *dev)
> return -ENOTSUPP;
> }
>
> + INIT_WORK(&opregion->asle_work, asle_work);
> +
> base = acpi_os_ioremap(asls, OPREGION_SIZE);
> if (!base)
> return -ENOMEM;
>
Tested-by: Joe Konno <joe.konno@intel.com>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 2/7] drm/i915: make backlight functions take a connector
2013-10-31 16:55 [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs Jani Nikula
2013-10-31 16:55 ` [PATCH 1/7] drm/i915: move opregion asle request handling to a work queue Jani Nikula
@ 2013-10-31 16:55 ` Jani Nikula
2013-11-06 17:08 ` Joe Konno
2013-10-31 16:55 ` [PATCH 3/7] drm/i915/vlv: use per-pipe backlight controls v2 Jani Nikula
` (5 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2013-10-31 16:55 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, jesse.barnes
From: Jesse Barnes <jbarnes@virtuousgeek.org>
On VLV/BYT, backlight controls a per-pipe, so when adjusting the
backlight we need to pass the correct info. So make the externally
visible backlight functions take a connector argument, which can be used
internally to figure out the pipe backlight to adjust.
v2: make connector pipe lookup check for NULL crtc (Jani)
fixup connector check in ASLE code (Jani)
v3: make sure we take the mode config lock around lookups (Daniel)
v4: fix double unlock in panel_get_brightness (Daniel)
v5: push ASLE work into a work queue (Daniel)
v6: separate ASLE work to a prep patch, rebase (Jani)
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/intel_display.c | 12 +++++
drivers/gpu/drm/i915/intel_dp.c | 5 +-
drivers/gpu/drm/i915/intel_drv.h | 8 +--
drivers/gpu/drm/i915/intel_lvds.c | 9 ++--
drivers/gpu/drm/i915/intel_opregion.c | 38 ++++++++++++++-
drivers/gpu/drm/i915/intel_panel.c | 86 +++++++++++++++++++++++----------
7 files changed, 122 insertions(+), 37 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 6308711..83eda64 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -54,6 +54,7 @@
#define DRIVER_DATE "20080730"
enum pipe {
+ INVALID_PIPE = -1,
PIPE_A = 0,
PIPE_B,
PIPE_C,
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8f40ae3..606a594 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9858,6 +9858,18 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);
}
+enum pipe intel_get_pipe_from_connector(struct intel_connector *connector)
+{
+ struct drm_encoder *encoder = connector->base.encoder;
+
+ WARN_ON(!mutex_is_locked(&connector->base.dev->mode_config.mutex));
+
+ if (!encoder)
+ return INVALID_PIPE;
+
+ return to_intel_crtc(encoder->crtc)->pipe;
+}
+
int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
struct drm_file *file)
{
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 8db1fda..0ca98825 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1249,7 +1249,6 @@ void ironlake_edp_backlight_on(struct intel_dp *intel_dp)
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
struct drm_device *dev = intel_dig_port->base.base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
- int pipe = to_intel_crtc(intel_dig_port->base.base.crtc)->pipe;
u32 pp;
u32 pp_ctrl_reg;
@@ -1272,7 +1271,7 @@ void ironlake_edp_backlight_on(struct intel_dp *intel_dp)
I915_WRITE(pp_ctrl_reg, pp);
POSTING_READ(pp_ctrl_reg);
- intel_panel_enable_backlight(dev, pipe);
+ intel_panel_enable_backlight(intel_dp->attached_connector);
}
void ironlake_edp_backlight_off(struct intel_dp *intel_dp)
@@ -1285,7 +1284,7 @@ void ironlake_edp_backlight_off(struct intel_dp *intel_dp)
if (!is_edp(intel_dp))
return;
- intel_panel_disable_backlight(dev);
+ intel_panel_disable_backlight(intel_dp->attached_connector);
DRM_DEBUG_KMS("\n");
pp = ironlake_get_pp_control(intel_dp);
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 9d2624f..1e49aa8 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -630,6 +630,7 @@ void intel_connector_attach_encoder(struct intel_connector *connector,
struct drm_encoder *intel_best_encoder(struct drm_connector *connector);
struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
struct drm_crtc *crtc);
+enum pipe intel_get_pipe_from_connector(struct intel_connector *connector);
int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
struct drm_file *file_priv);
enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,
@@ -802,10 +803,11 @@ void intel_pch_panel_fitting(struct intel_crtc *crtc,
void intel_gmch_panel_fitting(struct intel_crtc *crtc,
struct intel_crtc_config *pipe_config,
int fitting_mode);
-void intel_panel_set_backlight(struct drm_device *dev, u32 level, u32 max);
+void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
+ u32 max);
int intel_panel_setup_backlight(struct drm_connector *connector);
-void intel_panel_enable_backlight(struct drm_device *dev, enum pipe pipe);
-void intel_panel_disable_backlight(struct drm_device *dev);
+void intel_panel_enable_backlight(struct intel_connector *connector);
+void intel_panel_disable_backlight(struct intel_connector *connector);
void intel_panel_destroy_backlight(struct drm_device *dev);
enum drm_connector_status intel_panel_detect(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index b0ef558..c3b4da7 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -206,7 +206,8 @@ static void intel_enable_lvds(struct intel_encoder *encoder)
{
struct drm_device *dev = encoder->base.dev;
struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
- struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
+ struct intel_connector *intel_connector =
+ &lvds_encoder->attached_connector->base;
struct drm_i915_private *dev_priv = dev->dev_private;
u32 ctl_reg, stat_reg;
@@ -225,13 +226,15 @@ static void intel_enable_lvds(struct intel_encoder *encoder)
if (wait_for((I915_READ(stat_reg) & PP_ON) != 0, 1000))
DRM_ERROR("timed out waiting for panel to power on\n");
- intel_panel_enable_backlight(dev, intel_crtc->pipe);
+ intel_panel_enable_backlight(intel_connector);
}
static void intel_disable_lvds(struct intel_encoder *encoder)
{
struct drm_device *dev = encoder->base.dev;
struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
+ struct intel_connector *intel_connector =
+ &lvds_encoder->attached_connector->base;
struct drm_i915_private *dev_priv = dev->dev_private;
u32 ctl_reg, stat_reg;
@@ -243,7 +246,7 @@ static void intel_disable_lvds(struct intel_encoder *encoder)
stat_reg = PP_STATUS;
}
- intel_panel_disable_backlight(dev);
+ intel_panel_disable_backlight(intel_connector);
I915_WRITE(ctl_reg, I915_READ(ctl_reg) & ~POWER_TARGET_ON);
if (wait_for((I915_READ(stat_reg) & PP_ON) == 0, 1000))
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 892d520..91b68dc 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -396,7 +396,13 @@ int intel_opregion_notify_adapter(struct drm_device *dev, pci_power_t state)
static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
{
struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_encoder *encoder;
+ struct drm_connector *connector;
+ struct intel_connector *intel_connector = NULL;
+ struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[0];
struct opregion_asle __iomem *asle = dev_priv->opregion.asle;
+ u32 ret = 0;
+ bool found = false;
DRM_DEBUG_DRIVER("bclp = 0x%08x\n", bclp);
@@ -407,11 +413,39 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
if (bclp > 255)
return ASLC_BACKLIGHT_FAILED;
+ mutex_lock(&dev->mode_config.mutex);
+ /*
+ * Could match the OpRegion connector here instead, but we'd also need
+ * to verify the connector could handle a backlight call.
+ */
+ list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)
+ if (encoder->crtc == crtc) {
+ found = true;
+ break;
+ }
+
+ if (!found) {
+ ret = ASLC_BACKLIGHT_FAILED;
+ goto out;
+ }
+
+ list_for_each_entry(connector, &dev->mode_config.connector_list, head)
+ if (connector->encoder == encoder)
+ intel_connector = to_intel_connector(connector);
+
+ if (!intel_connector) {
+ ret = ASLC_BACKLIGHT_FAILED;
+ goto out;
+ }
+
DRM_DEBUG_KMS("updating opregion backlight %d/255\n", bclp);
- intel_panel_set_backlight(dev, bclp, 255);
+ intel_panel_set_backlight(intel_connector, bclp, 255);
iowrite32(DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID, &asle->cblv);
- return 0;
+out:
+ mutex_unlock(&dev->mode_config.mutex);
+
+ return ret;
}
static u32 asle_set_als_illum(struct drm_device *dev, u32 alsi)
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 09b2994..0f1ebc8 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -341,7 +341,7 @@ static int is_backlight_combination_mode(struct drm_device *dev)
/* XXX: query mode clock or hardware clock and program max PWM appropriately
* when it's 0.
*/
-static u32 i915_read_blc_pwm_ctl(struct drm_device *dev)
+static u32 i915_read_blc_pwm_ctl(struct drm_device *dev, enum pipe pipe)
{
struct drm_i915_private *dev_priv = dev->dev_private;
u32 val;
@@ -380,11 +380,12 @@ static u32 i915_read_blc_pwm_ctl(struct drm_device *dev)
return val;
}
-static u32 intel_panel_get_max_backlight(struct drm_device *dev)
+static u32 intel_panel_get_max_backlight(struct drm_device *dev,
+ enum pipe pipe)
{
u32 max;
- max = i915_read_blc_pwm_ctl(dev);
+ max = i915_read_blc_pwm_ctl(dev, pipe);
if (HAS_PCH_SPLIT(dev)) {
max >>= 16;
@@ -410,7 +411,8 @@ MODULE_PARM_DESC(invert_brightness, "Invert backlight brightness "
"to dri-devel@lists.freedesktop.org, if your machine needs it. "
"It will then be included in an upcoming module version.");
module_param_named(invert_brightness, i915_panel_invert_brightness, int, 0600);
-static u32 intel_panel_compute_brightness(struct drm_device *dev, u32 val)
+static u32 intel_panel_compute_brightness(struct drm_device *dev,
+ enum pipe pipe, u32 val)
{
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -419,7 +421,7 @@ static u32 intel_panel_compute_brightness(struct drm_device *dev, u32 val)
if (i915_panel_invert_brightness > 0 ||
dev_priv->quirks & QUIRK_INVERT_BRIGHTNESS) {
- u32 max = intel_panel_get_max_backlight(dev);
+ u32 max = intel_panel_get_max_backlight(dev, pipe);
if (max)
return max - val;
}
@@ -427,7 +429,8 @@ static u32 intel_panel_compute_brightness(struct drm_device *dev, u32 val)
return val;
}
-static u32 intel_panel_get_backlight(struct drm_device *dev)
+static u32 intel_panel_get_backlight(struct drm_device *dev,
+ enum pipe pipe)
{
struct drm_i915_private *dev_priv = dev->dev_private;
u32 val;
@@ -450,7 +453,7 @@ static u32 intel_panel_get_backlight(struct drm_device *dev)
}
}
- val = intel_panel_compute_brightness(dev, val);
+ val = intel_panel_compute_brightness(dev, pipe, val);
spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
@@ -466,19 +469,19 @@ static void intel_pch_panel_set_backlight(struct drm_device *dev, u32 level)
}
static void intel_panel_actually_set_backlight(struct drm_device *dev,
- u32 level)
+ enum pipe pipe, u32 level)
{
struct drm_i915_private *dev_priv = dev->dev_private;
u32 tmp;
DRM_DEBUG_DRIVER("set backlight PWM = %d\n", level);
- level = intel_panel_compute_brightness(dev, level);
+ level = intel_panel_compute_brightness(dev, pipe, level);
if (HAS_PCH_SPLIT(dev))
return intel_pch_panel_set_backlight(dev, level);
if (is_backlight_combination_mode(dev)) {
- u32 max = intel_panel_get_max_backlight(dev);
+ u32 max = intel_panel_get_max_backlight(dev, pipe);
u8 lbpc;
/* we're screwed, but keep behaviour backwards compatible */
@@ -498,15 +501,21 @@ static void intel_panel_actually_set_backlight(struct drm_device *dev,
}
/* set backlight brightness to level in range [0..max] */
-void intel_panel_set_backlight(struct drm_device *dev, u32 level, u32 max)
+void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
+ u32 max)
{
+ struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
+ enum pipe pipe = intel_get_pipe_from_connector(connector);
u32 freq;
unsigned long flags;
+ if (pipe == INVALID_PIPE)
+ return;
+
spin_lock_irqsave(&dev_priv->backlight.lock, flags);
- freq = intel_panel_get_max_backlight(dev);
+ freq = intel_panel_get_max_backlight(dev, pipe);
if (!freq) {
/* we are screwed, bail out */
goto out;
@@ -523,16 +532,21 @@ void intel_panel_set_backlight(struct drm_device *dev, u32 level, u32 max)
dev_priv->backlight.device->props.brightness = level;
if (dev_priv->backlight.enabled)
- intel_panel_actually_set_backlight(dev, level);
+ intel_panel_actually_set_backlight(dev, pipe, level);
out:
spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
}
-void intel_panel_disable_backlight(struct drm_device *dev)
+void intel_panel_disable_backlight(struct intel_connector *connector)
{
+ struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
+ enum pipe pipe = intel_get_pipe_from_connector(connector);
unsigned long flags;
+ if (pipe == INVALID_PIPE)
+ return;
+
/*
* Do not disable backlight on the vgaswitcheroo path. When switching
* away from i915, the other client may depend on i915 to handle the
@@ -547,7 +561,7 @@ void intel_panel_disable_backlight(struct drm_device *dev)
spin_lock_irqsave(&dev_priv->backlight.lock, flags);
dev_priv->backlight.enabled = false;
- intel_panel_actually_set_backlight(dev, 0);
+ intel_panel_actually_set_backlight(dev, pipe, 0);
if (INTEL_INFO(dev)->gen >= 4) {
uint32_t reg, tmp;
@@ -566,20 +580,25 @@ void intel_panel_disable_backlight(struct drm_device *dev)
spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
}
-void intel_panel_enable_backlight(struct drm_device *dev,
- enum pipe pipe)
+void intel_panel_enable_backlight(struct intel_connector *connector)
{
+ struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
+ enum pipe pipe = intel_get_pipe_from_connector(connector);
enum transcoder cpu_transcoder =
intel_pipe_to_cpu_transcoder(dev_priv, pipe);
unsigned long flags;
+ if (pipe == INVALID_PIPE)
+ return;
+
DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe));
spin_lock_irqsave(&dev_priv->backlight.lock, flags);
if (dev_priv->backlight.level == 0) {
- dev_priv->backlight.level = intel_panel_get_max_backlight(dev);
+ dev_priv->backlight.level = intel_panel_get_max_backlight(dev,
+ pipe);
if (dev_priv->backlight.device)
dev_priv->backlight.device->props.brightness =
dev_priv->backlight.level;
@@ -629,7 +648,8 @@ set_level:
* registers are set.
*/
dev_priv->backlight.enabled = true;
- intel_panel_actually_set_backlight(dev, dev_priv->backlight.level);
+ intel_panel_actually_set_backlight(dev, pipe,
+ dev_priv->backlight.level);
spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
}
@@ -652,7 +672,7 @@ static void intel_panel_init_backlight(struct drm_device *dev)
intel_panel_init_backlight_regs(dev);
- dev_priv->backlight.level = intel_panel_get_backlight(dev);
+ dev_priv->backlight.level = intel_panel_get_backlight(dev, 0);
dev_priv->backlight.enabled = dev_priv->backlight.level != 0;
}
@@ -681,18 +701,31 @@ intel_panel_detect(struct drm_device *dev)
#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
static int intel_panel_update_status(struct backlight_device *bd)
{
- struct drm_device *dev = bl_get_data(bd);
+ struct intel_connector *connector = bl_get_data(bd);
+ struct drm_device *dev = connector->base.dev;
+
+ mutex_lock(&dev->mode_config.mutex);
DRM_DEBUG_KMS("updating intel_backlight, brightness=%d/%d\n",
bd->props.brightness, bd->props.max_brightness);
- intel_panel_set_backlight(dev, bd->props.brightness,
+ intel_panel_set_backlight(connector, bd->props.brightness,
bd->props.max_brightness);
+ mutex_unlock(&dev->mode_config.mutex);
return 0;
}
static int intel_panel_get_brightness(struct backlight_device *bd)
{
- struct drm_device *dev = bl_get_data(bd);
- return intel_panel_get_backlight(dev);
+ struct intel_connector *connector = bl_get_data(bd);
+ struct drm_device *dev = connector->base.dev;
+ enum pipe pipe;
+
+ mutex_lock(&dev->mode_config.mutex);
+ pipe = intel_get_pipe_from_connector(connector);
+ mutex_unlock(&dev->mode_config.mutex);
+ if (pipe == INVALID_PIPE)
+ return 0;
+
+ return intel_panel_get_backlight(connector->base.dev, pipe);
}
static const struct backlight_ops intel_panel_bl_ops = {
@@ -717,7 +750,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
props.brightness = dev_priv->backlight.level;
spin_lock_irqsave(&dev_priv->backlight.lock, flags);
- props.max_brightness = intel_panel_get_max_backlight(dev);
+ props.max_brightness = intel_panel_get_max_backlight(dev, 0);
spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
if (props.max_brightness == 0) {
@@ -726,7 +759,8 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
}
dev_priv->backlight.device =
backlight_device_register("intel_backlight",
- connector->kdev, dev,
+ connector->kdev,
+ to_intel_connector(connector),
&intel_panel_bl_ops, &props);
if (IS_ERR(dev_priv->backlight.device)) {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 2/7] drm/i915: make backlight functions take a connector
2013-10-31 16:55 ` [PATCH 2/7] drm/i915: make backlight functions take a connector Jani Nikula
@ 2013-11-06 17:08 ` Joe Konno
0 siblings, 0 replies; 19+ messages in thread
From: Joe Konno @ 2013-11-06 17:08 UTC (permalink / raw)
To: intel-gfx
On 10/31/2013 09:55 AM, Jani Nikula wrote:
> From: Jesse Barnes <jbarnes@virtuousgeek.org>
>
> On VLV/BYT, backlight controls a per-pipe, so when adjusting the
> backlight we need to pass the correct info. So make the externally
> visible backlight functions take a connector argument, which can be used
> internally to figure out the pipe backlight to adjust.
>
> v2: make connector pipe lookup check for NULL crtc (Jani)
> fixup connector check in ASLE code (Jani)
> v3: make sure we take the mode config lock around lookups (Daniel)
> v4: fix double unlock in panel_get_brightness (Daniel)
> v5: push ASLE work into a work queue (Daniel)
> v6: separate ASLE work to a prep patch, rebase (Jani)
>
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 1 +
> drivers/gpu/drm/i915/intel_display.c | 12 +++++
> drivers/gpu/drm/i915/intel_dp.c | 5 +-
> drivers/gpu/drm/i915/intel_drv.h | 8 +--
> drivers/gpu/drm/i915/intel_lvds.c | 9 ++--
> drivers/gpu/drm/i915/intel_opregion.c | 38 ++++++++++++++-
> drivers/gpu/drm/i915/intel_panel.c | 86 +++++++++++++++++++++++----------
> 7 files changed, 122 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 6308711..83eda64 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -54,6 +54,7 @@
> #define DRIVER_DATE "20080730"
>
> enum pipe {
> + INVALID_PIPE = -1,
> PIPE_A = 0,
> PIPE_B,
> PIPE_C,
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 8f40ae3..606a594 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -9858,6 +9858,18 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
> drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);
> }
>
> +enum pipe intel_get_pipe_from_connector(struct intel_connector *connector)
> +{
> + struct drm_encoder *encoder = connector->base.encoder;
> +
> + WARN_ON(!mutex_is_locked(&connector->base.dev->mode_config.mutex));
> +
> + if (!encoder)
> + return INVALID_PIPE;
> +
> + return to_intel_crtc(encoder->crtc)->pipe;
> +}
> +
> int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
> struct drm_file *file)
> {
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 8db1fda..0ca98825 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1249,7 +1249,6 @@ void ironlake_edp_backlight_on(struct intel_dp *intel_dp)
> struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> struct drm_device *dev = intel_dig_port->base.base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> - int pipe = to_intel_crtc(intel_dig_port->base.base.crtc)->pipe;
> u32 pp;
> u32 pp_ctrl_reg;
>
> @@ -1272,7 +1271,7 @@ void ironlake_edp_backlight_on(struct intel_dp *intel_dp)
> I915_WRITE(pp_ctrl_reg, pp);
> POSTING_READ(pp_ctrl_reg);
>
> - intel_panel_enable_backlight(dev, pipe);
> + intel_panel_enable_backlight(intel_dp->attached_connector);
> }
>
> void ironlake_edp_backlight_off(struct intel_dp *intel_dp)
> @@ -1285,7 +1284,7 @@ void ironlake_edp_backlight_off(struct intel_dp *intel_dp)
> if (!is_edp(intel_dp))
> return;
>
> - intel_panel_disable_backlight(dev);
> + intel_panel_disable_backlight(intel_dp->attached_connector);
>
> DRM_DEBUG_KMS("\n");
> pp = ironlake_get_pp_control(intel_dp);
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 9d2624f..1e49aa8 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -630,6 +630,7 @@ void intel_connector_attach_encoder(struct intel_connector *connector,
> struct drm_encoder *intel_best_encoder(struct drm_connector *connector);
> struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
> struct drm_crtc *crtc);
> +enum pipe intel_get_pipe_from_connector(struct intel_connector *connector);
> int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
> struct drm_file *file_priv);
> enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,
> @@ -802,10 +803,11 @@ void intel_pch_panel_fitting(struct intel_crtc *crtc,
> void intel_gmch_panel_fitting(struct intel_crtc *crtc,
> struct intel_crtc_config *pipe_config,
> int fitting_mode);
> -void intel_panel_set_backlight(struct drm_device *dev, u32 level, u32 max);
> +void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
> + u32 max);
> int intel_panel_setup_backlight(struct drm_connector *connector);
> -void intel_panel_enable_backlight(struct drm_device *dev, enum pipe pipe);
> -void intel_panel_disable_backlight(struct drm_device *dev);
> +void intel_panel_enable_backlight(struct intel_connector *connector);
> +void intel_panel_disable_backlight(struct intel_connector *connector);
> void intel_panel_destroy_backlight(struct drm_device *dev);
> enum drm_connector_status intel_panel_detect(struct drm_device *dev);
>
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index b0ef558..c3b4da7 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -206,7 +206,8 @@ static void intel_enable_lvds(struct intel_encoder *encoder)
> {
> struct drm_device *dev = encoder->base.dev;
> struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
> - struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
> + struct intel_connector *intel_connector =
> + &lvds_encoder->attached_connector->base;
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 ctl_reg, stat_reg;
>
> @@ -225,13 +226,15 @@ static void intel_enable_lvds(struct intel_encoder *encoder)
> if (wait_for((I915_READ(stat_reg) & PP_ON) != 0, 1000))
> DRM_ERROR("timed out waiting for panel to power on\n");
>
> - intel_panel_enable_backlight(dev, intel_crtc->pipe);
> + intel_panel_enable_backlight(intel_connector);
> }
>
> static void intel_disable_lvds(struct intel_encoder *encoder)
> {
> struct drm_device *dev = encoder->base.dev;
> struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
> + struct intel_connector *intel_connector =
> + &lvds_encoder->attached_connector->base;
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 ctl_reg, stat_reg;
>
> @@ -243,7 +246,7 @@ static void intel_disable_lvds(struct intel_encoder *encoder)
> stat_reg = PP_STATUS;
> }
>
> - intel_panel_disable_backlight(dev);
> + intel_panel_disable_backlight(intel_connector);
>
> I915_WRITE(ctl_reg, I915_READ(ctl_reg) & ~POWER_TARGET_ON);
> if (wait_for((I915_READ(stat_reg) & PP_ON) == 0, 1000))
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index 892d520..91b68dc 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -396,7 +396,13 @@ int intel_opregion_notify_adapter(struct drm_device *dev, pci_power_t state)
> static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_encoder *encoder;
> + struct drm_connector *connector;
> + struct intel_connector *intel_connector = NULL;
> + struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[0];
> struct opregion_asle __iomem *asle = dev_priv->opregion.asle;
> + u32 ret = 0;
> + bool found = false;
>
> DRM_DEBUG_DRIVER("bclp = 0x%08x\n", bclp);
>
> @@ -407,11 +413,39 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
> if (bclp > 255)
> return ASLC_BACKLIGHT_FAILED;
>
> + mutex_lock(&dev->mode_config.mutex);
> + /*
> + * Could match the OpRegion connector here instead, but we'd also need
> + * to verify the connector could handle a backlight call.
> + */
> + list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)
> + if (encoder->crtc == crtc) {
> + found = true;
> + break;
> + }
> +
> + if (!found) {
> + ret = ASLC_BACKLIGHT_FAILED;
> + goto out;
> + }
> +
> + list_for_each_entry(connector, &dev->mode_config.connector_list, head)
> + if (connector->encoder == encoder)
> + intel_connector = to_intel_connector(connector);
> +
> + if (!intel_connector) {
> + ret = ASLC_BACKLIGHT_FAILED;
> + goto out;
> + }
> +
> DRM_DEBUG_KMS("updating opregion backlight %d/255\n", bclp);
> - intel_panel_set_backlight(dev, bclp, 255);
> + intel_panel_set_backlight(intel_connector, bclp, 255);
> iowrite32(DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID, &asle->cblv);
>
> - return 0;
> +out:
> + mutex_unlock(&dev->mode_config.mutex);
> +
> + return ret;
> }
>
> static u32 asle_set_als_illum(struct drm_device *dev, u32 alsi)
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index 09b2994..0f1ebc8 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -341,7 +341,7 @@ static int is_backlight_combination_mode(struct drm_device *dev)
> /* XXX: query mode clock or hardware clock and program max PWM appropriately
> * when it's 0.
> */
> -static u32 i915_read_blc_pwm_ctl(struct drm_device *dev)
> +static u32 i915_read_blc_pwm_ctl(struct drm_device *dev, enum pipe pipe)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 val;
> @@ -380,11 +380,12 @@ static u32 i915_read_blc_pwm_ctl(struct drm_device *dev)
> return val;
> }
>
> -static u32 intel_panel_get_max_backlight(struct drm_device *dev)
> +static u32 intel_panel_get_max_backlight(struct drm_device *dev,
> + enum pipe pipe)
> {
> u32 max;
>
> - max = i915_read_blc_pwm_ctl(dev);
> + max = i915_read_blc_pwm_ctl(dev, pipe);
>
> if (HAS_PCH_SPLIT(dev)) {
> max >>= 16;
> @@ -410,7 +411,8 @@ MODULE_PARM_DESC(invert_brightness, "Invert backlight brightness "
> "to dri-devel@lists.freedesktop.org, if your machine needs it. "
> "It will then be included in an upcoming module version.");
> module_param_named(invert_brightness, i915_panel_invert_brightness, int, 0600);
> -static u32 intel_panel_compute_brightness(struct drm_device *dev, u32 val)
> +static u32 intel_panel_compute_brightness(struct drm_device *dev,
> + enum pipe pipe, u32 val)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> @@ -419,7 +421,7 @@ static u32 intel_panel_compute_brightness(struct drm_device *dev, u32 val)
>
> if (i915_panel_invert_brightness > 0 ||
> dev_priv->quirks & QUIRK_INVERT_BRIGHTNESS) {
> - u32 max = intel_panel_get_max_backlight(dev);
> + u32 max = intel_panel_get_max_backlight(dev, pipe);
> if (max)
> return max - val;
> }
> @@ -427,7 +429,8 @@ static u32 intel_panel_compute_brightness(struct drm_device *dev, u32 val)
> return val;
> }
>
> -static u32 intel_panel_get_backlight(struct drm_device *dev)
> +static u32 intel_panel_get_backlight(struct drm_device *dev,
> + enum pipe pipe)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 val;
> @@ -450,7 +453,7 @@ static u32 intel_panel_get_backlight(struct drm_device *dev)
> }
> }
>
> - val = intel_panel_compute_brightness(dev, val);
> + val = intel_panel_compute_brightness(dev, pipe, val);
>
> spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
>
> @@ -466,19 +469,19 @@ static void intel_pch_panel_set_backlight(struct drm_device *dev, u32 level)
> }
>
> static void intel_panel_actually_set_backlight(struct drm_device *dev,
> - u32 level)
> + enum pipe pipe, u32 level)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 tmp;
>
> DRM_DEBUG_DRIVER("set backlight PWM = %d\n", level);
> - level = intel_panel_compute_brightness(dev, level);
> + level = intel_panel_compute_brightness(dev, pipe, level);
>
> if (HAS_PCH_SPLIT(dev))
> return intel_pch_panel_set_backlight(dev, level);
>
> if (is_backlight_combination_mode(dev)) {
> - u32 max = intel_panel_get_max_backlight(dev);
> + u32 max = intel_panel_get_max_backlight(dev, pipe);
> u8 lbpc;
>
> /* we're screwed, but keep behaviour backwards compatible */
> @@ -498,15 +501,21 @@ static void intel_panel_actually_set_backlight(struct drm_device *dev,
> }
>
> /* set backlight brightness to level in range [0..max] */
> -void intel_panel_set_backlight(struct drm_device *dev, u32 level, u32 max)
> +void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
> + u32 max)
> {
> + struct drm_device *dev = connector->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> + enum pipe pipe = intel_get_pipe_from_connector(connector);
> u32 freq;
> unsigned long flags;
>
> + if (pipe == INVALID_PIPE)
> + return;
> +
> spin_lock_irqsave(&dev_priv->backlight.lock, flags);
>
> - freq = intel_panel_get_max_backlight(dev);
> + freq = intel_panel_get_max_backlight(dev, pipe);
> if (!freq) {
> /* we are screwed, bail out */
> goto out;
> @@ -523,16 +532,21 @@ void intel_panel_set_backlight(struct drm_device *dev, u32 level, u32 max)
> dev_priv->backlight.device->props.brightness = level;
>
> if (dev_priv->backlight.enabled)
> - intel_panel_actually_set_backlight(dev, level);
> + intel_panel_actually_set_backlight(dev, pipe, level);
> out:
> spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
> }
>
> -void intel_panel_disable_backlight(struct drm_device *dev)
> +void intel_panel_disable_backlight(struct intel_connector *connector)
> {
> + struct drm_device *dev = connector->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> + enum pipe pipe = intel_get_pipe_from_connector(connector);
> unsigned long flags;
>
> + if (pipe == INVALID_PIPE)
> + return;
> +
> /*
> * Do not disable backlight on the vgaswitcheroo path. When switching
> * away from i915, the other client may depend on i915 to handle the
> @@ -547,7 +561,7 @@ void intel_panel_disable_backlight(struct drm_device *dev)
> spin_lock_irqsave(&dev_priv->backlight.lock, flags);
>
> dev_priv->backlight.enabled = false;
> - intel_panel_actually_set_backlight(dev, 0);
> + intel_panel_actually_set_backlight(dev, pipe, 0);
>
> if (INTEL_INFO(dev)->gen >= 4) {
> uint32_t reg, tmp;
> @@ -566,20 +580,25 @@ void intel_panel_disable_backlight(struct drm_device *dev)
> spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
> }
>
> -void intel_panel_enable_backlight(struct drm_device *dev,
> - enum pipe pipe)
> +void intel_panel_enable_backlight(struct intel_connector *connector)
> {
> + struct drm_device *dev = connector->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> + enum pipe pipe = intel_get_pipe_from_connector(connector);
> enum transcoder cpu_transcoder =
> intel_pipe_to_cpu_transcoder(dev_priv, pipe);
> unsigned long flags;
>
> + if (pipe == INVALID_PIPE)
> + return;
> +
> DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe));
>
> spin_lock_irqsave(&dev_priv->backlight.lock, flags);
>
> if (dev_priv->backlight.level == 0) {
> - dev_priv->backlight.level = intel_panel_get_max_backlight(dev);
> + dev_priv->backlight.level = intel_panel_get_max_backlight(dev,
> + pipe);
> if (dev_priv->backlight.device)
> dev_priv->backlight.device->props.brightness =
> dev_priv->backlight.level;
> @@ -629,7 +648,8 @@ set_level:
> * registers are set.
> */
> dev_priv->backlight.enabled = true;
> - intel_panel_actually_set_backlight(dev, dev_priv->backlight.level);
> + intel_panel_actually_set_backlight(dev, pipe,
> + dev_priv->backlight.level);
>
> spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
> }
> @@ -652,7 +672,7 @@ static void intel_panel_init_backlight(struct drm_device *dev)
>
> intel_panel_init_backlight_regs(dev);
>
> - dev_priv->backlight.level = intel_panel_get_backlight(dev);
> + dev_priv->backlight.level = intel_panel_get_backlight(dev, 0);
> dev_priv->backlight.enabled = dev_priv->backlight.level != 0;
> }
>
> @@ -681,18 +701,31 @@ intel_panel_detect(struct drm_device *dev)
> #if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
> static int intel_panel_update_status(struct backlight_device *bd)
> {
> - struct drm_device *dev = bl_get_data(bd);
> + struct intel_connector *connector = bl_get_data(bd);
> + struct drm_device *dev = connector->base.dev;
> +
> + mutex_lock(&dev->mode_config.mutex);
> DRM_DEBUG_KMS("updating intel_backlight, brightness=%d/%d\n",
> bd->props.brightness, bd->props.max_brightness);
> - intel_panel_set_backlight(dev, bd->props.brightness,
> + intel_panel_set_backlight(connector, bd->props.brightness,
> bd->props.max_brightness);
> + mutex_unlock(&dev->mode_config.mutex);
> return 0;
> }
>
> static int intel_panel_get_brightness(struct backlight_device *bd)
> {
> - struct drm_device *dev = bl_get_data(bd);
> - return intel_panel_get_backlight(dev);
> + struct intel_connector *connector = bl_get_data(bd);
> + struct drm_device *dev = connector->base.dev;
> + enum pipe pipe;
> +
> + mutex_lock(&dev->mode_config.mutex);
> + pipe = intel_get_pipe_from_connector(connector);
> + mutex_unlock(&dev->mode_config.mutex);
> + if (pipe == INVALID_PIPE)
> + return 0;
> +
> + return intel_panel_get_backlight(connector->base.dev, pipe);
> }
>
> static const struct backlight_ops intel_panel_bl_ops = {
> @@ -717,7 +750,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
> props.brightness = dev_priv->backlight.level;
>
> spin_lock_irqsave(&dev_priv->backlight.lock, flags);
> - props.max_brightness = intel_panel_get_max_backlight(dev);
> + props.max_brightness = intel_panel_get_max_backlight(dev, 0);
> spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
>
> if (props.max_brightness == 0) {
> @@ -726,7 +759,8 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
> }
> dev_priv->backlight.device =
> backlight_device_register("intel_backlight",
> - connector->kdev, dev,
> + connector->kdev,
> + to_intel_connector(connector),
> &intel_panel_bl_ops, &props);
>
> if (IS_ERR(dev_priv->backlight.device)) {
>
Tested-by: Joe Konno <joe.konno@intel.com>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 3/7] drm/i915/vlv: use per-pipe backlight controls v2
2013-10-31 16:55 [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs Jani Nikula
2013-10-31 16:55 ` [PATCH 1/7] drm/i915: move opregion asle request handling to a work queue Jani Nikula
2013-10-31 16:55 ` [PATCH 2/7] drm/i915: make backlight functions take a connector Jani Nikula
@ 2013-10-31 16:55 ` Jani Nikula
2013-11-06 17:09 ` Joe Konno
2013-10-31 16:55 ` [PATCH 4/7] drm/i915: clean up backlight conditional build Jani Nikula
` (4 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2013-10-31 16:55 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, jesse.barnes
From: Jesse Barnes <jbarnes@virtuousgeek.org>
With the connector and pipe passed around, we can now set the backlight
on the right pipe on VLV/BYT.
v2: drop combination mode check for VLV (Jani)
add save/restore code for VLV backlight regs (Jani)
check for existing modulation freq when initializing backlight regs (Jani)
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 3 ++
drivers/gpu/drm/i915/i915_reg.h | 15 ++++++++
drivers/gpu/drm/i915/i915_suspend.c | 29 +++++++++++++++
drivers/gpu/drm/i915/intel_panel.c | 67 ++++++++++++++++++++++++++++-------
4 files changed, 102 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 83eda64..16fae30 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -745,6 +745,9 @@ struct i915_suspend_saved_registers {
u32 saveBLC_HIST_CTL;
u32 saveBLC_PWM_CTL;
u32 saveBLC_PWM_CTL2;
+ u32 saveBLC_HIST_CTL_B;
+ u32 saveBLC_PWM_CTL_B;
+ u32 saveBLC_PWM_CTL2_B;
u32 saveBLC_CPU_PWM_CTL;
u32 saveBLC_CPU_PWM_CTL2;
u32 saveFPB0;
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 4d2db59..e2f3dd4 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2387,6 +2387,21 @@
#define PFIT_AUTO_RATIOS (dev_priv->info->display_mmio_offset + 0x61238)
+#define _VLV_BLC_PWM_CTL2_A (dev_priv->info->display_mmio_offset + 0x61250)
+#define _VLV_BLC_PWM_CTL2_B (dev_priv->info->display_mmio_offset + 0x61350)
+#define VLV_BLC_PWM_CTL2(pipe) _PIPE(pipe, _VLV_BLC_PWM_CTL2_A, \
+ _VLV_BLC_PWM_CTL2_B)
+
+#define _VLV_BLC_PWM_CTL_A (dev_priv->info->display_mmio_offset + 0x61254)
+#define _VLV_BLC_PWM_CTL_B (dev_priv->info->display_mmio_offset + 0x61354)
+#define VLV_BLC_PWM_CTL(pipe) _PIPE(pipe, _VLV_BLC_PWM_CTL_A, \
+ _VLV_BLC_PWM_CTL_B)
+
+#define _VLV_BLC_HIST_CTL_A (dev_priv->info->display_mmio_offset + 0x61260)
+#define _VLV_BLC_HIST_CTL_B (dev_priv->info->display_mmio_offset + 0x61360)
+#define VLV_BLC_HIST_CTL(pipe) _PIPE(pipe, _VLV_BLC_HIST_CTL_A, \
+ _VLV_BLC_HIST_CTL_B)
+
/* Backlight control */
#define BLC_PWM_CTL2 (dev_priv->info->display_mmio_offset + 0x61250) /* 965+ only */
#define BLM_PWM_ENABLE (1 << 31)
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index a088f1f..98790c7 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -214,6 +214,22 @@ static void i915_save_display(struct drm_device *dev)
dev_priv->regfile.saveBLC_CPU_PWM_CTL2 = I915_READ(BLC_PWM_CPU_CTL2);
if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev))
dev_priv->regfile.saveLVDS = I915_READ(PCH_LVDS);
+ } else if (IS_VALLEYVIEW(dev)) {
+ dev_priv->regfile.savePP_CONTROL = I915_READ(PP_CONTROL);
+ dev_priv->regfile.savePFIT_PGM_RATIOS = I915_READ(PFIT_PGM_RATIOS);
+
+ dev_priv->regfile.saveBLC_PWM_CTL =
+ I915_READ(VLV_BLC_PWM_CTL(PIPE_A));
+ dev_priv->regfile.saveBLC_HIST_CTL =
+ I915_READ(VLV_BLC_HIST_CTL(PIPE_A));
+ dev_priv->regfile.saveBLC_PWM_CTL2 =
+ I915_READ(VLV_BLC_PWM_CTL2(PIPE_A));
+ dev_priv->regfile.saveBLC_PWM_CTL_B =
+ I915_READ(VLV_BLC_PWM_CTL(PIPE_B));
+ dev_priv->regfile.saveBLC_HIST_CTL_B =
+ I915_READ(VLV_BLC_HIST_CTL(PIPE_B));
+ dev_priv->regfile.saveBLC_PWM_CTL2_B =
+ I915_READ(VLV_BLC_PWM_CTL2(PIPE_B));
} else {
dev_priv->regfile.savePP_CONTROL = I915_READ(PP_CONTROL);
dev_priv->regfile.savePFIT_PGM_RATIOS = I915_READ(PFIT_PGM_RATIOS);
@@ -302,6 +318,19 @@ static void i915_restore_display(struct drm_device *dev)
I915_WRITE(PCH_PP_CONTROL, dev_priv->regfile.savePP_CONTROL);
I915_WRITE(RSTDBYCTL,
dev_priv->regfile.saveMCHBAR_RENDER_STANDBY);
+ } else if (IS_VALLEYVIEW(dev)) {
+ I915_WRITE(VLV_BLC_PWM_CTL(PIPE_A),
+ dev_priv->regfile.saveBLC_PWM_CTL);
+ I915_WRITE(VLV_BLC_HIST_CTL(PIPE_A),
+ dev_priv->regfile.saveBLC_HIST_CTL);
+ I915_WRITE(VLV_BLC_PWM_CTL2(PIPE_A),
+ dev_priv->regfile.saveBLC_PWM_CTL2);
+ I915_WRITE(VLV_BLC_PWM_CTL(PIPE_B),
+ dev_priv->regfile.saveBLC_PWM_CTL);
+ I915_WRITE(VLV_BLC_HIST_CTL(PIPE_B),
+ dev_priv->regfile.saveBLC_HIST_CTL);
+ I915_WRITE(VLV_BLC_PWM_CTL2(PIPE_B),
+ dev_priv->regfile.saveBLC_PWM_CTL2);
} else {
I915_WRITE(PFIT_PGM_RATIOS, dev_priv->regfile.savePFIT_PGM_RATIOS);
I915_WRITE(BLC_PWM_CTL, dev_priv->regfile.saveBLC_PWM_CTL);
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 0f1ebc8..f161ac0 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -358,6 +358,21 @@ static u32 i915_read_blc_pwm_ctl(struct drm_device *dev, enum pipe pipe)
val = dev_priv->regfile.saveBLC_PWM_CTL2;
I915_WRITE(BLC_PWM_PCH_CTL2, val);
}
+ } else if (IS_VALLEYVIEW(dev)) {
+ val = I915_READ(VLV_BLC_PWM_CTL(pipe));
+ if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
+ dev_priv->regfile.saveBLC_PWM_CTL = val;
+ dev_priv->regfile.saveBLC_PWM_CTL2 =
+ I915_READ(VLV_BLC_PWM_CTL2(pipe));
+ } else if (val == 0) {
+ val = dev_priv->regfile.saveBLC_PWM_CTL;
+ I915_WRITE(VLV_BLC_PWM_CTL(pipe), val);
+ I915_WRITE(VLV_BLC_PWM_CTL2(pipe),
+ dev_priv->regfile.saveBLC_PWM_CTL2);
+ }
+
+ if (!val)
+ val = 0x0f42ffff;
} else {
val = I915_READ(BLC_PWM_CTL);
if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
@@ -372,9 +387,6 @@ static u32 i915_read_blc_pwm_ctl(struct drm_device *dev, enum pipe pipe)
I915_WRITE(BLC_PWM_CTL2,
dev_priv->regfile.saveBLC_PWM_CTL2);
}
-
- if (IS_VALLEYVIEW(dev) && !val)
- val = 0x0f42ffff;
}
return val;
@@ -435,13 +447,19 @@ static u32 intel_panel_get_backlight(struct drm_device *dev,
struct drm_i915_private *dev_priv = dev->dev_private;
u32 val;
unsigned long flags;
+ int reg;
spin_lock_irqsave(&dev_priv->backlight.lock, flags);
if (HAS_PCH_SPLIT(dev)) {
val = I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
} else {
- val = I915_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
+ if (IS_VALLEYVIEW(dev))
+ reg = VLV_BLC_PWM_CTL(pipe);
+ else
+ reg = BLC_PWM_CTL;
+
+ val = I915_READ(reg) & BACKLIGHT_DUTY_CYCLE_MASK;
if (INTEL_INFO(dev)->gen < 4)
val >>= 1;
@@ -473,6 +491,7 @@ static void intel_panel_actually_set_backlight(struct drm_device *dev,
{
struct drm_i915_private *dev_priv = dev->dev_private;
u32 tmp;
+ int reg;
DRM_DEBUG_DRIVER("set backlight PWM = %d\n", level);
level = intel_panel_compute_brightness(dev, pipe, level);
@@ -493,11 +512,16 @@ static void intel_panel_actually_set_backlight(struct drm_device *dev,
pci_write_config_byte(dev->pdev, PCI_LBPC, lbpc);
}
- tmp = I915_READ(BLC_PWM_CTL);
+ if (IS_VALLEYVIEW(dev))
+ reg = VLV_BLC_PWM_CTL(pipe);
+ else
+ reg = BLC_PWM_CTL;
+
+ tmp = I915_READ(reg);
if (INTEL_INFO(dev)->gen < 4)
level <<= 1;
tmp &= ~BACKLIGHT_DUTY_CYCLE_MASK;
- I915_WRITE(BLC_PWM_CTL, tmp | level);
+ I915_WRITE(reg, tmp | level);
}
/* set backlight brightness to level in range [0..max] */
@@ -566,7 +590,12 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
if (INTEL_INFO(dev)->gen >= 4) {
uint32_t reg, tmp;
- reg = HAS_PCH_SPLIT(dev) ? BLC_PWM_CPU_CTL2 : BLC_PWM_CTL2;
+ if (HAS_PCH_SPLIT(dev))
+ reg = BLC_PWM_CPU_CTL2;
+ else if (IS_VALLEYVIEW(dev))
+ reg = VLV_BLC_PWM_CTL2(pipe);
+ else
+ reg = BLC_PWM_CTL2;
I915_WRITE(reg, I915_READ(reg) & ~BLM_PWM_ENABLE);
@@ -607,8 +636,12 @@ void intel_panel_enable_backlight(struct intel_connector *connector)
if (INTEL_INFO(dev)->gen >= 4) {
uint32_t reg, tmp;
- reg = HAS_PCH_SPLIT(dev) ? BLC_PWM_CPU_CTL2 : BLC_PWM_CTL2;
-
+ if (HAS_PCH_SPLIT(dev))
+ reg = BLC_PWM_CPU_CTL2;
+ else if (IS_VALLEYVIEW(dev))
+ reg = VLV_BLC_PWM_CTL2(pipe);
+ else
+ reg = BLC_PWM_CTL2;
tmp = I915_READ(reg);
@@ -660,9 +693,19 @@ static void intel_panel_init_backlight_regs(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private;
if (IS_VALLEYVIEW(dev)) {
- u32 cur_val = I915_READ(BLC_PWM_CTL) &
- BACKLIGHT_DUTY_CYCLE_MASK;
- I915_WRITE(BLC_PWM_CTL, (0xf42 << 16) | cur_val);
+ enum pipe pipe;
+
+ for_each_pipe(pipe) {
+ u32 cur_val = I915_READ(VLV_BLC_PWM_CTL(pipe));
+
+ /* Skip if the modulation freq is already set */
+ if (cur_val & ~BACKLIGHT_DUTY_CYCLE_MASK)
+ continue;
+
+ cur_val &= BACKLIGHT_DUTY_CYCLE_MASK;
+ I915_WRITE(VLV_BLC_PWM_CTL(pipe), (0xf42 << 16) |
+ cur_val);
+ }
}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 3/7] drm/i915/vlv: use per-pipe backlight controls v2
2013-10-31 16:55 ` [PATCH 3/7] drm/i915/vlv: use per-pipe backlight controls v2 Jani Nikula
@ 2013-11-06 17:09 ` Joe Konno
0 siblings, 0 replies; 19+ messages in thread
From: Joe Konno @ 2013-11-06 17:09 UTC (permalink / raw)
To: intel-gfx
On 10/31/2013 09:55 AM, Jani Nikula wrote:
> From: Jesse Barnes <jbarnes@virtuousgeek.org>
>
> With the connector and pipe passed around, we can now set the backlight
> on the right pipe on VLV/BYT.
>
> v2: drop combination mode check for VLV (Jani)
> add save/restore code for VLV backlight regs (Jani)
> check for existing modulation freq when initializing backlight regs (Jani)
>
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 3 ++
> drivers/gpu/drm/i915/i915_reg.h | 15 ++++++++
> drivers/gpu/drm/i915/i915_suspend.c | 29 +++++++++++++++
> drivers/gpu/drm/i915/intel_panel.c | 67 ++++++++++++++++++++++++++++-------
> 4 files changed, 102 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 83eda64..16fae30 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -745,6 +745,9 @@ struct i915_suspend_saved_registers {
> u32 saveBLC_HIST_CTL;
> u32 saveBLC_PWM_CTL;
> u32 saveBLC_PWM_CTL2;
> + u32 saveBLC_HIST_CTL_B;
> + u32 saveBLC_PWM_CTL_B;
> + u32 saveBLC_PWM_CTL2_B;
> u32 saveBLC_CPU_PWM_CTL;
> u32 saveBLC_CPU_PWM_CTL2;
> u32 saveFPB0;
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 4d2db59..e2f3dd4 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -2387,6 +2387,21 @@
>
> #define PFIT_AUTO_RATIOS (dev_priv->info->display_mmio_offset + 0x61238)
>
> +#define _VLV_BLC_PWM_CTL2_A (dev_priv->info->display_mmio_offset + 0x61250)
> +#define _VLV_BLC_PWM_CTL2_B (dev_priv->info->display_mmio_offset + 0x61350)
> +#define VLV_BLC_PWM_CTL2(pipe) _PIPE(pipe, _VLV_BLC_PWM_CTL2_A, \
> + _VLV_BLC_PWM_CTL2_B)
> +
> +#define _VLV_BLC_PWM_CTL_A (dev_priv->info->display_mmio_offset + 0x61254)
> +#define _VLV_BLC_PWM_CTL_B (dev_priv->info->display_mmio_offset + 0x61354)
> +#define VLV_BLC_PWM_CTL(pipe) _PIPE(pipe, _VLV_BLC_PWM_CTL_A, \
> + _VLV_BLC_PWM_CTL_B)
> +
> +#define _VLV_BLC_HIST_CTL_A (dev_priv->info->display_mmio_offset + 0x61260)
> +#define _VLV_BLC_HIST_CTL_B (dev_priv->info->display_mmio_offset + 0x61360)
> +#define VLV_BLC_HIST_CTL(pipe) _PIPE(pipe, _VLV_BLC_HIST_CTL_A, \
> + _VLV_BLC_HIST_CTL_B)
> +
> /* Backlight control */
> #define BLC_PWM_CTL2 (dev_priv->info->display_mmio_offset + 0x61250) /* 965+ only */
> #define BLM_PWM_ENABLE (1 << 31)
> diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
> index a088f1f..98790c7 100644
> --- a/drivers/gpu/drm/i915/i915_suspend.c
> +++ b/drivers/gpu/drm/i915/i915_suspend.c
> @@ -214,6 +214,22 @@ static void i915_save_display(struct drm_device *dev)
> dev_priv->regfile.saveBLC_CPU_PWM_CTL2 = I915_READ(BLC_PWM_CPU_CTL2);
> if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev))
> dev_priv->regfile.saveLVDS = I915_READ(PCH_LVDS);
> + } else if (IS_VALLEYVIEW(dev)) {
> + dev_priv->regfile.savePP_CONTROL = I915_READ(PP_CONTROL);
> + dev_priv->regfile.savePFIT_PGM_RATIOS = I915_READ(PFIT_PGM_RATIOS);
> +
> + dev_priv->regfile.saveBLC_PWM_CTL =
> + I915_READ(VLV_BLC_PWM_CTL(PIPE_A));
> + dev_priv->regfile.saveBLC_HIST_CTL =
> + I915_READ(VLV_BLC_HIST_CTL(PIPE_A));
> + dev_priv->regfile.saveBLC_PWM_CTL2 =
> + I915_READ(VLV_BLC_PWM_CTL2(PIPE_A));
> + dev_priv->regfile.saveBLC_PWM_CTL_B =
> + I915_READ(VLV_BLC_PWM_CTL(PIPE_B));
> + dev_priv->regfile.saveBLC_HIST_CTL_B =
> + I915_READ(VLV_BLC_HIST_CTL(PIPE_B));
> + dev_priv->regfile.saveBLC_PWM_CTL2_B =
> + I915_READ(VLV_BLC_PWM_CTL2(PIPE_B));
> } else {
> dev_priv->regfile.savePP_CONTROL = I915_READ(PP_CONTROL);
> dev_priv->regfile.savePFIT_PGM_RATIOS = I915_READ(PFIT_PGM_RATIOS);
> @@ -302,6 +318,19 @@ static void i915_restore_display(struct drm_device *dev)
> I915_WRITE(PCH_PP_CONTROL, dev_priv->regfile.savePP_CONTROL);
> I915_WRITE(RSTDBYCTL,
> dev_priv->regfile.saveMCHBAR_RENDER_STANDBY);
> + } else if (IS_VALLEYVIEW(dev)) {
> + I915_WRITE(VLV_BLC_PWM_CTL(PIPE_A),
> + dev_priv->regfile.saveBLC_PWM_CTL);
> + I915_WRITE(VLV_BLC_HIST_CTL(PIPE_A),
> + dev_priv->regfile.saveBLC_HIST_CTL);
> + I915_WRITE(VLV_BLC_PWM_CTL2(PIPE_A),
> + dev_priv->regfile.saveBLC_PWM_CTL2);
> + I915_WRITE(VLV_BLC_PWM_CTL(PIPE_B),
> + dev_priv->regfile.saveBLC_PWM_CTL);
> + I915_WRITE(VLV_BLC_HIST_CTL(PIPE_B),
> + dev_priv->regfile.saveBLC_HIST_CTL);
> + I915_WRITE(VLV_BLC_PWM_CTL2(PIPE_B),
> + dev_priv->regfile.saveBLC_PWM_CTL2);
> } else {
> I915_WRITE(PFIT_PGM_RATIOS, dev_priv->regfile.savePFIT_PGM_RATIOS);
> I915_WRITE(BLC_PWM_CTL, dev_priv->regfile.saveBLC_PWM_CTL);
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index 0f1ebc8..f161ac0 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -358,6 +358,21 @@ static u32 i915_read_blc_pwm_ctl(struct drm_device *dev, enum pipe pipe)
> val = dev_priv->regfile.saveBLC_PWM_CTL2;
> I915_WRITE(BLC_PWM_PCH_CTL2, val);
> }
> + } else if (IS_VALLEYVIEW(dev)) {
> + val = I915_READ(VLV_BLC_PWM_CTL(pipe));
> + if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
> + dev_priv->regfile.saveBLC_PWM_CTL = val;
> + dev_priv->regfile.saveBLC_PWM_CTL2 =
> + I915_READ(VLV_BLC_PWM_CTL2(pipe));
> + } else if (val == 0) {
> + val = dev_priv->regfile.saveBLC_PWM_CTL;
> + I915_WRITE(VLV_BLC_PWM_CTL(pipe), val);
> + I915_WRITE(VLV_BLC_PWM_CTL2(pipe),
> + dev_priv->regfile.saveBLC_PWM_CTL2);
> + }
> +
> + if (!val)
> + val = 0x0f42ffff;
> } else {
> val = I915_READ(BLC_PWM_CTL);
> if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
> @@ -372,9 +387,6 @@ static u32 i915_read_blc_pwm_ctl(struct drm_device *dev, enum pipe pipe)
> I915_WRITE(BLC_PWM_CTL2,
> dev_priv->regfile.saveBLC_PWM_CTL2);
> }
> -
> - if (IS_VALLEYVIEW(dev) && !val)
> - val = 0x0f42ffff;
> }
>
> return val;
> @@ -435,13 +447,19 @@ static u32 intel_panel_get_backlight(struct drm_device *dev,
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 val;
> unsigned long flags;
> + int reg;
>
> spin_lock_irqsave(&dev_priv->backlight.lock, flags);
>
> if (HAS_PCH_SPLIT(dev)) {
> val = I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
> } else {
> - val = I915_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
> + if (IS_VALLEYVIEW(dev))
> + reg = VLV_BLC_PWM_CTL(pipe);
> + else
> + reg = BLC_PWM_CTL;
> +
> + val = I915_READ(reg) & BACKLIGHT_DUTY_CYCLE_MASK;
> if (INTEL_INFO(dev)->gen < 4)
> val >>= 1;
>
> @@ -473,6 +491,7 @@ static void intel_panel_actually_set_backlight(struct drm_device *dev,
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 tmp;
> + int reg;
>
> DRM_DEBUG_DRIVER("set backlight PWM = %d\n", level);
> level = intel_panel_compute_brightness(dev, pipe, level);
> @@ -493,11 +512,16 @@ static void intel_panel_actually_set_backlight(struct drm_device *dev,
> pci_write_config_byte(dev->pdev, PCI_LBPC, lbpc);
> }
>
> - tmp = I915_READ(BLC_PWM_CTL);
> + if (IS_VALLEYVIEW(dev))
> + reg = VLV_BLC_PWM_CTL(pipe);
> + else
> + reg = BLC_PWM_CTL;
> +
> + tmp = I915_READ(reg);
> if (INTEL_INFO(dev)->gen < 4)
> level <<= 1;
> tmp &= ~BACKLIGHT_DUTY_CYCLE_MASK;
> - I915_WRITE(BLC_PWM_CTL, tmp | level);
> + I915_WRITE(reg, tmp | level);
> }
>
> /* set backlight brightness to level in range [0..max] */
> @@ -566,7 +590,12 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
> if (INTEL_INFO(dev)->gen >= 4) {
> uint32_t reg, tmp;
>
> - reg = HAS_PCH_SPLIT(dev) ? BLC_PWM_CPU_CTL2 : BLC_PWM_CTL2;
> + if (HAS_PCH_SPLIT(dev))
> + reg = BLC_PWM_CPU_CTL2;
> + else if (IS_VALLEYVIEW(dev))
> + reg = VLV_BLC_PWM_CTL2(pipe);
> + else
> + reg = BLC_PWM_CTL2;
>
> I915_WRITE(reg, I915_READ(reg) & ~BLM_PWM_ENABLE);
>
> @@ -607,8 +636,12 @@ void intel_panel_enable_backlight(struct intel_connector *connector)
> if (INTEL_INFO(dev)->gen >= 4) {
> uint32_t reg, tmp;
>
> - reg = HAS_PCH_SPLIT(dev) ? BLC_PWM_CPU_CTL2 : BLC_PWM_CTL2;
> -
> + if (HAS_PCH_SPLIT(dev))
> + reg = BLC_PWM_CPU_CTL2;
> + else if (IS_VALLEYVIEW(dev))
> + reg = VLV_BLC_PWM_CTL2(pipe);
> + else
> + reg = BLC_PWM_CTL2;
>
> tmp = I915_READ(reg);
>
> @@ -660,9 +693,19 @@ static void intel_panel_init_backlight_regs(struct drm_device *dev)
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> if (IS_VALLEYVIEW(dev)) {
> - u32 cur_val = I915_READ(BLC_PWM_CTL) &
> - BACKLIGHT_DUTY_CYCLE_MASK;
> - I915_WRITE(BLC_PWM_CTL, (0xf42 << 16) | cur_val);
> + enum pipe pipe;
> +
> + for_each_pipe(pipe) {
> + u32 cur_val = I915_READ(VLV_BLC_PWM_CTL(pipe));
> +
> + /* Skip if the modulation freq is already set */
> + if (cur_val & ~BACKLIGHT_DUTY_CYCLE_MASK)
> + continue;
> +
> + cur_val &= BACKLIGHT_DUTY_CYCLE_MASK;
> + I915_WRITE(VLV_BLC_PWM_CTL(pipe), (0xf42 << 16) |
> + cur_val);
> + }
> }
> }
>
>
Tested-by: Joe Konno <joe.konno@intel.com>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 4/7] drm/i915: clean up backlight conditional build
2013-10-31 16:55 [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs Jani Nikula
` (2 preceding siblings ...)
2013-10-31 16:55 ` [PATCH 3/7] drm/i915/vlv: use per-pipe backlight controls v2 Jani Nikula
@ 2013-10-31 16:55 ` Jani Nikula
2013-11-06 17:11 ` Joe Konno
2013-10-31 16:55 ` [PATCH 5/7] drm/i915: make backlight info per-connector Jani Nikula
` (3 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2013-10-31 16:55 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, jesse.barnes
I've always felt the backlight device conditional build has been all
backwards. Make it feel right.
Gently move things towards connector based stuff while at it.
There should be no functional changes, except for a slight
reordering/interleaving of connector backlight and sysfs destroy calls.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 9 +++--
drivers/gpu/drm/i915/intel_drv.h | 2 +-
drivers/gpu/drm/i915/intel_panel.c | 65 +++++++++++++++++++---------------
3 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 606a594..774407d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11007,12 +11007,11 @@ void intel_modeset_cleanup(struct drm_device *dev)
/* flush any delayed tasks or pending work */
flush_scheduled_work();
- /* destroy backlight, if any, before the connectors */
- intel_panel_destroy_backlight(dev);
-
- /* destroy the sysfs files before encoders/connectors */
- list_for_each_entry(connector, &dev->mode_config.connector_list, head)
+ /* destroy the backlight and sysfs files before encoders/connectors */
+ list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ intel_panel_destroy_backlight(connector);
drm_sysfs_connector_remove(connector);
+ }
drm_mode_config_cleanup(dev);
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 1e49aa8..5548180 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -808,7 +808,7 @@ void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
int intel_panel_setup_backlight(struct drm_connector *connector);
void intel_panel_enable_backlight(struct intel_connector *connector);
void intel_panel_disable_backlight(struct intel_connector *connector);
-void intel_panel_destroy_backlight(struct drm_device *dev);
+void intel_panel_destroy_backlight(struct drm_connector *connector);
enum drm_connector_status intel_panel_detect(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index f161ac0..a0d13d3 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -709,16 +709,6 @@ static void intel_panel_init_backlight_regs(struct drm_device *dev)
}
}
-static void intel_panel_init_backlight(struct drm_device *dev)
-{
- struct drm_i915_private *dev_priv = dev->dev_private;
-
- intel_panel_init_backlight_regs(dev);
-
- dev_priv->backlight.level = intel_panel_get_backlight(dev, 0);
- dev_priv->backlight.enabled = dev_priv->backlight.level != 0;
-}
-
enum drm_connector_status
intel_panel_detect(struct drm_device *dev)
{
@@ -742,7 +732,7 @@ intel_panel_detect(struct drm_device *dev)
}
#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
-static int intel_panel_update_status(struct backlight_device *bd)
+static int intel_backlight_device_update_status(struct backlight_device *bd)
{
struct intel_connector *connector = bl_get_data(bd);
struct drm_device *dev = connector->base.dev;
@@ -756,7 +746,7 @@ static int intel_panel_update_status(struct backlight_device *bd)
return 0;
}
-static int intel_panel_get_brightness(struct backlight_device *bd)
+static int intel_backlight_device_get_brightness(struct backlight_device *bd)
{
struct intel_connector *connector = bl_get_data(bd);
struct drm_device *dev = connector->base.dev;
@@ -771,20 +761,18 @@ static int intel_panel_get_brightness(struct backlight_device *bd)
return intel_panel_get_backlight(connector->base.dev, pipe);
}
-static const struct backlight_ops intel_panel_bl_ops = {
- .update_status = intel_panel_update_status,
- .get_brightness = intel_panel_get_brightness,
+static const struct backlight_ops intel_backlight_device_ops = {
+ .update_status = intel_backlight_device_update_status,
+ .get_brightness = intel_backlight_device_get_brightness,
};
-int intel_panel_setup_backlight(struct drm_connector *connector)
+static int intel_backlight_device_register(struct intel_connector *connector)
{
- struct drm_device *dev = connector->dev;
+ struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct backlight_properties props;
unsigned long flags;
- intel_panel_init_backlight(dev);
-
if (WARN_ON(dev_priv->backlight.device))
return -ENODEV;
@@ -802,9 +790,9 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
}
dev_priv->backlight.device =
backlight_device_register("intel_backlight",
- connector->kdev,
- to_intel_connector(connector),
- &intel_panel_bl_ops, &props);
+ connector->base.kdev,
+ connector,
+ &intel_backlight_device_ops, &props);
if (IS_ERR(dev_priv->backlight.device)) {
DRM_ERROR("Failed to register backlight: %ld\n",
@@ -815,26 +803,47 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
return 0;
}
-void intel_panel_destroy_backlight(struct drm_device *dev)
+static void intel_backlight_device_unregister(struct intel_connector *connector)
{
+ struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
if (dev_priv->backlight.device) {
backlight_device_unregister(dev_priv->backlight.device);
dev_priv->backlight.device = NULL;
}
}
-#else
+#else /* CONFIG_BACKLIGHT_CLASS_DEVICE */
+static int intel_backlight_device_register(struct intel_connector *connector)
+{
+ return 0;
+}
+static void intel_backlight_device_unregister(struct intel_connector *connector)
+{
+}
+#endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */
+
int intel_panel_setup_backlight(struct drm_connector *connector)
{
- intel_panel_init_backlight(connector->dev);
+ struct drm_device *dev = connector->dev;
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_connector *intel_connector = to_intel_connector(connector);
+
+ intel_panel_init_backlight_regs(dev);
+
+ dev_priv->backlight.level = intel_panel_get_backlight(dev, 0);
+ dev_priv->backlight.enabled = dev_priv->backlight.level != 0;
+
+ intel_backlight_device_register(intel_connector);
+
return 0;
}
-void intel_panel_destroy_backlight(struct drm_device *dev)
+void intel_panel_destroy_backlight(struct drm_connector *connector)
{
- return;
+ struct intel_connector *intel_connector = to_intel_connector(connector);
+
+ intel_backlight_device_unregister(intel_connector);
}
-#endif
int intel_panel_init(struct intel_panel *panel,
struct drm_display_mode *fixed_mode)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 4/7] drm/i915: clean up backlight conditional build
2013-10-31 16:55 ` [PATCH 4/7] drm/i915: clean up backlight conditional build Jani Nikula
@ 2013-11-06 17:11 ` Joe Konno
0 siblings, 0 replies; 19+ messages in thread
From: Joe Konno @ 2013-11-06 17:11 UTC (permalink / raw)
To: intel-gfx
On 10/31/2013 09:55 AM, Jani Nikula wrote:
> I've always felt the backlight device conditional build has been all
> backwards. Make it feel right.
>
> Gently move things towards connector based stuff while at it.
>
> There should be no functional changes, except for a slight
> reordering/interleaving of connector backlight and sysfs destroy calls.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 9 +++--
> drivers/gpu/drm/i915/intel_drv.h | 2 +-
> drivers/gpu/drm/i915/intel_panel.c | 65 +++++++++++++++++++---------------
> 3 files changed, 42 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 606a594..774407d 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -11007,12 +11007,11 @@ void intel_modeset_cleanup(struct drm_device *dev)
> /* flush any delayed tasks or pending work */
> flush_scheduled_work();
>
> - /* destroy backlight, if any, before the connectors */
> - intel_panel_destroy_backlight(dev);
> -
> - /* destroy the sysfs files before encoders/connectors */
> - list_for_each_entry(connector, &dev->mode_config.connector_list, head)
> + /* destroy the backlight and sysfs files before encoders/connectors */
> + list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> + intel_panel_destroy_backlight(connector);
> drm_sysfs_connector_remove(connector);
> + }
>
> drm_mode_config_cleanup(dev);
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 1e49aa8..5548180 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -808,7 +808,7 @@ void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
> int intel_panel_setup_backlight(struct drm_connector *connector);
> void intel_panel_enable_backlight(struct intel_connector *connector);
> void intel_panel_disable_backlight(struct intel_connector *connector);
> -void intel_panel_destroy_backlight(struct drm_device *dev);
> +void intel_panel_destroy_backlight(struct drm_connector *connector);
> enum drm_connector_status intel_panel_detect(struct drm_device *dev);
>
>
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index f161ac0..a0d13d3 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -709,16 +709,6 @@ static void intel_panel_init_backlight_regs(struct drm_device *dev)
> }
> }
>
> -static void intel_panel_init_backlight(struct drm_device *dev)
> -{
> - struct drm_i915_private *dev_priv = dev->dev_private;
> -
> - intel_panel_init_backlight_regs(dev);
> -
> - dev_priv->backlight.level = intel_panel_get_backlight(dev, 0);
> - dev_priv->backlight.enabled = dev_priv->backlight.level != 0;
> -}
> -
> enum drm_connector_status
> intel_panel_detect(struct drm_device *dev)
> {
> @@ -742,7 +732,7 @@ intel_panel_detect(struct drm_device *dev)
> }
>
> #if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
> -static int intel_panel_update_status(struct backlight_device *bd)
> +static int intel_backlight_device_update_status(struct backlight_device *bd)
> {
> struct intel_connector *connector = bl_get_data(bd);
> struct drm_device *dev = connector->base.dev;
> @@ -756,7 +746,7 @@ static int intel_panel_update_status(struct backlight_device *bd)
> return 0;
> }
>
> -static int intel_panel_get_brightness(struct backlight_device *bd)
> +static int intel_backlight_device_get_brightness(struct backlight_device *bd)
> {
> struct intel_connector *connector = bl_get_data(bd);
> struct drm_device *dev = connector->base.dev;
> @@ -771,20 +761,18 @@ static int intel_panel_get_brightness(struct backlight_device *bd)
> return intel_panel_get_backlight(connector->base.dev, pipe);
> }
>
> -static const struct backlight_ops intel_panel_bl_ops = {
> - .update_status = intel_panel_update_status,
> - .get_brightness = intel_panel_get_brightness,
> +static const struct backlight_ops intel_backlight_device_ops = {
> + .update_status = intel_backlight_device_update_status,
> + .get_brightness = intel_backlight_device_get_brightness,
> };
>
> -int intel_panel_setup_backlight(struct drm_connector *connector)
> +static int intel_backlight_device_register(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->dev;
> + struct drm_device *dev = connector->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct backlight_properties props;
> unsigned long flags;
>
> - intel_panel_init_backlight(dev);
> -
> if (WARN_ON(dev_priv->backlight.device))
> return -ENODEV;
>
> @@ -802,9 +790,9 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
> }
> dev_priv->backlight.device =
> backlight_device_register("intel_backlight",
> - connector->kdev,
> - to_intel_connector(connector),
> - &intel_panel_bl_ops, &props);
> + connector->base.kdev,
> + connector,
> + &intel_backlight_device_ops, &props);
>
> if (IS_ERR(dev_priv->backlight.device)) {
> DRM_ERROR("Failed to register backlight: %ld\n",
> @@ -815,26 +803,47 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
> return 0;
> }
>
> -void intel_panel_destroy_backlight(struct drm_device *dev)
> +static void intel_backlight_device_unregister(struct intel_connector *connector)
> {
> + struct drm_device *dev = connector->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> if (dev_priv->backlight.device) {
> backlight_device_unregister(dev_priv->backlight.device);
> dev_priv->backlight.device = NULL;
> }
> }
> -#else
> +#else /* CONFIG_BACKLIGHT_CLASS_DEVICE */
> +static int intel_backlight_device_register(struct intel_connector *connector)
> +{
> + return 0;
> +}
> +static void intel_backlight_device_unregister(struct intel_connector *connector)
> +{
> +}
> +#endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */
> +
> int intel_panel_setup_backlight(struct drm_connector *connector)
> {
> - intel_panel_init_backlight(connector->dev);
> + struct drm_device *dev = connector->dev;
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + struct intel_connector *intel_connector = to_intel_connector(connector);
> +
> + intel_panel_init_backlight_regs(dev);
> +
> + dev_priv->backlight.level = intel_panel_get_backlight(dev, 0);
> + dev_priv->backlight.enabled = dev_priv->backlight.level != 0;
> +
> + intel_backlight_device_register(intel_connector);
> +
> return 0;
> }
>
> -void intel_panel_destroy_backlight(struct drm_device *dev)
> +void intel_panel_destroy_backlight(struct drm_connector *connector)
> {
> - return;
> + struct intel_connector *intel_connector = to_intel_connector(connector);
> +
> + intel_backlight_device_unregister(intel_connector);
> }
> -#endif
>
> int intel_panel_init(struct intel_panel *panel,
> struct drm_display_mode *fixed_mode)
>
Tested-by: Joe Konno <joe.konno@intel.com>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 5/7] drm/i915: make backlight info per-connector
2013-10-31 16:55 [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs Jani Nikula
` (3 preceding siblings ...)
2013-10-31 16:55 ` [PATCH 4/7] drm/i915: clean up backlight conditional build Jani Nikula
@ 2013-10-31 16:55 ` Jani Nikula
2013-11-06 17:12 ` Joe Konno
2013-10-31 16:55 ` [PATCH 6/7] drm/i915: handle backlight through chip specific functions Jani Nikula
` (2 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2013-10-31 16:55 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, jesse.barnes
Move from dev_priv to connector->panel.
We still don't allow multiple sysfs interfaces, though.
There should be no functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_dma.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 9 +---
drivers/gpu/drm/i915/i915_suspend.c | 8 ++--
drivers/gpu/drm/i915/intel_drv.h | 7 +++
drivers/gpu/drm/i915/intel_panel.c | 85 +++++++++++++++++++----------------
5 files changed, 61 insertions(+), 50 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 0cab2d0..9a2a175 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1486,7 +1486,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
spin_lock_init(&dev_priv->irq_lock);
spin_lock_init(&dev_priv->gpu_error.lock);
- spin_lock_init(&dev_priv->backlight.lock);
+ spin_lock_init(&dev_priv->backlight_lock);
spin_lock_init(&dev_priv->uncore.lock);
spin_lock_init(&dev_priv->mm.object_stat_lock);
mutex_init(&dev_priv->dpio_lock);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 16fae30..16b93a6 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1349,13 +1349,8 @@ typedef struct drm_i915_private {
struct intel_overlay *overlay;
unsigned int sprite_scaling_enabled;
- /* backlight */
- struct {
- int level;
- bool enabled;
- spinlock_t lock; /* bl registers and the above bl fields */
- struct backlight_device *device;
- } backlight;
+ /* backlight registers and fields in struct intel_panel */
+ spinlock_t backlight_lock;
/* LVDS info */
bool no_aux_handshake;
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 98790c7..eadf8e1 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -203,7 +203,7 @@ static void i915_save_display(struct drm_device *dev)
if (!drm_core_check_feature(dev, DRIVER_MODESET))
i915_save_display_reg(dev);
- spin_lock_irqsave(&dev_priv->backlight.lock, flags);
+ spin_lock_irqsave(&dev_priv->backlight_lock, flags);
/* LVDS state */
if (HAS_PCH_SPLIT(dev)) {
@@ -241,7 +241,7 @@ static void i915_save_display(struct drm_device *dev)
dev_priv->regfile.saveLVDS = I915_READ(LVDS);
}
- spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
+ spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
if (!IS_I830(dev) && !IS_845G(dev) && !HAS_PCH_SPLIT(dev))
dev_priv->regfile.savePFIT_CONTROL = I915_READ(PFIT_CONTROL);
@@ -287,7 +287,7 @@ static void i915_restore_display(struct drm_device *dev)
if (!drm_core_check_feature(dev, DRIVER_MODESET))
i915_restore_display_reg(dev);
- spin_lock_irqsave(&dev_priv->backlight.lock, flags);
+ spin_lock_irqsave(&dev_priv->backlight_lock, flags);
/* LVDS state */
if (INTEL_INFO(dev)->gen >= 4 && !HAS_PCH_SPLIT(dev))
@@ -341,7 +341,7 @@ static void i915_restore_display(struct drm_device *dev)
I915_WRITE(PP_CONTROL, dev_priv->regfile.savePP_CONTROL);
}
- spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
+ spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
/* only restore FBC info on the platform that supports FBC*/
intel_disable_fbc(dev);
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 5548180..9460e54 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -156,6 +156,13 @@ struct intel_encoder {
struct intel_panel {
struct drm_display_mode *fixed_mode;
int fitting_mode;
+
+ /* backlight */
+ struct {
+ u32 level;
+ bool enabled;
+ struct backlight_device *device;
+ } backlight;
};
struct intel_connector {
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index a0d13d3..0a4aeaf 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -346,7 +346,7 @@ static u32 i915_read_blc_pwm_ctl(struct drm_device *dev, enum pipe pipe)
struct drm_i915_private *dev_priv = dev->dev_private;
u32 val;
- WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight.lock));
+ WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight_lock));
/* Restore the CTL value if it lost, e.g. GPU reset */
@@ -449,7 +449,7 @@ static u32 intel_panel_get_backlight(struct drm_device *dev,
unsigned long flags;
int reg;
- spin_lock_irqsave(&dev_priv->backlight.lock, flags);
+ spin_lock_irqsave(&dev_priv->backlight_lock, flags);
if (HAS_PCH_SPLIT(dev)) {
val = I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
@@ -473,7 +473,7 @@ static u32 intel_panel_get_backlight(struct drm_device *dev,
val = intel_panel_compute_brightness(dev, pipe, val);
- spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
+ spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
DRM_DEBUG_DRIVER("get backlight PWM = %d\n", val);
return val;
@@ -530,6 +530,7 @@ void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
{
struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_panel *panel = &connector->panel;
enum pipe pipe = intel_get_pipe_from_connector(connector);
u32 freq;
unsigned long flags;
@@ -537,7 +538,7 @@ void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
if (pipe == INVALID_PIPE)
return;
- spin_lock_irqsave(&dev_priv->backlight.lock, flags);
+ spin_lock_irqsave(&dev_priv->backlight_lock, flags);
freq = intel_panel_get_max_backlight(dev, pipe);
if (!freq) {
@@ -551,20 +552,21 @@ void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
else
level = freq / max * level;
- dev_priv->backlight.level = level;
- if (dev_priv->backlight.device)
- dev_priv->backlight.device->props.brightness = level;
+ panel->backlight.level = level;
+ if (panel->backlight.device)
+ panel->backlight.device->props.brightness = level;
- if (dev_priv->backlight.enabled)
+ if (panel->backlight.enabled)
intel_panel_actually_set_backlight(dev, pipe, level);
out:
- spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
+ spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
}
void intel_panel_disable_backlight(struct intel_connector *connector)
{
struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_panel *panel = &connector->panel;
enum pipe pipe = intel_get_pipe_from_connector(connector);
unsigned long flags;
@@ -582,9 +584,9 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
return;
}
- spin_lock_irqsave(&dev_priv->backlight.lock, flags);
+ spin_lock_irqsave(&dev_priv->backlight_lock, flags);
- dev_priv->backlight.enabled = false;
+ panel->backlight.enabled = false;
intel_panel_actually_set_backlight(dev, pipe, 0);
if (INTEL_INFO(dev)->gen >= 4) {
@@ -606,13 +608,14 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
}
}
- spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
+ spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
}
void intel_panel_enable_backlight(struct intel_connector *connector)
{
struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_panel *panel = &connector->panel;
enum pipe pipe = intel_get_pipe_from_connector(connector);
enum transcoder cpu_transcoder =
intel_pipe_to_cpu_transcoder(dev_priv, pipe);
@@ -623,14 +626,14 @@ void intel_panel_enable_backlight(struct intel_connector *connector)
DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe));
- spin_lock_irqsave(&dev_priv->backlight.lock, flags);
+ spin_lock_irqsave(&dev_priv->backlight_lock, flags);
- if (dev_priv->backlight.level == 0) {
- dev_priv->backlight.level = intel_panel_get_max_backlight(dev,
- pipe);
- if (dev_priv->backlight.device)
- dev_priv->backlight.device->props.brightness =
- dev_priv->backlight.level;
+ if (panel->backlight.level == 0) {
+ panel->backlight.level = intel_panel_get_max_backlight(dev,
+ pipe);
+ if (panel->backlight.device)
+ panel->backlight.device->props.brightness =
+ panel->backlight.level;
}
if (INTEL_INFO(dev)->gen >= 4) {
@@ -680,11 +683,11 @@ set_level:
* BLC_PWM_CPU_CTL may be cleared to zero automatically when these
* registers are set.
*/
- dev_priv->backlight.enabled = true;
+ panel->backlight.enabled = true;
intel_panel_actually_set_backlight(dev, pipe,
- dev_priv->backlight.level);
+ panel->backlight.level);
- spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
+ spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
}
/* FIXME: use VBT vals to init PWM_CTL and PWM_CTL2 correctly */
@@ -770,34 +773,40 @@ static int intel_backlight_device_register(struct intel_connector *connector)
{
struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_panel *panel = &connector->panel;
struct backlight_properties props;
unsigned long flags;
- if (WARN_ON(dev_priv->backlight.device))
+ if (WARN_ON(panel->backlight.device))
return -ENODEV;
memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_RAW;
- props.brightness = dev_priv->backlight.level;
+ props.brightness = panel->backlight.level;
- spin_lock_irqsave(&dev_priv->backlight.lock, flags);
+ spin_lock_irqsave(&dev_priv->backlight_lock, flags);
props.max_brightness = intel_panel_get_max_backlight(dev, 0);
- spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
+ spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
if (props.max_brightness == 0) {
DRM_DEBUG_DRIVER("Failed to get maximum backlight value\n");
return -ENODEV;
}
- dev_priv->backlight.device =
+
+ /*
+ * 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(dev_priv->backlight.device)) {
+ if (IS_ERR(panel->backlight.device)) {
DRM_ERROR("Failed to register backlight: %ld\n",
- PTR_ERR(dev_priv->backlight.device));
- dev_priv->backlight.device = NULL;
+ PTR_ERR(panel->backlight.device));
+ panel->backlight.device = NULL;
return -ENODEV;
}
return 0;
@@ -805,11 +814,11 @@ static int intel_backlight_device_register(struct intel_connector *connector)
static void intel_backlight_device_unregister(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
- if (dev_priv->backlight.device) {
- backlight_device_unregister(dev_priv->backlight.device);
- dev_priv->backlight.device = NULL;
+ struct intel_panel *panel = &connector->panel;
+
+ if (panel->backlight.device) {
+ backlight_device_unregister(panel->backlight.device);
+ panel->backlight.device = NULL;
}
}
#else /* CONFIG_BACKLIGHT_CLASS_DEVICE */
@@ -825,13 +834,13 @@ static void intel_backlight_device_unregister(struct intel_connector *connector)
int intel_panel_setup_backlight(struct drm_connector *connector)
{
struct drm_device *dev = connector->dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_connector *intel_connector = to_intel_connector(connector);
+ struct intel_panel *panel = &intel_connector->panel;
intel_panel_init_backlight_regs(dev);
- dev_priv->backlight.level = intel_panel_get_backlight(dev, 0);
- dev_priv->backlight.enabled = dev_priv->backlight.level != 0;
+ panel->backlight.level = intel_panel_get_backlight(dev, 0);
+ panel->backlight.enabled = panel->backlight.level != 0;
intel_backlight_device_register(intel_connector);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 5/7] drm/i915: make backlight info per-connector
2013-10-31 16:55 ` [PATCH 5/7] drm/i915: make backlight info per-connector Jani Nikula
@ 2013-11-06 17:12 ` Joe Konno
0 siblings, 0 replies; 19+ messages in thread
From: Joe Konno @ 2013-11-06 17:12 UTC (permalink / raw)
To: intel-gfx
On 10/31/2013 09:55 AM, Jani Nikula wrote:
> Move from dev_priv to connector->panel.
>
> We still don't allow multiple sysfs interfaces, though.
>
> There should be no functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/i915_dma.c | 2 +-
> drivers/gpu/drm/i915/i915_drv.h | 9 +---
> drivers/gpu/drm/i915/i915_suspend.c | 8 ++--
> drivers/gpu/drm/i915/intel_drv.h | 7 +++
> drivers/gpu/drm/i915/intel_panel.c | 85 +++++++++++++++++++----------------
> 5 files changed, 61 insertions(+), 50 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index 0cab2d0..9a2a175 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1486,7 +1486,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
>
> spin_lock_init(&dev_priv->irq_lock);
> spin_lock_init(&dev_priv->gpu_error.lock);
> - spin_lock_init(&dev_priv->backlight.lock);
> + spin_lock_init(&dev_priv->backlight_lock);
> spin_lock_init(&dev_priv->uncore.lock);
> spin_lock_init(&dev_priv->mm.object_stat_lock);
> mutex_init(&dev_priv->dpio_lock);
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 16fae30..16b93a6 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1349,13 +1349,8 @@ typedef struct drm_i915_private {
> struct intel_overlay *overlay;
> unsigned int sprite_scaling_enabled;
>
> - /* backlight */
> - struct {
> - int level;
> - bool enabled;
> - spinlock_t lock; /* bl registers and the above bl fields */
> - struct backlight_device *device;
> - } backlight;
> + /* backlight registers and fields in struct intel_panel */
> + spinlock_t backlight_lock;
>
> /* LVDS info */
> bool no_aux_handshake;
> diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
> index 98790c7..eadf8e1 100644
> --- a/drivers/gpu/drm/i915/i915_suspend.c
> +++ b/drivers/gpu/drm/i915/i915_suspend.c
> @@ -203,7 +203,7 @@ static void i915_save_display(struct drm_device *dev)
> if (!drm_core_check_feature(dev, DRIVER_MODESET))
> i915_save_display_reg(dev);
>
> - spin_lock_irqsave(&dev_priv->backlight.lock, flags);
> + spin_lock_irqsave(&dev_priv->backlight_lock, flags);
>
> /* LVDS state */
> if (HAS_PCH_SPLIT(dev)) {
> @@ -241,7 +241,7 @@ static void i915_save_display(struct drm_device *dev)
> dev_priv->regfile.saveLVDS = I915_READ(LVDS);
> }
>
> - spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
> + spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
>
> if (!IS_I830(dev) && !IS_845G(dev) && !HAS_PCH_SPLIT(dev))
> dev_priv->regfile.savePFIT_CONTROL = I915_READ(PFIT_CONTROL);
> @@ -287,7 +287,7 @@ static void i915_restore_display(struct drm_device *dev)
> if (!drm_core_check_feature(dev, DRIVER_MODESET))
> i915_restore_display_reg(dev);
>
> - spin_lock_irqsave(&dev_priv->backlight.lock, flags);
> + spin_lock_irqsave(&dev_priv->backlight_lock, flags);
>
> /* LVDS state */
> if (INTEL_INFO(dev)->gen >= 4 && !HAS_PCH_SPLIT(dev))
> @@ -341,7 +341,7 @@ static void i915_restore_display(struct drm_device *dev)
> I915_WRITE(PP_CONTROL, dev_priv->regfile.savePP_CONTROL);
> }
>
> - spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
> + spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
>
> /* only restore FBC info on the platform that supports FBC*/
> intel_disable_fbc(dev);
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 5548180..9460e54 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -156,6 +156,13 @@ struct intel_encoder {
> struct intel_panel {
> struct drm_display_mode *fixed_mode;
> int fitting_mode;
> +
> + /* backlight */
> + struct {
> + u32 level;
> + bool enabled;
> + struct backlight_device *device;
> + } backlight;
> };
>
> struct intel_connector {
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index a0d13d3..0a4aeaf 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -346,7 +346,7 @@ static u32 i915_read_blc_pwm_ctl(struct drm_device *dev, enum pipe pipe)
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 val;
>
> - WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight.lock));
> + WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight_lock));
>
> /* Restore the CTL value if it lost, e.g. GPU reset */
>
> @@ -449,7 +449,7 @@ static u32 intel_panel_get_backlight(struct drm_device *dev,
> unsigned long flags;
> int reg;
>
> - spin_lock_irqsave(&dev_priv->backlight.lock, flags);
> + spin_lock_irqsave(&dev_priv->backlight_lock, flags);
>
> if (HAS_PCH_SPLIT(dev)) {
> val = I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
> @@ -473,7 +473,7 @@ static u32 intel_panel_get_backlight(struct drm_device *dev,
>
> val = intel_panel_compute_brightness(dev, pipe, val);
>
> - spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
> + spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
>
> DRM_DEBUG_DRIVER("get backlight PWM = %d\n", val);
> return val;
> @@ -530,6 +530,7 @@ void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
> {
> struct drm_device *dev = connector->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> + struct intel_panel *panel = &connector->panel;
> enum pipe pipe = intel_get_pipe_from_connector(connector);
> u32 freq;
> unsigned long flags;
> @@ -537,7 +538,7 @@ void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
> if (pipe == INVALID_PIPE)
> return;
>
> - spin_lock_irqsave(&dev_priv->backlight.lock, flags);
> + spin_lock_irqsave(&dev_priv->backlight_lock, flags);
>
> freq = intel_panel_get_max_backlight(dev, pipe);
> if (!freq) {
> @@ -551,20 +552,21 @@ void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
> else
> level = freq / max * level;
>
> - dev_priv->backlight.level = level;
> - if (dev_priv->backlight.device)
> - dev_priv->backlight.device->props.brightness = level;
> + panel->backlight.level = level;
> + if (panel->backlight.device)
> + panel->backlight.device->props.brightness = level;
>
> - if (dev_priv->backlight.enabled)
> + if (panel->backlight.enabled)
> intel_panel_actually_set_backlight(dev, pipe, level);
> out:
> - spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
> + spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
> }
>
> void intel_panel_disable_backlight(struct intel_connector *connector)
> {
> struct drm_device *dev = connector->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> + struct intel_panel *panel = &connector->panel;
> enum pipe pipe = intel_get_pipe_from_connector(connector);
> unsigned long flags;
>
> @@ -582,9 +584,9 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
> return;
> }
>
> - spin_lock_irqsave(&dev_priv->backlight.lock, flags);
> + spin_lock_irqsave(&dev_priv->backlight_lock, flags);
>
> - dev_priv->backlight.enabled = false;
> + panel->backlight.enabled = false;
> intel_panel_actually_set_backlight(dev, pipe, 0);
>
> if (INTEL_INFO(dev)->gen >= 4) {
> @@ -606,13 +608,14 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
> }
> }
>
> - spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
> + spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
> }
>
> void intel_panel_enable_backlight(struct intel_connector *connector)
> {
> struct drm_device *dev = connector->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> + struct intel_panel *panel = &connector->panel;
> enum pipe pipe = intel_get_pipe_from_connector(connector);
> enum transcoder cpu_transcoder =
> intel_pipe_to_cpu_transcoder(dev_priv, pipe);
> @@ -623,14 +626,14 @@ void intel_panel_enable_backlight(struct intel_connector *connector)
>
> DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe));
>
> - spin_lock_irqsave(&dev_priv->backlight.lock, flags);
> + spin_lock_irqsave(&dev_priv->backlight_lock, flags);
>
> - if (dev_priv->backlight.level == 0) {
> - dev_priv->backlight.level = intel_panel_get_max_backlight(dev,
> - pipe);
> - if (dev_priv->backlight.device)
> - dev_priv->backlight.device->props.brightness =
> - dev_priv->backlight.level;
> + if (panel->backlight.level == 0) {
> + panel->backlight.level = intel_panel_get_max_backlight(dev,
> + pipe);
> + if (panel->backlight.device)
> + panel->backlight.device->props.brightness =
> + panel->backlight.level;
> }
>
> if (INTEL_INFO(dev)->gen >= 4) {
> @@ -680,11 +683,11 @@ set_level:
> * BLC_PWM_CPU_CTL may be cleared to zero automatically when these
> * registers are set.
> */
> - dev_priv->backlight.enabled = true;
> + panel->backlight.enabled = true;
> intel_panel_actually_set_backlight(dev, pipe,
> - dev_priv->backlight.level);
> + panel->backlight.level);
>
> - spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
> + spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
> }
>
> /* FIXME: use VBT vals to init PWM_CTL and PWM_CTL2 correctly */
> @@ -770,34 +773,40 @@ static int intel_backlight_device_register(struct intel_connector *connector)
> {
> struct drm_device *dev = connector->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> + struct intel_panel *panel = &connector->panel;
> struct backlight_properties props;
> unsigned long flags;
>
> - if (WARN_ON(dev_priv->backlight.device))
> + if (WARN_ON(panel->backlight.device))
> return -ENODEV;
>
> memset(&props, 0, sizeof(props));
> props.type = BACKLIGHT_RAW;
> - props.brightness = dev_priv->backlight.level;
> + props.brightness = panel->backlight.level;
>
> - spin_lock_irqsave(&dev_priv->backlight.lock, flags);
> + spin_lock_irqsave(&dev_priv->backlight_lock, flags);
> props.max_brightness = intel_panel_get_max_backlight(dev, 0);
> - spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
> + spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
>
> if (props.max_brightness == 0) {
> DRM_DEBUG_DRIVER("Failed to get maximum backlight value\n");
> return -ENODEV;
> }
> - dev_priv->backlight.device =
> +
> + /*
> + * 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(dev_priv->backlight.device)) {
> + if (IS_ERR(panel->backlight.device)) {
> DRM_ERROR("Failed to register backlight: %ld\n",
> - PTR_ERR(dev_priv->backlight.device));
> - dev_priv->backlight.device = NULL;
> + PTR_ERR(panel->backlight.device));
> + panel->backlight.device = NULL;
> return -ENODEV;
> }
> return 0;
> @@ -805,11 +814,11 @@ static int intel_backlight_device_register(struct intel_connector *connector)
>
> static void intel_backlight_device_unregister(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> - if (dev_priv->backlight.device) {
> - backlight_device_unregister(dev_priv->backlight.device);
> - dev_priv->backlight.device = NULL;
> + struct intel_panel *panel = &connector->panel;
> +
> + if (panel->backlight.device) {
> + backlight_device_unregister(panel->backlight.device);
> + panel->backlight.device = NULL;
> }
> }
> #else /* CONFIG_BACKLIGHT_CLASS_DEVICE */
> @@ -825,13 +834,13 @@ static void intel_backlight_device_unregister(struct intel_connector *connector)
> int intel_panel_setup_backlight(struct drm_connector *connector)
> {
> struct drm_device *dev = connector->dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_connector *intel_connector = to_intel_connector(connector);
> + struct intel_panel *panel = &intel_connector->panel;
>
> intel_panel_init_backlight_regs(dev);
>
> - dev_priv->backlight.level = intel_panel_get_backlight(dev, 0);
> - dev_priv->backlight.enabled = dev_priv->backlight.level != 0;
> + panel->backlight.level = intel_panel_get_backlight(dev, 0);
> + panel->backlight.enabled = panel->backlight.level != 0;
>
> intel_backlight_device_register(intel_connector);
>
>
Tested-by: Joe Konno <joe.konno@intel.com>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 6/7] drm/i915: handle backlight through chip specific functions
2013-10-31 16:55 [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs Jani Nikula
` (4 preceding siblings ...)
2013-10-31 16:55 ` [PATCH 5/7] drm/i915: make backlight info per-connector Jani Nikula
@ 2013-10-31 16:55 ` Jani Nikula
2013-11-06 17:12 ` Joe Konno
2013-10-31 16:55 ` [PATCH 7/7] drm/i915: make asle notifications update backlight on all connectors Jani Nikula
2013-10-31 21:34 ` [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs Joe Konno
7 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2013-10-31 16:55 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, jesse.barnes
The backlight code has grown rather hairy, not least because the
hardware registers and bits have repeatedly been shuffled around. And
this isn't expected to get any easier with new hardware. Make things
easier for our (read: my) poor brains, and split the code up into chip
specific functions.
There should be no functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 7 +
drivers/gpu/drm/i915/intel_display.c | 2 +
drivers/gpu/drm/i915/intel_drv.h | 1 +
drivers/gpu/drm/i915/intel_panel.c | 442 ++++++++++++++++++++++------------
4 files changed, 297 insertions(+), 155 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 16b93a6..0753e7c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -409,6 +409,13 @@ struct drm_i915_display_funcs {
/* render clock increase/decrease */
/* display clock increase/decrease */
/* pll clock increase/decrease */
+
+ uint32_t (*get_max_backlight)(struct drm_device *dev, enum pipe pipe);
+ uint32_t (*get_backlight)(struct drm_device *dev, enum pipe pipe);
+ void (*set_backlight)(struct drm_device *dev, enum pipe pipe,
+ uint32_t level);
+ void (*disable_backlight)(struct drm_device *dev, enum pipe pipe);
+ void (*enable_backlight)(struct drm_device *dev, enum pipe pipe);
};
struct intel_uncore_funcs {
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 774407d..d25d23c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10355,6 +10355,8 @@ static void intel_init_display(struct drm_device *dev)
dev_priv->display.queue_flip = intel_gen7_queue_flip;
break;
}
+
+ intel_panel_init_backlight_funcs(dev);
}
/*
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 9460e54..b367f2f 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -816,6 +816,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector);
void intel_panel_enable_backlight(struct intel_connector *connector);
void intel_panel_disable_backlight(struct intel_connector *connector);
void intel_panel_destroy_backlight(struct drm_connector *connector);
+void intel_panel_init_backlight_funcs(struct drm_device *dev);
enum drm_connector_status intel_panel_detect(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 0a4aeaf..03e806f 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -338,79 +338,105 @@ static int is_backlight_combination_mode(struct drm_device *dev)
return 0;
}
-/* XXX: query mode clock or hardware clock and program max PWM appropriately
- * when it's 0.
- */
-static u32 i915_read_blc_pwm_ctl(struct drm_device *dev, enum pipe pipe)
+static u32 pch_get_max_backlight(struct drm_device *dev, enum pipe pipe)
{
struct drm_i915_private *dev_priv = dev->dev_private;
u32 val;
- WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight_lock));
+ val = I915_READ(BLC_PWM_PCH_CTL2);
+ if (dev_priv->regfile.saveBLC_PWM_CTL2 == 0) {
+ dev_priv->regfile.saveBLC_PWM_CTL2 = val;
+ } else if (val == 0) {
+ val = dev_priv->regfile.saveBLC_PWM_CTL2;
+ I915_WRITE(BLC_PWM_PCH_CTL2, val);
+ }
- /* Restore the CTL value if it lost, e.g. GPU reset */
+ val >>= 16;
- if (HAS_PCH_SPLIT(dev_priv->dev)) {
- val = I915_READ(BLC_PWM_PCH_CTL2);
- if (dev_priv->regfile.saveBLC_PWM_CTL2 == 0) {
- dev_priv->regfile.saveBLC_PWM_CTL2 = val;
- } else if (val == 0) {
- val = dev_priv->regfile.saveBLC_PWM_CTL2;
- I915_WRITE(BLC_PWM_PCH_CTL2, val);
- }
- } else if (IS_VALLEYVIEW(dev)) {
- val = I915_READ(VLV_BLC_PWM_CTL(pipe));
- if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
- dev_priv->regfile.saveBLC_PWM_CTL = val;
- dev_priv->regfile.saveBLC_PWM_CTL2 =
- I915_READ(VLV_BLC_PWM_CTL2(pipe));
- } else if (val == 0) {
- val = dev_priv->regfile.saveBLC_PWM_CTL;
- I915_WRITE(VLV_BLC_PWM_CTL(pipe), val);
- I915_WRITE(VLV_BLC_PWM_CTL2(pipe),
- dev_priv->regfile.saveBLC_PWM_CTL2);
- }
+ return val;
+}
- if (!val)
- val = 0x0f42ffff;
- } else {
- val = I915_READ(BLC_PWM_CTL);
- if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
- dev_priv->regfile.saveBLC_PWM_CTL = val;
- if (INTEL_INFO(dev)->gen >= 4)
- dev_priv->regfile.saveBLC_PWM_CTL2 =
- I915_READ(BLC_PWM_CTL2);
- } else if (val == 0) {
- val = dev_priv->regfile.saveBLC_PWM_CTL;
- I915_WRITE(BLC_PWM_CTL, val);
- if (INTEL_INFO(dev)->gen >= 4)
- I915_WRITE(BLC_PWM_CTL2,
- dev_priv->regfile.saveBLC_PWM_CTL2);
- }
+static u32 i9xx_get_max_backlight(struct drm_device *dev, enum pipe pipe)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ u32 val;
+
+ val = I915_READ(BLC_PWM_CTL);
+ if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
+ dev_priv->regfile.saveBLC_PWM_CTL = val;
+ } else if (val == 0) {
+ val = dev_priv->regfile.saveBLC_PWM_CTL;
+ I915_WRITE(BLC_PWM_CTL, val);
}
+ val >>= 17;
+
+ if (is_backlight_combination_mode(dev))
+ val *= 0xff;
+
return val;
}
-static u32 intel_panel_get_max_backlight(struct drm_device *dev,
- enum pipe pipe)
+static u32 i965_get_max_backlight(struct drm_device *dev, enum pipe pipe)
{
- u32 max;
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ u32 val;
- max = i915_read_blc_pwm_ctl(dev, pipe);
+ val = I915_READ(BLC_PWM_CTL);
+ if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
+ dev_priv->regfile.saveBLC_PWM_CTL = val;
+ dev_priv->regfile.saveBLC_PWM_CTL2 = I915_READ(BLC_PWM_CTL2);
+ } else if (val == 0) {
+ val = dev_priv->regfile.saveBLC_PWM_CTL;
+ I915_WRITE(BLC_PWM_CTL, val);
+ I915_WRITE(BLC_PWM_CTL2, dev_priv->regfile.saveBLC_PWM_CTL2);
+ }
- if (HAS_PCH_SPLIT(dev)) {
- max >>= 16;
- } else {
- if (INTEL_INFO(dev)->gen < 4)
- max >>= 17;
- else
- max >>= 16;
+ val >>= 16;
+
+ if (is_backlight_combination_mode(dev))
+ val *= 0xff;
+
+ return val;
+}
+
+static u32 vlv_get_max_backlight(struct drm_device *dev, enum pipe pipe)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ u32 val;
- if (is_backlight_combination_mode(dev))
- max *= 0xff;
+ val = I915_READ(VLV_BLC_PWM_CTL(pipe));
+ if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
+ dev_priv->regfile.saveBLC_PWM_CTL = val;
+ dev_priv->regfile.saveBLC_PWM_CTL2 =
+ I915_READ(VLV_BLC_PWM_CTL2(pipe));
+ } else if (val == 0) {
+ val = dev_priv->regfile.saveBLC_PWM_CTL;
+ I915_WRITE(VLV_BLC_PWM_CTL(pipe), val);
+ I915_WRITE(VLV_BLC_PWM_CTL2(pipe),
+ dev_priv->regfile.saveBLC_PWM_CTL2);
}
+ if (!val)
+ val = 0x0f42ffff;
+
+ val >>= 16;
+
+ return val;
+}
+
+/* XXX: query mode clock or hardware clock and program max PWM appropriately
+ * when it's 0.
+ */
+static u32 intel_panel_get_max_backlight(struct drm_device *dev, enum pipe pipe)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ u32 max;
+
+ WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight_lock));
+
+ max = dev_priv->display.get_max_backlight(dev, pipe);
+
DRM_DEBUG_DRIVER("max backlight PWM = %d\n", max);
return max;
@@ -441,36 +467,48 @@ static u32 intel_panel_compute_brightness(struct drm_device *dev,
return val;
}
-static u32 intel_panel_get_backlight(struct drm_device *dev,
- enum pipe pipe)
+static u32 pch_get_backlight(struct drm_device *dev, enum pipe pipe)
{
struct drm_i915_private *dev_priv = dev->dev_private;
- u32 val;
- unsigned long flags;
- int reg;
- spin_lock_irqsave(&dev_priv->backlight_lock, flags);
+ return I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
+}
- if (HAS_PCH_SPLIT(dev)) {
- val = I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
- } else {
- if (IS_VALLEYVIEW(dev))
- reg = VLV_BLC_PWM_CTL(pipe);
- else
- reg = BLC_PWM_CTL;
+static u32 i9xx_get_backlight(struct drm_device *dev, enum pipe pipe)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ u32 val;
- val = I915_READ(reg) & BACKLIGHT_DUTY_CYCLE_MASK;
- if (INTEL_INFO(dev)->gen < 4)
- val >>= 1;
+ val = I915_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
+ if (INTEL_INFO(dev)->gen < 4)
+ val >>= 1;
- if (is_backlight_combination_mode(dev)) {
- u8 lbpc;
+ if (is_backlight_combination_mode(dev)) {
+ u8 lbpc;
- pci_read_config_byte(dev->pdev, PCI_LBPC, &lbpc);
- val *= lbpc;
- }
+ pci_read_config_byte(dev->pdev, PCI_LBPC, &lbpc);
+ val *= lbpc;
}
+ return val;
+}
+
+static u32 vlv_get_backlight(struct drm_device *dev, enum pipe pipe)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+
+ return I915_READ(VLV_BLC_PWM_CTL(pipe)) & BACKLIGHT_DUTY_CYCLE_MASK;
+}
+
+static u32 intel_panel_get_backlight(struct drm_device *dev, enum pipe pipe)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ u32 val;
+ unsigned long flags;
+
+ spin_lock_irqsave(&dev_priv->backlight_lock, flags);
+
+ val = dev_priv->display.get_backlight(dev, pipe);
val = intel_panel_compute_brightness(dev, pipe, val);
spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
@@ -479,25 +517,20 @@ static u32 intel_panel_get_backlight(struct drm_device *dev,
return val;
}
-static void intel_pch_panel_set_backlight(struct drm_device *dev, u32 level)
+static void pch_set_backlight(struct drm_device *dev, enum pipe pipe, u32 level)
{
struct drm_i915_private *dev_priv = dev->dev_private;
- u32 val = I915_READ(BLC_PWM_CPU_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK;
- I915_WRITE(BLC_PWM_CPU_CTL, val | level);
+ u32 tmp;
+
+ tmp = I915_READ(BLC_PWM_CPU_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK;
+ I915_WRITE(BLC_PWM_CPU_CTL, tmp | level);
}
-static void intel_panel_actually_set_backlight(struct drm_device *dev,
- enum pipe pipe, u32 level)
+static void i9xx_set_backlight(struct drm_device *dev, enum pipe pipe,
+ u32 level)
{
struct drm_i915_private *dev_priv = dev->dev_private;
u32 tmp;
- int reg;
-
- DRM_DEBUG_DRIVER("set backlight PWM = %d\n", level);
- level = intel_panel_compute_brightness(dev, pipe, level);
-
- if (HAS_PCH_SPLIT(dev))
- return intel_pch_panel_set_backlight(dev, level);
if (is_backlight_combination_mode(dev)) {
u32 max = intel_panel_get_max_backlight(dev, pipe);
@@ -512,16 +545,31 @@ static void intel_panel_actually_set_backlight(struct drm_device *dev,
pci_write_config_byte(dev->pdev, PCI_LBPC, lbpc);
}
- if (IS_VALLEYVIEW(dev))
- reg = VLV_BLC_PWM_CTL(pipe);
- else
- reg = BLC_PWM_CTL;
-
- tmp = I915_READ(reg);
if (INTEL_INFO(dev)->gen < 4)
level <<= 1;
- tmp &= ~BACKLIGHT_DUTY_CYCLE_MASK;
- I915_WRITE(reg, tmp | level);
+
+ tmp = I915_READ(BLC_PWM_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK;
+ I915_WRITE(BLC_PWM_CTL, tmp | level);
+}
+
+static void vlv_set_backlight(struct drm_device *dev, enum pipe pipe, u32 level)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ u32 tmp;
+
+ tmp = I915_READ(VLV_BLC_PWM_CTL(pipe)) & ~BACKLIGHT_DUTY_CYCLE_MASK;
+ I915_WRITE(VLV_BLC_PWM_CTL(pipe), tmp | level);
+}
+
+static void intel_panel_actually_set_backlight(struct drm_device *dev,
+ enum pipe pipe, u32 level)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+
+ DRM_DEBUG_DRIVER("set backlight PWM = %d\n", level);
+
+ level = intel_panel_compute_brightness(dev, pipe, level);
+ dev_priv->display.set_backlight(dev, pipe, level);
}
/* set backlight brightness to level in range [0..max] */
@@ -562,6 +610,36 @@ out:
spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
}
+static void pch_disable_backlight(struct drm_device *dev, enum pipe pipe)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ u32 tmp;
+
+ tmp = I915_READ(BLC_PWM_CPU_CTL2);
+ I915_WRITE(BLC_PWM_CPU_CTL2, tmp & ~BLM_PWM_ENABLE);
+
+ tmp = I915_READ(BLC_PWM_PCH_CTL1);
+ I915_WRITE(BLC_PWM_PCH_CTL1, tmp & ~BLM_PCH_PWM_ENABLE);
+}
+
+static void i965_disable_backlight(struct drm_device *dev, enum pipe pipe)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ u32 tmp;
+
+ tmp = I915_READ(BLC_PWM_CTL2);
+ I915_WRITE(BLC_PWM_CTL2, tmp & ~BLM_PWM_ENABLE);
+}
+
+static void vlv_disable_backlight(struct drm_device *dev, enum pipe pipe)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ u32 tmp;
+
+ tmp = I915_READ(VLV_BLC_PWM_CTL2(pipe));
+ I915_WRITE(VLV_BLC_PWM_CTL2(pipe), tmp & ~BLM_PWM_ENABLE);
+}
+
void intel_panel_disable_backlight(struct intel_connector *connector)
{
struct drm_device *dev = connector->base.dev;
@@ -589,26 +667,92 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
panel->backlight.enabled = false;
intel_panel_actually_set_backlight(dev, pipe, 0);
- if (INTEL_INFO(dev)->gen >= 4) {
- uint32_t reg, tmp;
+ if (dev_priv->display.disable_backlight)
+ dev_priv->display.disable_backlight(dev, pipe);
- if (HAS_PCH_SPLIT(dev))
- reg = BLC_PWM_CPU_CTL2;
- else if (IS_VALLEYVIEW(dev))
- reg = VLV_BLC_PWM_CTL2(pipe);
- else
- reg = BLC_PWM_CTL2;
+ spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
+}
- I915_WRITE(reg, I915_READ(reg) & ~BLM_PWM_ENABLE);
+static void pch_enable_backlight(struct drm_device *dev, enum pipe pipe)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ enum transcoder cpu_transcoder =
+ intel_pipe_to_cpu_transcoder(dev_priv, pipe);
+ u32 tmp;
- if (HAS_PCH_SPLIT(dev)) {
- tmp = I915_READ(BLC_PWM_PCH_CTL1);
- tmp &= ~BLM_PCH_PWM_ENABLE;
- I915_WRITE(BLC_PWM_PCH_CTL1, tmp);
- }
+ tmp = I915_READ(BLC_PWM_CPU_CTL2);
+
+ /* Note that this can also get called through dpms changes. And
+ * we don't track the backlight dpms state, hence check whether
+ * we have to do anything first. */
+ if (tmp & BLM_PWM_ENABLE)
+ return;
+
+ if (INTEL_INFO(dev)->num_pipes == 3)
+ tmp &= ~BLM_PIPE_SELECT_IVB;
+ else
+ tmp &= ~BLM_PIPE_SELECT;
+
+ if (cpu_transcoder == TRANSCODER_EDP)
+ tmp |= BLM_TRANSCODER_EDP;
+ else
+ tmp |= BLM_PIPE(cpu_transcoder);
+ tmp &= ~BLM_PWM_ENABLE;
+
+ I915_WRITE(BLC_PWM_CPU_CTL2, tmp);
+ POSTING_READ(BLC_PWM_CPU_CTL2);
+ I915_WRITE(BLC_PWM_CPU_CTL2, tmp | BLM_PWM_ENABLE);
+
+ if (!(dev_priv->quirks & QUIRK_NO_PCH_PWM_ENABLE)) {
+ tmp = I915_READ(BLC_PWM_PCH_CTL1);
+ tmp |= BLM_PCH_PWM_ENABLE;
+ tmp &= ~BLM_PCH_OVERRIDE_ENABLE;
+ I915_WRITE(BLC_PWM_PCH_CTL1, tmp);
}
+}
- spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
+static void i965_enable_backlight(struct drm_device *dev, enum pipe pipe)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ u32 tmp;
+
+ tmp = I915_READ(BLC_PWM_CTL2);
+
+ /* Note that this can also get called through dpms changes. And
+ * we don't track the backlight dpms state, hence check whether
+ * we have to do anything first. */
+ if (tmp & BLM_PWM_ENABLE)
+ return;
+
+ tmp &= ~BLM_PIPE_SELECT;
+ tmp |= BLM_PIPE(pipe);
+ tmp &= ~BLM_PWM_ENABLE;
+
+ I915_WRITE(BLC_PWM_CTL2, tmp);
+ POSTING_READ(BLC_PWM_CTL2);
+ I915_WRITE(BLC_PWM_CTL2, tmp | BLM_PWM_ENABLE);
+}
+
+static void vlv_enable_backlight(struct drm_device *dev, enum pipe pipe)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ u32 tmp;
+
+ tmp = I915_READ(VLV_BLC_PWM_CTL2(pipe));
+
+ /* Note that this can also get called through dpms changes. And
+ * we don't track the backlight dpms state, hence check whether
+ * we have to do anything first. */
+ if (tmp & BLM_PWM_ENABLE)
+ return;
+
+ tmp &= ~BLM_PIPE_SELECT;
+ tmp |= BLM_PIPE(pipe);
+ tmp &= ~BLM_PWM_ENABLE;
+
+ I915_WRITE(VLV_BLC_PWM_CTL2(pipe), tmp);
+ POSTING_READ(VLV_BLC_PWM_CTL2(pipe));
+ I915_WRITE(VLV_BLC_PWM_CTL2(pipe), tmp | BLM_PWM_ENABLE);
}
void intel_panel_enable_backlight(struct intel_connector *connector)
@@ -617,8 +761,6 @@ void intel_panel_enable_backlight(struct intel_connector *connector)
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_panel *panel = &connector->panel;
enum pipe pipe = intel_get_pipe_from_connector(connector);
- enum transcoder cpu_transcoder =
- intel_pipe_to_cpu_transcoder(dev_priv, pipe);
unsigned long flags;
if (pipe == INVALID_PIPE)
@@ -636,49 +778,9 @@ void intel_panel_enable_backlight(struct intel_connector *connector)
panel->backlight.level;
}
- if (INTEL_INFO(dev)->gen >= 4) {
- uint32_t reg, tmp;
-
- if (HAS_PCH_SPLIT(dev))
- reg = BLC_PWM_CPU_CTL2;
- else if (IS_VALLEYVIEW(dev))
- reg = VLV_BLC_PWM_CTL2(pipe);
- else
- reg = BLC_PWM_CTL2;
-
- tmp = I915_READ(reg);
-
- /* Note that this can also get called through dpms changes. And
- * we don't track the backlight dpms state, hence check whether
- * we have to do anything first. */
- if (tmp & BLM_PWM_ENABLE)
- goto set_level;
-
- if (INTEL_INFO(dev)->num_pipes == 3)
- tmp &= ~BLM_PIPE_SELECT_IVB;
- else
- tmp &= ~BLM_PIPE_SELECT;
-
- if (cpu_transcoder == TRANSCODER_EDP)
- tmp |= BLM_TRANSCODER_EDP;
- else
- tmp |= BLM_PIPE(cpu_transcoder);
- tmp &= ~BLM_PWM_ENABLE;
-
- I915_WRITE(reg, tmp);
- POSTING_READ(reg);
- I915_WRITE(reg, tmp | BLM_PWM_ENABLE);
-
- if (HAS_PCH_SPLIT(dev) &&
- !(dev_priv->quirks & QUIRK_NO_PCH_PWM_ENABLE)) {
- tmp = I915_READ(BLC_PWM_PCH_CTL1);
- tmp |= BLM_PCH_PWM_ENABLE;
- tmp &= ~BLM_PCH_OVERRIDE_ENABLE;
- I915_WRITE(BLC_PWM_PCH_CTL1, tmp);
- }
- }
+ if (dev_priv->display.enable_backlight)
+ dev_priv->display.enable_backlight(dev, pipe);
-set_level:
/* Call below after setting BLC_PWM_CPU_CTL2 and BLC_PWM_PCH_CTL1.
* BLC_PWM_CPU_CTL may be cleared to zero automatically when these
* registers are set.
@@ -854,6 +956,36 @@ void intel_panel_destroy_backlight(struct drm_connector *connector)
intel_backlight_device_unregister(intel_connector);
}
+/* Set up chip specific backlight functions */
+void intel_panel_init_backlight_funcs(struct drm_device *dev)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+
+ if (HAS_PCH_SPLIT(dev)) {
+ dev_priv->display.enable_backlight = pch_enable_backlight;
+ dev_priv->display.disable_backlight = pch_disable_backlight;
+ dev_priv->display.set_backlight = pch_set_backlight;
+ dev_priv->display.get_backlight = pch_get_backlight;
+ dev_priv->display.get_max_backlight = pch_get_max_backlight;
+ } else if (IS_VALLEYVIEW(dev)) {
+ dev_priv->display.enable_backlight = vlv_enable_backlight;
+ dev_priv->display.disable_backlight = vlv_disable_backlight;
+ dev_priv->display.set_backlight = vlv_set_backlight;
+ dev_priv->display.get_backlight = vlv_get_backlight;
+ dev_priv->display.get_max_backlight = vlv_get_max_backlight;
+ } else if (IS_GEN4(dev)) {
+ dev_priv->display.enable_backlight = i965_enable_backlight;
+ dev_priv->display.disable_backlight = i965_disable_backlight;
+ dev_priv->display.set_backlight = i9xx_set_backlight;
+ dev_priv->display.get_backlight = i9xx_get_backlight;
+ dev_priv->display.get_max_backlight = i965_get_max_backlight;
+ } else {
+ dev_priv->display.set_backlight = i9xx_set_backlight;
+ dev_priv->display.get_backlight = i9xx_get_backlight;
+ dev_priv->display.get_max_backlight = i9xx_get_max_backlight;
+ }
+}
+
int intel_panel_init(struct intel_panel *panel,
struct drm_display_mode *fixed_mode)
{
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 6/7] drm/i915: handle backlight through chip specific functions
2013-10-31 16:55 ` [PATCH 6/7] drm/i915: handle backlight through chip specific functions Jani Nikula
@ 2013-11-06 17:12 ` Joe Konno
0 siblings, 0 replies; 19+ messages in thread
From: Joe Konno @ 2013-11-06 17:12 UTC (permalink / raw)
To: intel-gfx
On 10/31/2013 09:55 AM, Jani Nikula wrote:
> The backlight code has grown rather hairy, not least because the
> hardware registers and bits have repeatedly been shuffled around. And
> this isn't expected to get any easier with new hardware. Make things
> easier for our (read: my) poor brains, and split the code up into chip
> specific functions.
>
> There should be no functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 7 +
> drivers/gpu/drm/i915/intel_display.c | 2 +
> drivers/gpu/drm/i915/intel_drv.h | 1 +
> drivers/gpu/drm/i915/intel_panel.c | 442 ++++++++++++++++++++++------------
> 4 files changed, 297 insertions(+), 155 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 16b93a6..0753e7c 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -409,6 +409,13 @@ struct drm_i915_display_funcs {
> /* render clock increase/decrease */
> /* display clock increase/decrease */
> /* pll clock increase/decrease */
> +
> + uint32_t (*get_max_backlight)(struct drm_device *dev, enum pipe pipe);
> + uint32_t (*get_backlight)(struct drm_device *dev, enum pipe pipe);
> + void (*set_backlight)(struct drm_device *dev, enum pipe pipe,
> + uint32_t level);
> + void (*disable_backlight)(struct drm_device *dev, enum pipe pipe);
> + void (*enable_backlight)(struct drm_device *dev, enum pipe pipe);
> };
>
> struct intel_uncore_funcs {
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 774407d..d25d23c 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -10355,6 +10355,8 @@ static void intel_init_display(struct drm_device *dev)
> dev_priv->display.queue_flip = intel_gen7_queue_flip;
> break;
> }
> +
> + intel_panel_init_backlight_funcs(dev);
> }
>
> /*
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 9460e54..b367f2f 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -816,6 +816,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector);
> void intel_panel_enable_backlight(struct intel_connector *connector);
> void intel_panel_disable_backlight(struct intel_connector *connector);
> void intel_panel_destroy_backlight(struct drm_connector *connector);
> +void intel_panel_init_backlight_funcs(struct drm_device *dev);
> enum drm_connector_status intel_panel_detect(struct drm_device *dev);
>
>
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index 0a4aeaf..03e806f 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -338,79 +338,105 @@ static int is_backlight_combination_mode(struct drm_device *dev)
> return 0;
> }
>
> -/* XXX: query mode clock or hardware clock and program max PWM appropriately
> - * when it's 0.
> - */
> -static u32 i915_read_blc_pwm_ctl(struct drm_device *dev, enum pipe pipe)
> +static u32 pch_get_max_backlight(struct drm_device *dev, enum pipe pipe)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 val;
>
> - WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight_lock));
> + val = I915_READ(BLC_PWM_PCH_CTL2);
> + if (dev_priv->regfile.saveBLC_PWM_CTL2 == 0) {
> + dev_priv->regfile.saveBLC_PWM_CTL2 = val;
> + } else if (val == 0) {
> + val = dev_priv->regfile.saveBLC_PWM_CTL2;
> + I915_WRITE(BLC_PWM_PCH_CTL2, val);
> + }
>
> - /* Restore the CTL value if it lost, e.g. GPU reset */
> + val >>= 16;
>
> - if (HAS_PCH_SPLIT(dev_priv->dev)) {
> - val = I915_READ(BLC_PWM_PCH_CTL2);
> - if (dev_priv->regfile.saveBLC_PWM_CTL2 == 0) {
> - dev_priv->regfile.saveBLC_PWM_CTL2 = val;
> - } else if (val == 0) {
> - val = dev_priv->regfile.saveBLC_PWM_CTL2;
> - I915_WRITE(BLC_PWM_PCH_CTL2, val);
> - }
> - } else if (IS_VALLEYVIEW(dev)) {
> - val = I915_READ(VLV_BLC_PWM_CTL(pipe));
> - if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
> - dev_priv->regfile.saveBLC_PWM_CTL = val;
> - dev_priv->regfile.saveBLC_PWM_CTL2 =
> - I915_READ(VLV_BLC_PWM_CTL2(pipe));
> - } else if (val == 0) {
> - val = dev_priv->regfile.saveBLC_PWM_CTL;
> - I915_WRITE(VLV_BLC_PWM_CTL(pipe), val);
> - I915_WRITE(VLV_BLC_PWM_CTL2(pipe),
> - dev_priv->regfile.saveBLC_PWM_CTL2);
> - }
> + return val;
> +}
>
> - if (!val)
> - val = 0x0f42ffff;
> - } else {
> - val = I915_READ(BLC_PWM_CTL);
> - if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
> - dev_priv->regfile.saveBLC_PWM_CTL = val;
> - if (INTEL_INFO(dev)->gen >= 4)
> - dev_priv->regfile.saveBLC_PWM_CTL2 =
> - I915_READ(BLC_PWM_CTL2);
> - } else if (val == 0) {
> - val = dev_priv->regfile.saveBLC_PWM_CTL;
> - I915_WRITE(BLC_PWM_CTL, val);
> - if (INTEL_INFO(dev)->gen >= 4)
> - I915_WRITE(BLC_PWM_CTL2,
> - dev_priv->regfile.saveBLC_PWM_CTL2);
> - }
> +static u32 i9xx_get_max_backlight(struct drm_device *dev, enum pipe pipe)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + u32 val;
> +
> + val = I915_READ(BLC_PWM_CTL);
> + if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
> + dev_priv->regfile.saveBLC_PWM_CTL = val;
> + } else if (val == 0) {
> + val = dev_priv->regfile.saveBLC_PWM_CTL;
> + I915_WRITE(BLC_PWM_CTL, val);
> }
>
> + val >>= 17;
> +
> + if (is_backlight_combination_mode(dev))
> + val *= 0xff;
> +
> return val;
> }
>
> -static u32 intel_panel_get_max_backlight(struct drm_device *dev,
> - enum pipe pipe)
> +static u32 i965_get_max_backlight(struct drm_device *dev, enum pipe pipe)
> {
> - u32 max;
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + u32 val;
>
> - max = i915_read_blc_pwm_ctl(dev, pipe);
> + val = I915_READ(BLC_PWM_CTL);
> + if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
> + dev_priv->regfile.saveBLC_PWM_CTL = val;
> + dev_priv->regfile.saveBLC_PWM_CTL2 = I915_READ(BLC_PWM_CTL2);
> + } else if (val == 0) {
> + val = dev_priv->regfile.saveBLC_PWM_CTL;
> + I915_WRITE(BLC_PWM_CTL, val);
> + I915_WRITE(BLC_PWM_CTL2, dev_priv->regfile.saveBLC_PWM_CTL2);
> + }
>
> - if (HAS_PCH_SPLIT(dev)) {
> - max >>= 16;
> - } else {
> - if (INTEL_INFO(dev)->gen < 4)
> - max >>= 17;
> - else
> - max >>= 16;
> + val >>= 16;
> +
> + if (is_backlight_combination_mode(dev))
> + val *= 0xff;
> +
> + return val;
> +}
> +
> +static u32 vlv_get_max_backlight(struct drm_device *dev, enum pipe pipe)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + u32 val;
>
> - if (is_backlight_combination_mode(dev))
> - max *= 0xff;
> + val = I915_READ(VLV_BLC_PWM_CTL(pipe));
> + if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
> + dev_priv->regfile.saveBLC_PWM_CTL = val;
> + dev_priv->regfile.saveBLC_PWM_CTL2 =
> + I915_READ(VLV_BLC_PWM_CTL2(pipe));
> + } else if (val == 0) {
> + val = dev_priv->regfile.saveBLC_PWM_CTL;
> + I915_WRITE(VLV_BLC_PWM_CTL(pipe), val);
> + I915_WRITE(VLV_BLC_PWM_CTL2(pipe),
> + dev_priv->regfile.saveBLC_PWM_CTL2);
> }
>
> + if (!val)
> + val = 0x0f42ffff;
> +
> + val >>= 16;
> +
> + return val;
> +}
> +
> +/* XXX: query mode clock or hardware clock and program max PWM appropriately
> + * when it's 0.
> + */
> +static u32 intel_panel_get_max_backlight(struct drm_device *dev, enum pipe pipe)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + u32 max;
> +
> + WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight_lock));
> +
> + max = dev_priv->display.get_max_backlight(dev, pipe);
> +
> DRM_DEBUG_DRIVER("max backlight PWM = %d\n", max);
>
> return max;
> @@ -441,36 +467,48 @@ static u32 intel_panel_compute_brightness(struct drm_device *dev,
> return val;
> }
>
> -static u32 intel_panel_get_backlight(struct drm_device *dev,
> - enum pipe pipe)
> +static u32 pch_get_backlight(struct drm_device *dev, enum pipe pipe)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> - u32 val;
> - unsigned long flags;
> - int reg;
>
> - spin_lock_irqsave(&dev_priv->backlight_lock, flags);
> + return I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
> +}
>
> - if (HAS_PCH_SPLIT(dev)) {
> - val = I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
> - } else {
> - if (IS_VALLEYVIEW(dev))
> - reg = VLV_BLC_PWM_CTL(pipe);
> - else
> - reg = BLC_PWM_CTL;
> +static u32 i9xx_get_backlight(struct drm_device *dev, enum pipe pipe)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + u32 val;
>
> - val = I915_READ(reg) & BACKLIGHT_DUTY_CYCLE_MASK;
> - if (INTEL_INFO(dev)->gen < 4)
> - val >>= 1;
> + val = I915_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
> + if (INTEL_INFO(dev)->gen < 4)
> + val >>= 1;
>
> - if (is_backlight_combination_mode(dev)) {
> - u8 lbpc;
> + if (is_backlight_combination_mode(dev)) {
> + u8 lbpc;
>
> - pci_read_config_byte(dev->pdev, PCI_LBPC, &lbpc);
> - val *= lbpc;
> - }
> + pci_read_config_byte(dev->pdev, PCI_LBPC, &lbpc);
> + val *= lbpc;
> }
>
> + return val;
> +}
> +
> +static u32 vlv_get_backlight(struct drm_device *dev, enum pipe pipe)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> +
> + return I915_READ(VLV_BLC_PWM_CTL(pipe)) & BACKLIGHT_DUTY_CYCLE_MASK;
> +}
> +
> +static u32 intel_panel_get_backlight(struct drm_device *dev, enum pipe pipe)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + u32 val;
> + unsigned long flags;
> +
> + spin_lock_irqsave(&dev_priv->backlight_lock, flags);
> +
> + val = dev_priv->display.get_backlight(dev, pipe);
> val = intel_panel_compute_brightness(dev, pipe, val);
>
> spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
> @@ -479,25 +517,20 @@ static u32 intel_panel_get_backlight(struct drm_device *dev,
> return val;
> }
>
> -static void intel_pch_panel_set_backlight(struct drm_device *dev, u32 level)
> +static void pch_set_backlight(struct drm_device *dev, enum pipe pipe, u32 level)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> - u32 val = I915_READ(BLC_PWM_CPU_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK;
> - I915_WRITE(BLC_PWM_CPU_CTL, val | level);
> + u32 tmp;
> +
> + tmp = I915_READ(BLC_PWM_CPU_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK;
> + I915_WRITE(BLC_PWM_CPU_CTL, tmp | level);
> }
>
> -static void intel_panel_actually_set_backlight(struct drm_device *dev,
> - enum pipe pipe, u32 level)
> +static void i9xx_set_backlight(struct drm_device *dev, enum pipe pipe,
> + u32 level)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 tmp;
> - int reg;
> -
> - DRM_DEBUG_DRIVER("set backlight PWM = %d\n", level);
> - level = intel_panel_compute_brightness(dev, pipe, level);
> -
> - if (HAS_PCH_SPLIT(dev))
> - return intel_pch_panel_set_backlight(dev, level);
>
> if (is_backlight_combination_mode(dev)) {
> u32 max = intel_panel_get_max_backlight(dev, pipe);
> @@ -512,16 +545,31 @@ static void intel_panel_actually_set_backlight(struct drm_device *dev,
> pci_write_config_byte(dev->pdev, PCI_LBPC, lbpc);
> }
>
> - if (IS_VALLEYVIEW(dev))
> - reg = VLV_BLC_PWM_CTL(pipe);
> - else
> - reg = BLC_PWM_CTL;
> -
> - tmp = I915_READ(reg);
> if (INTEL_INFO(dev)->gen < 4)
> level <<= 1;
> - tmp &= ~BACKLIGHT_DUTY_CYCLE_MASK;
> - I915_WRITE(reg, tmp | level);
> +
> + tmp = I915_READ(BLC_PWM_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK;
> + I915_WRITE(BLC_PWM_CTL, tmp | level);
> +}
> +
> +static void vlv_set_backlight(struct drm_device *dev, enum pipe pipe, u32 level)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + u32 tmp;
> +
> + tmp = I915_READ(VLV_BLC_PWM_CTL(pipe)) & ~BACKLIGHT_DUTY_CYCLE_MASK;
> + I915_WRITE(VLV_BLC_PWM_CTL(pipe), tmp | level);
> +}
> +
> +static void intel_panel_actually_set_backlight(struct drm_device *dev,
> + enum pipe pipe, u32 level)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> +
> + DRM_DEBUG_DRIVER("set backlight PWM = %d\n", level);
> +
> + level = intel_panel_compute_brightness(dev, pipe, level);
> + dev_priv->display.set_backlight(dev, pipe, level);
> }
>
> /* set backlight brightness to level in range [0..max] */
> @@ -562,6 +610,36 @@ out:
> spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
> }
>
> +static void pch_disable_backlight(struct drm_device *dev, enum pipe pipe)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + u32 tmp;
> +
> + tmp = I915_READ(BLC_PWM_CPU_CTL2);
> + I915_WRITE(BLC_PWM_CPU_CTL2, tmp & ~BLM_PWM_ENABLE);
> +
> + tmp = I915_READ(BLC_PWM_PCH_CTL1);
> + I915_WRITE(BLC_PWM_PCH_CTL1, tmp & ~BLM_PCH_PWM_ENABLE);
> +}
> +
> +static void i965_disable_backlight(struct drm_device *dev, enum pipe pipe)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + u32 tmp;
> +
> + tmp = I915_READ(BLC_PWM_CTL2);
> + I915_WRITE(BLC_PWM_CTL2, tmp & ~BLM_PWM_ENABLE);
> +}
> +
> +static void vlv_disable_backlight(struct drm_device *dev, enum pipe pipe)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + u32 tmp;
> +
> + tmp = I915_READ(VLV_BLC_PWM_CTL2(pipe));
> + I915_WRITE(VLV_BLC_PWM_CTL2(pipe), tmp & ~BLM_PWM_ENABLE);
> +}
> +
> void intel_panel_disable_backlight(struct intel_connector *connector)
> {
> struct drm_device *dev = connector->base.dev;
> @@ -589,26 +667,92 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
> panel->backlight.enabled = false;
> intel_panel_actually_set_backlight(dev, pipe, 0);
>
> - if (INTEL_INFO(dev)->gen >= 4) {
> - uint32_t reg, tmp;
> + if (dev_priv->display.disable_backlight)
> + dev_priv->display.disable_backlight(dev, pipe);
>
> - if (HAS_PCH_SPLIT(dev))
> - reg = BLC_PWM_CPU_CTL2;
> - else if (IS_VALLEYVIEW(dev))
> - reg = VLV_BLC_PWM_CTL2(pipe);
> - else
> - reg = BLC_PWM_CTL2;
> + spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
> +}
>
> - I915_WRITE(reg, I915_READ(reg) & ~BLM_PWM_ENABLE);
> +static void pch_enable_backlight(struct drm_device *dev, enum pipe pipe)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + enum transcoder cpu_transcoder =
> + intel_pipe_to_cpu_transcoder(dev_priv, pipe);
> + u32 tmp;
>
> - if (HAS_PCH_SPLIT(dev)) {
> - tmp = I915_READ(BLC_PWM_PCH_CTL1);
> - tmp &= ~BLM_PCH_PWM_ENABLE;
> - I915_WRITE(BLC_PWM_PCH_CTL1, tmp);
> - }
> + tmp = I915_READ(BLC_PWM_CPU_CTL2);
> +
> + /* Note that this can also get called through dpms changes. And
> + * we don't track the backlight dpms state, hence check whether
> + * we have to do anything first. */
> + if (tmp & BLM_PWM_ENABLE)
> + return;
> +
> + if (INTEL_INFO(dev)->num_pipes == 3)
> + tmp &= ~BLM_PIPE_SELECT_IVB;
> + else
> + tmp &= ~BLM_PIPE_SELECT;
> +
> + if (cpu_transcoder == TRANSCODER_EDP)
> + tmp |= BLM_TRANSCODER_EDP;
> + else
> + tmp |= BLM_PIPE(cpu_transcoder);
> + tmp &= ~BLM_PWM_ENABLE;
> +
> + I915_WRITE(BLC_PWM_CPU_CTL2, tmp);
> + POSTING_READ(BLC_PWM_CPU_CTL2);
> + I915_WRITE(BLC_PWM_CPU_CTL2, tmp | BLM_PWM_ENABLE);
> +
> + if (!(dev_priv->quirks & QUIRK_NO_PCH_PWM_ENABLE)) {
> + tmp = I915_READ(BLC_PWM_PCH_CTL1);
> + tmp |= BLM_PCH_PWM_ENABLE;
> + tmp &= ~BLM_PCH_OVERRIDE_ENABLE;
> + I915_WRITE(BLC_PWM_PCH_CTL1, tmp);
> }
> +}
>
> - spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
> +static void i965_enable_backlight(struct drm_device *dev, enum pipe pipe)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + u32 tmp;
> +
> + tmp = I915_READ(BLC_PWM_CTL2);
> +
> + /* Note that this can also get called through dpms changes. And
> + * we don't track the backlight dpms state, hence check whether
> + * we have to do anything first. */
> + if (tmp & BLM_PWM_ENABLE)
> + return;
> +
> + tmp &= ~BLM_PIPE_SELECT;
> + tmp |= BLM_PIPE(pipe);
> + tmp &= ~BLM_PWM_ENABLE;
> +
> + I915_WRITE(BLC_PWM_CTL2, tmp);
> + POSTING_READ(BLC_PWM_CTL2);
> + I915_WRITE(BLC_PWM_CTL2, tmp | BLM_PWM_ENABLE);
> +}
> +
> +static void vlv_enable_backlight(struct drm_device *dev, enum pipe pipe)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + u32 tmp;
> +
> + tmp = I915_READ(VLV_BLC_PWM_CTL2(pipe));
> +
> + /* Note that this can also get called through dpms changes. And
> + * we don't track the backlight dpms state, hence check whether
> + * we have to do anything first. */
> + if (tmp & BLM_PWM_ENABLE)
> + return;
> +
> + tmp &= ~BLM_PIPE_SELECT;
> + tmp |= BLM_PIPE(pipe);
> + tmp &= ~BLM_PWM_ENABLE;
> +
> + I915_WRITE(VLV_BLC_PWM_CTL2(pipe), tmp);
> + POSTING_READ(VLV_BLC_PWM_CTL2(pipe));
> + I915_WRITE(VLV_BLC_PWM_CTL2(pipe), tmp | BLM_PWM_ENABLE);
> }
>
> void intel_panel_enable_backlight(struct intel_connector *connector)
> @@ -617,8 +761,6 @@ void intel_panel_enable_backlight(struct intel_connector *connector)
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_panel *panel = &connector->panel;
> enum pipe pipe = intel_get_pipe_from_connector(connector);
> - enum transcoder cpu_transcoder =
> - intel_pipe_to_cpu_transcoder(dev_priv, pipe);
> unsigned long flags;
>
> if (pipe == INVALID_PIPE)
> @@ -636,49 +778,9 @@ void intel_panel_enable_backlight(struct intel_connector *connector)
> panel->backlight.level;
> }
>
> - if (INTEL_INFO(dev)->gen >= 4) {
> - uint32_t reg, tmp;
> -
> - if (HAS_PCH_SPLIT(dev))
> - reg = BLC_PWM_CPU_CTL2;
> - else if (IS_VALLEYVIEW(dev))
> - reg = VLV_BLC_PWM_CTL2(pipe);
> - else
> - reg = BLC_PWM_CTL2;
> -
> - tmp = I915_READ(reg);
> -
> - /* Note that this can also get called through dpms changes. And
> - * we don't track the backlight dpms state, hence check whether
> - * we have to do anything first. */
> - if (tmp & BLM_PWM_ENABLE)
> - goto set_level;
> -
> - if (INTEL_INFO(dev)->num_pipes == 3)
> - tmp &= ~BLM_PIPE_SELECT_IVB;
> - else
> - tmp &= ~BLM_PIPE_SELECT;
> -
> - if (cpu_transcoder == TRANSCODER_EDP)
> - tmp |= BLM_TRANSCODER_EDP;
> - else
> - tmp |= BLM_PIPE(cpu_transcoder);
> - tmp &= ~BLM_PWM_ENABLE;
> -
> - I915_WRITE(reg, tmp);
> - POSTING_READ(reg);
> - I915_WRITE(reg, tmp | BLM_PWM_ENABLE);
> -
> - if (HAS_PCH_SPLIT(dev) &&
> - !(dev_priv->quirks & QUIRK_NO_PCH_PWM_ENABLE)) {
> - tmp = I915_READ(BLC_PWM_PCH_CTL1);
> - tmp |= BLM_PCH_PWM_ENABLE;
> - tmp &= ~BLM_PCH_OVERRIDE_ENABLE;
> - I915_WRITE(BLC_PWM_PCH_CTL1, tmp);
> - }
> - }
> + if (dev_priv->display.enable_backlight)
> + dev_priv->display.enable_backlight(dev, pipe);
>
> -set_level:
> /* Call below after setting BLC_PWM_CPU_CTL2 and BLC_PWM_PCH_CTL1.
> * BLC_PWM_CPU_CTL may be cleared to zero automatically when these
> * registers are set.
> @@ -854,6 +956,36 @@ void intel_panel_destroy_backlight(struct drm_connector *connector)
> intel_backlight_device_unregister(intel_connector);
> }
>
> +/* Set up chip specific backlight functions */
> +void intel_panel_init_backlight_funcs(struct drm_device *dev)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> +
> + if (HAS_PCH_SPLIT(dev)) {
> + dev_priv->display.enable_backlight = pch_enable_backlight;
> + dev_priv->display.disable_backlight = pch_disable_backlight;
> + dev_priv->display.set_backlight = pch_set_backlight;
> + dev_priv->display.get_backlight = pch_get_backlight;
> + dev_priv->display.get_max_backlight = pch_get_max_backlight;
> + } else if (IS_VALLEYVIEW(dev)) {
> + dev_priv->display.enable_backlight = vlv_enable_backlight;
> + dev_priv->display.disable_backlight = vlv_disable_backlight;
> + dev_priv->display.set_backlight = vlv_set_backlight;
> + dev_priv->display.get_backlight = vlv_get_backlight;
> + dev_priv->display.get_max_backlight = vlv_get_max_backlight;
> + } else if (IS_GEN4(dev)) {
> + dev_priv->display.enable_backlight = i965_enable_backlight;
> + dev_priv->display.disable_backlight = i965_disable_backlight;
> + dev_priv->display.set_backlight = i9xx_set_backlight;
> + dev_priv->display.get_backlight = i9xx_get_backlight;
> + dev_priv->display.get_max_backlight = i965_get_max_backlight;
> + } else {
> + dev_priv->display.set_backlight = i9xx_set_backlight;
> + dev_priv->display.get_backlight = i9xx_get_backlight;
> + dev_priv->display.get_max_backlight = i9xx_get_max_backlight;
> + }
> +}
> +
> int intel_panel_init(struct intel_panel *panel,
> struct drm_display_mode *fixed_mode)
> {
>
Tested-by: Joe Konno <joe.konno@intel.com>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 7/7] drm/i915: make asle notifications update backlight on all connectors
2013-10-31 16:55 [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs Jani Nikula
` (5 preceding siblings ...)
2013-10-31 16:55 ` [PATCH 6/7] drm/i915: handle backlight through chip specific functions Jani Nikula
@ 2013-10-31 16:55 ` Jani Nikula
2013-11-06 17:12 ` Joe Konno
2013-10-31 21:34 ` [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs Joe Konno
7 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2013-10-31 16:55 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, jesse.barnes
ALthough usually there's only one connector that supports backlight,
this also finds the correct connector. Before, we only updated the
connector on pipe A, which might not be the one with backlight. (This
only made a difference on BYT.)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_drv.h | 1 +
drivers/gpu/drm/i915/intel_opregion.c | 43 ++++++++++-----------------------
drivers/gpu/drm/i915/intel_panel.c | 4 +++
3 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index b367f2f..3d2e0d2 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -159,6 +159,7 @@ struct intel_panel {
/* backlight */
struct {
+ bool present;
u32 level;
bool enabled;
struct backlight_device *device;
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 91b68dc..a0b5a99 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -396,13 +396,10 @@ int intel_opregion_notify_adapter(struct drm_device *dev, pci_power_t state)
static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
{
struct drm_i915_private *dev_priv = dev->dev_private;
- struct drm_encoder *encoder;
struct drm_connector *connector;
- struct intel_connector *intel_connector = NULL;
- struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[0];
+ struct intel_connector *intel_connector;
+ struct intel_panel *panel;
struct opregion_asle __iomem *asle = dev_priv->opregion.asle;
- u32 ret = 0;
- bool found = false;
DRM_DEBUG_DRIVER("bclp = 0x%08x\n", bclp);
@@ -414,38 +411,24 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
return ASLC_BACKLIGHT_FAILED;
mutex_lock(&dev->mode_config.mutex);
+
/*
- * Could match the OpRegion connector here instead, but we'd also need
- * to verify the connector could handle a backlight call.
+ * Update backlight on all connectors that support backlight (usually
+ * only one).
*/
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)
- if (encoder->crtc == crtc) {
- found = true;
- break;
- }
-
- if (!found) {
- ret = ASLC_BACKLIGHT_FAILED;
- goto out;
- }
-
- list_for_each_entry(connector, &dev->mode_config.connector_list, head)
- if (connector->encoder == encoder)
- intel_connector = to_intel_connector(connector);
-
- if (!intel_connector) {
- ret = ASLC_BACKLIGHT_FAILED;
- goto out;
- }
-
DRM_DEBUG_KMS("updating opregion backlight %d/255\n", bclp);
- intel_panel_set_backlight(intel_connector, bclp, 255);
+ list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ intel_connector = to_intel_connector(connector);
+ panel = &intel_connector->panel;
+ if (panel->backlight.present)
+ intel_panel_set_backlight(intel_connector, bclp, 255);
+ }
iowrite32(DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID, &asle->cblv);
-out:
mutex_unlock(&dev->mode_config.mutex);
- return ret;
+
+ return 0;
}
static u32 asle_set_als_illum(struct drm_device *dev, u32 alsi)
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 03e806f..e46226c 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -946,13 +946,17 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
intel_backlight_device_register(intel_connector);
+ panel->backlight.present = true;
+
return 0;
}
void intel_panel_destroy_backlight(struct drm_connector *connector)
{
struct intel_connector *intel_connector = to_intel_connector(connector);
+ struct intel_panel *panel = &intel_connector->panel;
+ panel->backlight.present = false;
intel_backlight_device_unregister(intel_connector);
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 7/7] drm/i915: make asle notifications update backlight on all connectors
2013-10-31 16:55 ` [PATCH 7/7] drm/i915: make asle notifications update backlight on all connectors Jani Nikula
@ 2013-11-06 17:12 ` Joe Konno
0 siblings, 0 replies; 19+ messages in thread
From: Joe Konno @ 2013-11-06 17:12 UTC (permalink / raw)
To: intel-gfx
On 10/31/2013 09:55 AM, Jani Nikula wrote:
> ALthough usually there's only one connector that supports backlight,
> this also finds the correct connector. Before, we only updated the
> connector on pipe A, which might not be the one with backlight. (This
> only made a difference on BYT.)
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_drv.h | 1 +
> drivers/gpu/drm/i915/intel_opregion.c | 43 ++++++++++-----------------------
> drivers/gpu/drm/i915/intel_panel.c | 4 +++
> 3 files changed, 18 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index b367f2f..3d2e0d2 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -159,6 +159,7 @@ struct intel_panel {
>
> /* backlight */
> struct {
> + bool present;
> u32 level;
> bool enabled;
> struct backlight_device *device;
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index 91b68dc..a0b5a99 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -396,13 +396,10 @@ int intel_opregion_notify_adapter(struct drm_device *dev, pci_power_t state)
> static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> - struct drm_encoder *encoder;
> struct drm_connector *connector;
> - struct intel_connector *intel_connector = NULL;
> - struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[0];
> + struct intel_connector *intel_connector;
> + struct intel_panel *panel;
> struct opregion_asle __iomem *asle = dev_priv->opregion.asle;
> - u32 ret = 0;
> - bool found = false;
>
> DRM_DEBUG_DRIVER("bclp = 0x%08x\n", bclp);
>
> @@ -414,38 +411,24 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
> return ASLC_BACKLIGHT_FAILED;
>
> mutex_lock(&dev->mode_config.mutex);
> +
> /*
> - * Could match the OpRegion connector here instead, but we'd also need
> - * to verify the connector could handle a backlight call.
> + * Update backlight on all connectors that support backlight (usually
> + * only one).
> */
> - list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)
> - if (encoder->crtc == crtc) {
> - found = true;
> - break;
> - }
> -
> - if (!found) {
> - ret = ASLC_BACKLIGHT_FAILED;
> - goto out;
> - }
> -
> - list_for_each_entry(connector, &dev->mode_config.connector_list, head)
> - if (connector->encoder == encoder)
> - intel_connector = to_intel_connector(connector);
> -
> - if (!intel_connector) {
> - ret = ASLC_BACKLIGHT_FAILED;
> - goto out;
> - }
> -
> DRM_DEBUG_KMS("updating opregion backlight %d/255\n", bclp);
> - intel_panel_set_backlight(intel_connector, bclp, 255);
> + list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> + intel_connector = to_intel_connector(connector);
> + panel = &intel_connector->panel;
> + if (panel->backlight.present)
> + intel_panel_set_backlight(intel_connector, bclp, 255);
> + }
> iowrite32(DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID, &asle->cblv);
>
> -out:
> mutex_unlock(&dev->mode_config.mutex);
>
> - return ret;
> +
> + return 0;
> }
>
> static u32 asle_set_als_illum(struct drm_device *dev, u32 alsi)
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index 03e806f..e46226c 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -946,13 +946,17 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
>
> intel_backlight_device_register(intel_connector);
>
> + panel->backlight.present = true;
> +
> return 0;
> }
>
> void intel_panel_destroy_backlight(struct drm_connector *connector)
> {
> struct intel_connector *intel_connector = to_intel_connector(connector);
> + struct intel_panel *panel = &intel_connector->panel;
>
> + panel->backlight.present = false;
> intel_backlight_device_unregister(intel_connector);
> }
>
>
Tested-by: Joe Konno <joe.konno@intel.com>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs
2013-10-31 16:55 [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs Jani Nikula
` (6 preceding siblings ...)
2013-10-31 16:55 ` [PATCH 7/7] drm/i915: make asle notifications update backlight on all connectors Jani Nikula
@ 2013-10-31 21:34 ` Joe Konno
2013-11-01 13:28 ` Jani Nikula
7 siblings, 1 reply; 19+ messages in thread
From: Joe Konno @ 2013-10-31 21:34 UTC (permalink / raw)
To: intel-gfx
Hi Jani,
Applied this patchset to danvet/drm-intel-next-queued and did a quick test
on VLV2 with mutter. Tested eDP + VGA hotplug, test failed.
Hot-plugging VGA with eDP active resulted in the eDP's backlight being
kicked off. Then, after unplugging and replugging, the eDP backlight returned.
Running Arch 64-bit with kernel dinq + this set, mutter 3.10.1.1, Xorg
1.14.3, xf86-video-intel 2.21.15.
Cheers, hth
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs
2013-10-31 21:34 ` [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs Joe Konno
@ 2013-11-01 13:28 ` Jani Nikula
2013-11-01 14:30 ` Joe Konno
0 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2013-11-01 13:28 UTC (permalink / raw)
To: Joe Konno, intel-gfx
On Thu, 31 Oct 2013, Joe Konno <joe.konno@linux.intel.com> wrote:
> Hi Jani,
>
> Applied this patchset to danvet/drm-intel-next-queued and did a quick test
> on VLV2 with mutter. Tested eDP + VGA hotplug, test failed.
>
> Hot-plugging VGA with eDP active resulted in the eDP's backlight being
> kicked off. Then, after unplugging and replugging, the eDP backlight returned.
>
> Running Arch 64-bit with kernel dinq + this set, mutter 3.10.1.1, Xorg
> 1.14.3, xf86-video-intel 2.21.15.
Hi Joe, thanks for testing. I've now tried this on snb and ivb laptops
myself, and it works fine - though vlv is different.
Please post the dmesg with drm.debug=0xe module parameter.
Does it work with plain drm-intel-nightly? Did you ever try with the two
patches from Jesse in [1] (they won't apply to current nightly though)?
How about with just the first three patches of this series?
Cheers,
Jani.
[1] http://mid.gmane.org/1381773821-16875-1-git-send-email-jbarnes@virtuousgeek.org
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/7] drm/i915: per connector backlight, per chip vfuncs
2013-11-01 13:28 ` Jani Nikula
@ 2013-11-01 14:30 ` Joe Konno
0 siblings, 0 replies; 19+ messages in thread
From: Joe Konno @ 2013-11-01 14:30 UTC (permalink / raw)
To: intel-gfx
On Fri, Nov 01, 2013 at 03:28:53PM +0200, Jani Nikula wrote:
> Please post the dmesg with drm.debug=0xe module parameter.
Sent to you privately.
> Does it work with plain drm-intel-nightly?
First item on my TODO list. In case it's interesting, test failed with
plain drm-intel-next-queued.
> Did you ever try with the two patches from Jesse in [1] (they won't apply to
> current nightly though)?
Yes, I tried those jbarnes patches (after some work) with
drm-intel-next-queued. I was able to hotplug and unplug repeatedly without
issue. Same test with same H/W and H/W configuration that I summarized in last
post.
> How about with just the first three patches of this series?
Second item on my TODO list.
Cheers
^ permalink raw reply [flat|nested] 19+ messages in thread