2010-08-07 10:01:28 +00:00
|
|
|
/*
|
|
|
|
* Copyright © 2006-2010 Intel Corporation
|
|
|
|
* Copyright (c) 2006 Dave Airlie <airlied@linux.ie>
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
* Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
|
|
* DEALINGS IN THE SOFTWARE.
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Eric Anholt <eric@anholt.net>
|
|
|
|
* Dave Airlie <airlied@linux.ie>
|
|
|
|
* Jesse Barnes <jesse.barnes@intel.com>
|
|
|
|
* Chris Wilson <chris@chris-wilson.co.uk>
|
|
|
|
*/
|
|
|
|
|
2012-03-18 20:00:11 +00:00
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2015-04-16 19:43:45 +00:00
|
|
|
#include <linux/kernel.h>
|
2012-03-15 14:56:25 +00:00
|
|
|
#include <linux/moduleparam.h>
|
2015-06-26 09:02:10 +00:00
|
|
|
#include <linux/pwm.h>
|
2019-04-05 11:00:06 +00:00
|
|
|
|
|
|
|
#include "intel_connector.h"
|
2019-08-06 11:39:33 +00:00
|
|
|
#include "intel_display_types.h"
|
2019-04-29 12:29:26 +00:00
|
|
|
#include "intel_dp_aux_backlight.h"
|
2019-04-29 12:29:34 +00:00
|
|
|
#include "intel_dsi_dcs_backlight.h"
|
2019-04-05 11:00:14 +00:00
|
|
|
#include "intel_panel.h"
|
2010-08-07 10:01:28 +00:00
|
|
|
|
2015-06-26 09:02:10 +00:00
|
|
|
#define CRC_PMIC_PWM_PERIOD_NS 21333
|
|
|
|
|
2010-08-07 10:01:28 +00:00
|
|
|
void
|
2013-09-02 18:13:39 +00:00
|
|
|
intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,
|
2010-08-07 10:01:28 +00:00
|
|
|
struct drm_display_mode *adjusted_mode)
|
|
|
|
{
|
2013-09-02 18:13:39 +00:00
|
|
|
drm_mode_copy(adjusted_mode, fixed_mode);
|
2013-08-27 09:24:09 +00:00
|
|
|
|
|
|
|
drm_mode_set_crtcinfo(adjusted_mode, 0);
|
2010-08-07 10:01:28 +00:00
|
|
|
}
|
|
|
|
|
2019-03-21 13:24:45 +00:00
|
|
|
static bool is_downclock_mode(const struct drm_display_mode *downclock_mode,
|
|
|
|
const struct drm_display_mode *fixed_mode)
|
|
|
|
{
|
|
|
|
return drm_mode_match(downclock_mode, fixed_mode,
|
|
|
|
DRM_MODE_MATCH_TIMINGS |
|
|
|
|
DRM_MODE_MATCH_FLAGS |
|
|
|
|
DRM_MODE_MATCH_3D_FLAGS) &&
|
|
|
|
downclock_mode->clock < fixed_mode->clock;
|
|
|
|
}
|
|
|
|
|
2014-04-29 20:30:48 +00:00
|
|
|
struct drm_display_mode *
|
2019-03-21 13:24:46 +00:00
|
|
|
intel_panel_edid_downclock_mode(struct intel_connector *connector,
|
|
|
|
const struct drm_display_mode *fixed_mode)
|
2014-04-29 20:30:48 +00:00
|
|
|
{
|
2019-03-21 13:24:46 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2019-03-21 13:24:45 +00:00
|
|
|
const struct drm_display_mode *scan, *best_mode = NULL;
|
2019-03-21 13:24:46 +00:00
|
|
|
struct drm_display_mode *downclock_mode;
|
2019-03-21 13:24:45 +00:00
|
|
|
int best_clock = fixed_mode->clock;
|
2014-04-29 20:30:48 +00:00
|
|
|
|
2019-03-21 13:24:46 +00:00
|
|
|
list_for_each_entry(scan, &connector->base.probed_modes, head) {
|
2014-04-29 20:30:48 +00:00
|
|
|
/*
|
|
|
|
* If one mode has the same resolution with the fixed_panel
|
|
|
|
* mode while they have the different refresh rate, it means
|
|
|
|
* that the reduced downclock is found. In such
|
|
|
|
* case we can set the different FPx0/1 to dynamically select
|
|
|
|
* between low and high frequency.
|
|
|
|
*/
|
2019-03-21 13:24:45 +00:00
|
|
|
if (is_downclock_mode(scan, fixed_mode) &&
|
|
|
|
scan->clock < best_clock) {
|
|
|
|
/*
|
|
|
|
* The downclock is already found. But we
|
|
|
|
* expect to find the lower downclock.
|
|
|
|
*/
|
|
|
|
best_clock = scan->clock;
|
|
|
|
best_mode = scan;
|
2014-04-29 20:30:48 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-21 13:24:46 +00:00
|
|
|
if (!best_mode)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
downclock_mode = drm_mode_duplicate(&dev_priv->drm, best_mode);
|
|
|
|
if (!downclock_mode)
|
|
|
|
return NULL;
|
|
|
|
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"[CONNECTOR:%d:%s] using downclock mode from EDID: ",
|
|
|
|
connector->base.base.id, connector->base.name);
|
2019-03-21 13:24:46 +00:00
|
|
|
drm_mode_debug_printmodeline(downclock_mode);
|
2019-03-21 13:24:45 +00:00
|
|
|
|
2019-03-21 13:24:46 +00:00
|
|
|
return downclock_mode;
|
2014-04-29 20:30:48 +00:00
|
|
|
}
|
|
|
|
|
2019-03-21 13:24:41 +00:00
|
|
|
struct drm_display_mode *
|
|
|
|
intel_panel_edid_fixed_mode(struct intel_connector *connector)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
const struct drm_display_mode *scan;
|
2019-03-21 13:24:42 +00:00
|
|
|
struct drm_display_mode *fixed_mode;
|
|
|
|
|
|
|
|
if (list_empty(&connector->base.probed_modes))
|
|
|
|
return NULL;
|
2019-03-21 13:24:41 +00:00
|
|
|
|
|
|
|
/* prefer fixed mode from EDID if available */
|
|
|
|
list_for_each_entry(scan, &connector->base.probed_modes, head) {
|
|
|
|
if ((scan->type & DRM_MODE_TYPE_PREFERRED) == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
fixed_mode = drm_mode_duplicate(&dev_priv->drm, scan);
|
|
|
|
if (!fixed_mode)
|
|
|
|
return NULL;
|
|
|
|
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"[CONNECTOR:%d:%s] using preferred mode from EDID: ",
|
|
|
|
connector->base.base.id, connector->base.name);
|
2019-03-21 13:24:41 +00:00
|
|
|
drm_mode_debug_printmodeline(fixed_mode);
|
|
|
|
|
|
|
|
return fixed_mode;
|
|
|
|
}
|
|
|
|
|
2019-03-21 13:24:42 +00:00
|
|
|
scan = list_first_entry(&connector->base.probed_modes,
|
|
|
|
typeof(*scan), head);
|
|
|
|
|
|
|
|
fixed_mode = drm_mode_duplicate(&dev_priv->drm, scan);
|
|
|
|
if (!fixed_mode)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
|
|
|
|
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"[CONNECTOR:%d:%s] using first mode from EDID: ",
|
|
|
|
connector->base.base.id, connector->base.name);
|
2019-03-21 13:24:42 +00:00
|
|
|
drm_mode_debug_printmodeline(fixed_mode);
|
|
|
|
|
|
|
|
return fixed_mode;
|
2019-03-21 13:24:41 +00:00
|
|
|
}
|
|
|
|
|
2019-03-21 13:24:43 +00:00
|
|
|
struct drm_display_mode *
|
|
|
|
intel_panel_vbt_fixed_mode(struct intel_connector *connector)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
struct drm_display_info *info = &connector->base.display_info;
|
|
|
|
struct drm_display_mode *fixed_mode;
|
|
|
|
|
|
|
|
if (!dev_priv->vbt.lfp_lvds_vbt_mode)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
fixed_mode = drm_mode_duplicate(&dev_priv->drm,
|
|
|
|
dev_priv->vbt.lfp_lvds_vbt_mode);
|
|
|
|
if (!fixed_mode)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
|
|
|
|
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s] using mode from VBT: ",
|
|
|
|
connector->base.base.id, connector->base.name);
|
2019-03-21 13:24:43 +00:00
|
|
|
drm_mode_debug_printmodeline(fixed_mode);
|
|
|
|
|
|
|
|
info->width_mm = fixed_mode->width_mm;
|
|
|
|
info->height_mm = fixed_mode->height_mm;
|
|
|
|
|
|
|
|
return fixed_mode;
|
|
|
|
}
|
|
|
|
|
2010-08-07 10:01:28 +00:00
|
|
|
/* adjusted_mode has been preset to be the panel's fixed mode */
|
2020-04-22 16:19:17 +00:00
|
|
|
int intel_pch_panel_fitting(struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2010-08-07 10:01:28 +00:00
|
|
|
{
|
2020-04-22 16:19:15 +00:00
|
|
|
const struct drm_display_mode *adjusted_mode =
|
|
|
|
&crtc_state->hw.adjusted_mode;
|
2020-04-22 16:19:14 +00:00
|
|
|
int x, y, width, height;
|
2010-08-07 10:01:28 +00:00
|
|
|
|
|
|
|
/* Native modes don't need fitting */
|
2020-04-22 16:19:15 +00:00
|
|
|
if (adjusted_mode->crtc_hdisplay == crtc_state->pipe_src_w &&
|
|
|
|
adjusted_mode->crtc_vdisplay == crtc_state->pipe_src_h &&
|
|
|
|
crtc_state->output_format != INTEL_OUTPUT_FORMAT_YCBCR420)
|
2020-04-22 16:19:17 +00:00
|
|
|
return 0;
|
2010-08-07 10:01:28 +00:00
|
|
|
|
2020-04-22 16:19:16 +00:00
|
|
|
switch (conn_state->scaling_mode) {
|
2010-08-07 10:01:28 +00:00
|
|
|
case DRM_MODE_SCALE_CENTER:
|
2020-04-22 16:19:15 +00:00
|
|
|
width = crtc_state->pipe_src_w;
|
|
|
|
height = crtc_state->pipe_src_h;
|
2015-09-25 13:38:56 +00:00
|
|
|
x = (adjusted_mode->crtc_hdisplay - width + 1)/2;
|
|
|
|
y = (adjusted_mode->crtc_vdisplay - height + 1)/2;
|
2010-08-07 10:01:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DRM_MODE_SCALE_ASPECT:
|
|
|
|
/* Scale but preserve the aspect ratio */
|
|
|
|
{
|
2015-09-25 13:38:56 +00:00
|
|
|
u32 scaled_width = adjusted_mode->crtc_hdisplay
|
2020-04-22 16:19:15 +00:00
|
|
|
* crtc_state->pipe_src_h;
|
|
|
|
u32 scaled_height = crtc_state->pipe_src_w
|
2015-09-25 13:38:56 +00:00
|
|
|
* adjusted_mode->crtc_vdisplay;
|
2010-08-07 10:01:28 +00:00
|
|
|
if (scaled_width > scaled_height) { /* pillar */
|
2020-04-22 16:19:15 +00:00
|
|
|
width = scaled_height / crtc_state->pipe_src_h;
|
drm/i915/pch: Fix integer math bugs in panel fitting
Consider a 1600x900 panel, upscaling a 1360x768 mode, full-aspect. The
old math would give you:
scaled_width = 1600 * 768; /* 1228800 */
scaled_height = 1360 * 900; /* 1224000 */
if (scaled_width > scaled_height) { /* pillarbox, and true */
width = 1224000 / 768; /* int(1593.75) = 1593 */
x = (1600 - 1593 + 1) / 2; /* 4 */
y = 0;
height = 768;
} /* ... */
This is broken. The total width of scanout would then be 1593 + 4 + 4,
or 1601, which is wider than the panel itself. The hardware very
dutifully implements this, and you end up with a black 45° diagonal from
the top-left corner to the bottom edge of the screen. It's a cool
effect and all, but not what you wanted. Similar things happen for the
letterbox case.
The problem is that you have an integer number of pixels, which means
it's usually impossible to upscale equally on both axes. 1360/768 is
1.7708, 1600/900 is 1.7777. Since we're constrained on the one axis,
the other one wants to come out as an even number of pixels (the panel
is almost certainly even on both axes, and the x/y offsets will be
applied on both sides). In the math above, if 'width' comes out even,
rounding down is correct; if it's odd, you'd rather round up. So just
increment width/height in those cases.
Tested on a Lenovo T500 (Ironlake).
Signed-off-by: Adam Jackson <ajax@redhat.com>
Tested-By: Daniel Manrique <daniel.manrique@canonical.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38851
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-07-13 20:32:32 +00:00
|
|
|
if (width & 1)
|
2011-08-16 19:34:10 +00:00
|
|
|
width++;
|
2015-09-25 13:38:56 +00:00
|
|
|
x = (adjusted_mode->crtc_hdisplay - width + 1) / 2;
|
2010-08-07 10:01:28 +00:00
|
|
|
y = 0;
|
2015-09-25 13:38:56 +00:00
|
|
|
height = adjusted_mode->crtc_vdisplay;
|
2010-08-07 10:01:28 +00:00
|
|
|
} else if (scaled_width < scaled_height) { /* letter */
|
2020-04-22 16:19:15 +00:00
|
|
|
height = scaled_width / crtc_state->pipe_src_w;
|
drm/i915/pch: Fix integer math bugs in panel fitting
Consider a 1600x900 panel, upscaling a 1360x768 mode, full-aspect. The
old math would give you:
scaled_width = 1600 * 768; /* 1228800 */
scaled_height = 1360 * 900; /* 1224000 */
if (scaled_width > scaled_height) { /* pillarbox, and true */
width = 1224000 / 768; /* int(1593.75) = 1593 */
x = (1600 - 1593 + 1) / 2; /* 4 */
y = 0;
height = 768;
} /* ... */
This is broken. The total width of scanout would then be 1593 + 4 + 4,
or 1601, which is wider than the panel itself. The hardware very
dutifully implements this, and you end up with a black 45° diagonal from
the top-left corner to the bottom edge of the screen. It's a cool
effect and all, but not what you wanted. Similar things happen for the
letterbox case.
The problem is that you have an integer number of pixels, which means
it's usually impossible to upscale equally on both axes. 1360/768 is
1.7708, 1600/900 is 1.7777. Since we're constrained on the one axis,
the other one wants to come out as an even number of pixels (the panel
is almost certainly even on both axes, and the x/y offsets will be
applied on both sides). In the math above, if 'width' comes out even,
rounding down is correct; if it's odd, you'd rather round up. So just
increment width/height in those cases.
Tested on a Lenovo T500 (Ironlake).
Signed-off-by: Adam Jackson <ajax@redhat.com>
Tested-By: Daniel Manrique <daniel.manrique@canonical.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38851
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-07-13 20:32:32 +00:00
|
|
|
if (height & 1)
|
|
|
|
height++;
|
2015-09-25 13:38:56 +00:00
|
|
|
y = (adjusted_mode->crtc_vdisplay - height + 1) / 2;
|
2010-08-07 10:01:28 +00:00
|
|
|
x = 0;
|
2015-09-25 13:38:56 +00:00
|
|
|
width = adjusted_mode->crtc_hdisplay;
|
2010-08-07 10:01:28 +00:00
|
|
|
} else {
|
|
|
|
x = y = 0;
|
2015-09-25 13:38:56 +00:00
|
|
|
width = adjusted_mode->crtc_hdisplay;
|
|
|
|
height = adjusted_mode->crtc_vdisplay;
|
2010-08-07 10:01:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2020-04-22 16:19:16 +00:00
|
|
|
case DRM_MODE_SCALE_NONE:
|
|
|
|
WARN_ON(adjusted_mode->crtc_hdisplay != crtc_state->pipe_src_w);
|
|
|
|
WARN_ON(adjusted_mode->crtc_vdisplay != crtc_state->pipe_src_h);
|
|
|
|
/* fall through */
|
2010-08-07 10:01:28 +00:00
|
|
|
case DRM_MODE_SCALE_FULLSCREEN:
|
|
|
|
x = y = 0;
|
2015-09-25 13:38:56 +00:00
|
|
|
width = adjusted_mode->crtc_hdisplay;
|
|
|
|
height = adjusted_mode->crtc_vdisplay;
|
2010-08-07 10:01:28 +00:00
|
|
|
break;
|
2013-04-25 19:55:03 +00:00
|
|
|
|
|
|
|
default:
|
2020-04-22 16:19:16 +00:00
|
|
|
MISSING_CASE(conn_state->scaling_mode);
|
2020-04-22 16:19:17 +00:00
|
|
|
return -EINVAL;
|
2010-08-07 10:01:28 +00:00
|
|
|
}
|
|
|
|
|
2020-04-22 16:19:15 +00:00
|
|
|
drm_rect_init(&crtc_state->pch_pfit.dst,
|
2020-04-22 16:19:14 +00:00
|
|
|
x, y, width, height);
|
2020-04-22 16:19:15 +00:00
|
|
|
crtc_state->pch_pfit.enabled = true;
|
2020-04-22 16:19:17 +00:00
|
|
|
|
|
|
|
return 0;
|
2010-08-07 10:01:28 +00:00
|
|
|
}
|
2010-08-22 12:18:16 +00:00
|
|
|
|
2013-04-25 19:55:01 +00:00
|
|
|
static void
|
2015-09-25 13:37:43 +00:00
|
|
|
centre_horizontally(struct drm_display_mode *adjusted_mode,
|
2013-04-25 19:55:01 +00:00
|
|
|
int width)
|
|
|
|
{
|
|
|
|
u32 border, sync_pos, blank_width, sync_width;
|
|
|
|
|
|
|
|
/* keep the hsync and hblank widths constant */
|
2015-09-25 13:37:43 +00:00
|
|
|
sync_width = adjusted_mode->crtc_hsync_end - adjusted_mode->crtc_hsync_start;
|
|
|
|
blank_width = adjusted_mode->crtc_hblank_end - adjusted_mode->crtc_hblank_start;
|
2013-04-25 19:55:01 +00:00
|
|
|
sync_pos = (blank_width - sync_width + 1) / 2;
|
|
|
|
|
2015-09-25 13:38:56 +00:00
|
|
|
border = (adjusted_mode->crtc_hdisplay - width + 1) / 2;
|
2013-04-25 19:55:01 +00:00
|
|
|
border += border & 1; /* make the border even */
|
|
|
|
|
2015-09-25 13:37:43 +00:00
|
|
|
adjusted_mode->crtc_hdisplay = width;
|
|
|
|
adjusted_mode->crtc_hblank_start = width + border;
|
|
|
|
adjusted_mode->crtc_hblank_end = adjusted_mode->crtc_hblank_start + blank_width;
|
2013-04-25 19:55:01 +00:00
|
|
|
|
2015-09-25 13:37:43 +00:00
|
|
|
adjusted_mode->crtc_hsync_start = adjusted_mode->crtc_hblank_start + sync_pos;
|
|
|
|
adjusted_mode->crtc_hsync_end = adjusted_mode->crtc_hsync_start + sync_width;
|
2013-04-25 19:55:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2015-09-25 13:37:43 +00:00
|
|
|
centre_vertically(struct drm_display_mode *adjusted_mode,
|
2013-04-25 19:55:01 +00:00
|
|
|
int height)
|
|
|
|
{
|
|
|
|
u32 border, sync_pos, blank_width, sync_width;
|
|
|
|
|
|
|
|
/* keep the vsync and vblank widths constant */
|
2015-09-25 13:37:43 +00:00
|
|
|
sync_width = adjusted_mode->crtc_vsync_end - adjusted_mode->crtc_vsync_start;
|
|
|
|
blank_width = adjusted_mode->crtc_vblank_end - adjusted_mode->crtc_vblank_start;
|
2013-04-25 19:55:01 +00:00
|
|
|
sync_pos = (blank_width - sync_width + 1) / 2;
|
|
|
|
|
2015-09-25 13:38:56 +00:00
|
|
|
border = (adjusted_mode->crtc_vdisplay - height + 1) / 2;
|
2013-04-25 19:55:01 +00:00
|
|
|
|
2015-09-25 13:37:43 +00:00
|
|
|
adjusted_mode->crtc_vdisplay = height;
|
|
|
|
adjusted_mode->crtc_vblank_start = height + border;
|
|
|
|
adjusted_mode->crtc_vblank_end = adjusted_mode->crtc_vblank_start + blank_width;
|
2013-04-25 19:55:01 +00:00
|
|
|
|
2015-09-25 13:37:43 +00:00
|
|
|
adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vblank_start + sync_pos;
|
|
|
|
adjusted_mode->crtc_vsync_end = adjusted_mode->crtc_vsync_start + sync_width;
|
2013-04-25 19:55:01 +00:00
|
|
|
}
|
|
|
|
|
2020-04-20 14:04:38 +00:00
|
|
|
static u32 panel_fitter_scaling(u32 source, u32 target)
|
2013-04-25 19:55:01 +00:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Floating point operation is not supported. So the FACTOR
|
|
|
|
* is defined, which can avoid the floating point computation
|
|
|
|
* when calculating the panel ratio.
|
|
|
|
*/
|
|
|
|
#define ACCURACY 12
|
|
|
|
#define FACTOR (1 << ACCURACY)
|
|
|
|
u32 ratio = source * FACTOR / target;
|
|
|
|
return (FACTOR * ratio + FACTOR/2) / FACTOR;
|
|
|
|
}
|
|
|
|
|
2020-04-22 16:19:15 +00:00
|
|
|
static void i965_scale_aspect(struct intel_crtc_state *crtc_state,
|
2013-09-16 21:43:45 +00:00
|
|
|
u32 *pfit_control)
|
|
|
|
{
|
2020-04-22 16:19:15 +00:00
|
|
|
const struct drm_display_mode *adjusted_mode =
|
|
|
|
&crtc_state->hw.adjusted_mode;
|
2015-09-25 13:38:56 +00:00
|
|
|
u32 scaled_width = adjusted_mode->crtc_hdisplay *
|
2020-04-22 16:19:15 +00:00
|
|
|
crtc_state->pipe_src_h;
|
|
|
|
u32 scaled_height = crtc_state->pipe_src_w *
|
2015-09-25 13:38:56 +00:00
|
|
|
adjusted_mode->crtc_vdisplay;
|
2013-09-16 21:43:45 +00:00
|
|
|
|
|
|
|
/* 965+ is easy, it does everything in hw */
|
|
|
|
if (scaled_width > scaled_height)
|
|
|
|
*pfit_control |= PFIT_ENABLE |
|
|
|
|
PFIT_SCALING_PILLAR;
|
|
|
|
else if (scaled_width < scaled_height)
|
|
|
|
*pfit_control |= PFIT_ENABLE |
|
|
|
|
PFIT_SCALING_LETTER;
|
2020-04-22 16:19:15 +00:00
|
|
|
else if (adjusted_mode->crtc_hdisplay != crtc_state->pipe_src_w)
|
2013-09-16 21:43:45 +00:00
|
|
|
*pfit_control |= PFIT_ENABLE | PFIT_SCALING_AUTO;
|
|
|
|
}
|
|
|
|
|
2020-04-22 16:19:15 +00:00
|
|
|
static void i9xx_scale_aspect(struct intel_crtc_state *crtc_state,
|
2013-09-16 21:43:45 +00:00
|
|
|
u32 *pfit_control, u32 *pfit_pgm_ratios,
|
|
|
|
u32 *border)
|
|
|
|
{
|
2020-04-22 16:19:15 +00:00
|
|
|
struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;
|
2015-09-25 13:38:56 +00:00
|
|
|
u32 scaled_width = adjusted_mode->crtc_hdisplay *
|
2020-04-22 16:19:15 +00:00
|
|
|
crtc_state->pipe_src_h;
|
|
|
|
u32 scaled_height = crtc_state->pipe_src_w *
|
2015-09-25 13:38:56 +00:00
|
|
|
adjusted_mode->crtc_vdisplay;
|
2013-09-16 21:43:45 +00:00
|
|
|
u32 bits;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For earlier chips we have to calculate the scaling
|
|
|
|
* ratio by hand and program it into the
|
|
|
|
* PFIT_PGM_RATIO register
|
|
|
|
*/
|
|
|
|
if (scaled_width > scaled_height) { /* pillar */
|
|
|
|
centre_horizontally(adjusted_mode,
|
|
|
|
scaled_height /
|
2020-04-22 16:19:15 +00:00
|
|
|
crtc_state->pipe_src_h);
|
2013-09-16 21:43:45 +00:00
|
|
|
|
|
|
|
*border = LVDS_BORDER_ENABLE;
|
2020-04-22 16:19:15 +00:00
|
|
|
if (crtc_state->pipe_src_h != adjusted_mode->crtc_vdisplay) {
|
|
|
|
bits = panel_fitter_scaling(crtc_state->pipe_src_h,
|
2015-09-25 13:38:56 +00:00
|
|
|
adjusted_mode->crtc_vdisplay);
|
2013-09-16 21:43:45 +00:00
|
|
|
|
|
|
|
*pfit_pgm_ratios |= (bits << PFIT_HORIZ_SCALE_SHIFT |
|
|
|
|
bits << PFIT_VERT_SCALE_SHIFT);
|
|
|
|
*pfit_control |= (PFIT_ENABLE |
|
|
|
|
VERT_INTERP_BILINEAR |
|
|
|
|
HORIZ_INTERP_BILINEAR);
|
|
|
|
}
|
|
|
|
} else if (scaled_width < scaled_height) { /* letter */
|
|
|
|
centre_vertically(adjusted_mode,
|
|
|
|
scaled_width /
|
2020-04-22 16:19:15 +00:00
|
|
|
crtc_state->pipe_src_w);
|
2013-09-16 21:43:45 +00:00
|
|
|
|
|
|
|
*border = LVDS_BORDER_ENABLE;
|
2020-04-22 16:19:15 +00:00
|
|
|
if (crtc_state->pipe_src_w != adjusted_mode->crtc_hdisplay) {
|
|
|
|
bits = panel_fitter_scaling(crtc_state->pipe_src_w,
|
2015-09-25 13:38:56 +00:00
|
|
|
adjusted_mode->crtc_hdisplay);
|
2013-09-16 21:43:45 +00:00
|
|
|
|
|
|
|
*pfit_pgm_ratios |= (bits << PFIT_HORIZ_SCALE_SHIFT |
|
|
|
|
bits << PFIT_VERT_SCALE_SHIFT);
|
|
|
|
*pfit_control |= (PFIT_ENABLE |
|
|
|
|
VERT_INTERP_BILINEAR |
|
|
|
|
HORIZ_INTERP_BILINEAR);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Aspects match, Let hw scale both directions */
|
|
|
|
*pfit_control |= (PFIT_ENABLE |
|
|
|
|
VERT_AUTO_SCALE | HORIZ_AUTO_SCALE |
|
|
|
|
VERT_INTERP_BILINEAR |
|
|
|
|
HORIZ_INTERP_BILINEAR);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-22 16:19:17 +00:00
|
|
|
int intel_gmch_panel_fitting(struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2013-04-25 19:55:01 +00:00
|
|
|
{
|
2020-04-22 16:19:15 +00:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
2013-04-25 19:55:01 +00:00
|
|
|
u32 pfit_control = 0, pfit_pgm_ratios = 0, border = 0;
|
2020-04-22 16:19:15 +00:00
|
|
|
struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;
|
2013-04-25 19:55:01 +00:00
|
|
|
|
|
|
|
/* Native modes don't need fitting */
|
2020-04-22 16:19:15 +00:00
|
|
|
if (adjusted_mode->crtc_hdisplay == crtc_state->pipe_src_w &&
|
|
|
|
adjusted_mode->crtc_vdisplay == crtc_state->pipe_src_h)
|
2013-04-25 19:55:01 +00:00
|
|
|
goto out;
|
|
|
|
|
2020-04-22 16:19:16 +00:00
|
|
|
switch (conn_state->scaling_mode) {
|
2013-04-25 19:55:01 +00:00
|
|
|
case DRM_MODE_SCALE_CENTER:
|
|
|
|
/*
|
|
|
|
* For centered modes, we have to calculate border widths &
|
|
|
|
* heights and modify the values programmed into the CRTC.
|
|
|
|
*/
|
2020-04-22 16:19:15 +00:00
|
|
|
centre_horizontally(adjusted_mode, crtc_state->pipe_src_w);
|
|
|
|
centre_vertically(adjusted_mode, crtc_state->pipe_src_h);
|
2013-04-25 19:55:01 +00:00
|
|
|
border = LVDS_BORDER_ENABLE;
|
|
|
|
break;
|
|
|
|
case DRM_MODE_SCALE_ASPECT:
|
|
|
|
/* Scale but preserve the aspect ratio */
|
2016-11-16 08:55:40 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 4)
|
2020-04-22 16:19:15 +00:00
|
|
|
i965_scale_aspect(crtc_state, &pfit_control);
|
2013-09-16 21:43:45 +00:00
|
|
|
else
|
2020-04-22 16:19:15 +00:00
|
|
|
i9xx_scale_aspect(crtc_state, &pfit_control,
|
2013-09-16 21:43:45 +00:00
|
|
|
&pfit_pgm_ratios, &border);
|
2013-04-25 19:55:01 +00:00
|
|
|
break;
|
|
|
|
case DRM_MODE_SCALE_FULLSCREEN:
|
|
|
|
/*
|
|
|
|
* Full scaling, even if it changes the aspect ratio.
|
|
|
|
* Fortunately this is all done for us in hw.
|
|
|
|
*/
|
2020-04-22 16:19:15 +00:00
|
|
|
if (crtc_state->pipe_src_h != adjusted_mode->crtc_vdisplay ||
|
|
|
|
crtc_state->pipe_src_w != adjusted_mode->crtc_hdisplay) {
|
2013-04-25 19:55:01 +00:00
|
|
|
pfit_control |= PFIT_ENABLE;
|
2016-11-16 08:55:40 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 4)
|
2013-04-25 19:55:01 +00:00
|
|
|
pfit_control |= PFIT_SCALING_AUTO;
|
|
|
|
else
|
|
|
|
pfit_control |= (VERT_AUTO_SCALE |
|
|
|
|
VERT_INTERP_BILINEAR |
|
|
|
|
HORIZ_AUTO_SCALE |
|
|
|
|
HORIZ_INTERP_BILINEAR);
|
|
|
|
}
|
|
|
|
break;
|
2013-04-25 19:55:03 +00:00
|
|
|
default:
|
2020-04-22 16:19:16 +00:00
|
|
|
MISSING_CASE(conn_state->scaling_mode);
|
2020-04-22 16:19:17 +00:00
|
|
|
return -EINVAL;
|
2013-04-25 19:55:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* 965+ wants fuzzy fitting */
|
|
|
|
/* FIXME: handle multiple panels by failing gracefully */
|
2016-11-16 08:55:40 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 4)
|
2020-04-22 16:19:15 +00:00
|
|
|
pfit_control |= PFIT_PIPE(crtc->pipe) | PFIT_FILTER_FUZZY;
|
2013-04-25 19:55:01 +00:00
|
|
|
|
|
|
|
out:
|
|
|
|
if ((pfit_control & PFIT_ENABLE) == 0) {
|
|
|
|
pfit_control = 0;
|
|
|
|
pfit_pgm_ratios = 0;
|
|
|
|
}
|
|
|
|
|
2014-07-09 20:35:53 +00:00
|
|
|
/* Make sure pre-965 set dither correctly for 18bpp panels. */
|
2020-04-22 16:19:15 +00:00
|
|
|
if (INTEL_GEN(dev_priv) < 4 && crtc_state->pipe_bpp == 18)
|
2014-07-09 20:35:53 +00:00
|
|
|
pfit_control |= PANEL_8TO6_DITHER_ENABLE;
|
|
|
|
|
2020-04-22 16:19:15 +00:00
|
|
|
crtc_state->gmch_pfit.control = pfit_control;
|
|
|
|
crtc_state->gmch_pfit.pgm_ratios = pfit_pgm_ratios;
|
|
|
|
crtc_state->gmch_pfit.lvds_border_bits = border;
|
2020-04-22 16:19:17 +00:00
|
|
|
|
|
|
|
return 0;
|
2013-04-25 19:55:01 +00:00
|
|
|
}
|
|
|
|
|
2014-06-24 15:27:40 +00:00
|
|
|
/**
|
|
|
|
* scale - scale values from one range to another
|
|
|
|
* @source_val: value in range [@source_min..@source_max]
|
2018-02-14 09:17:46 +00:00
|
|
|
* @source_min: minimum legal value for @source_val
|
|
|
|
* @source_max: maximum legal value for @source_val
|
|
|
|
* @target_min: corresponding target value for @source_min
|
|
|
|
* @target_max: corresponding target value for @source_max
|
2014-06-24 15:27:40 +00:00
|
|
|
*
|
|
|
|
* Return @source_val in range [@source_min..@source_max] scaled to range
|
|
|
|
* [@target_min..@target_max].
|
|
|
|
*/
|
2018-06-12 09:19:33 +00:00
|
|
|
static u32 scale(u32 source_val,
|
|
|
|
u32 source_min, u32 source_max,
|
|
|
|
u32 target_min, u32 target_max)
|
2014-06-24 15:27:40 +00:00
|
|
|
{
|
2018-06-12 09:19:33 +00:00
|
|
|
u64 target_val;
|
2014-06-24 15:27:40 +00:00
|
|
|
|
|
|
|
WARN_ON(source_min > source_max);
|
|
|
|
WARN_ON(target_min > target_max);
|
|
|
|
|
|
|
|
/* defensive */
|
|
|
|
source_val = clamp(source_val, source_min, source_max);
|
|
|
|
|
|
|
|
/* avoid overflows */
|
2018-02-14 09:17:47 +00:00
|
|
|
target_val = mul_u32_u32(source_val - source_min,
|
|
|
|
target_max - target_min);
|
|
|
|
target_val = DIV_ROUND_CLOSEST_ULL(target_val, source_max - source_min);
|
2014-06-24 15:27:40 +00:00
|
|
|
target_val += target_min;
|
|
|
|
|
|
|
|
return target_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Scale user_level in range [0..user_max] to [0..hw_max], clamping the result
|
|
|
|
* to [hw_min..hw_max]. */
|
2020-04-20 14:04:38 +00:00
|
|
|
static u32 clamp_user_to_hw(struct intel_connector *connector,
|
|
|
|
u32 user_level, u32 user_max)
|
2014-06-24 15:27:40 +00:00
|
|
|
{
|
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
u32 hw_level;
|
|
|
|
|
|
|
|
hw_level = scale(user_level, 0, user_max, 0, panel->backlight.max);
|
|
|
|
hw_level = clamp(hw_level, panel->backlight.min, panel->backlight.max);
|
|
|
|
|
|
|
|
return hw_level;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Scale hw_level in range [hw_min..hw_max] to [0..user_max]. */
|
2020-04-20 14:04:38 +00:00
|
|
|
static u32 scale_hw_to_user(struct intel_connector *connector,
|
|
|
|
u32 hw_level, u32 user_max)
|
2014-06-24 15:27:40 +00:00
|
|
|
{
|
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
|
|
|
|
return scale(hw_level, panel->backlight.min, panel->backlight.max,
|
|
|
|
0, user_max);
|
|
|
|
}
|
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
static u32 intel_panel_compute_brightness(struct intel_connector *connector,
|
|
|
|
u32 val)
|
2012-03-15 14:56:25 +00:00
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:49:00 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
|
drm/i915/display/panel: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is readily
available.
The conversion was done automatically with below coccinelle semantic
patch.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200128181603.27767-16-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 18:15:57 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm, panel->backlight.max == 0);
|
2012-03-15 14:56:26 +00:00
|
|
|
|
2020-06-18 15:04:02 +00:00
|
|
|
if (dev_priv->params.invert_brightness < 0)
|
2012-03-15 14:56:26 +00:00
|
|
|
return val;
|
|
|
|
|
2020-06-18 15:04:02 +00:00
|
|
|
if (dev_priv->params.invert_brightness > 0 ||
|
2013-04-12 12:18:36 +00:00
|
|
|
dev_priv->quirks & QUIRK_INVERT_BRIGHTNESS) {
|
2017-05-31 08:33:55 +00:00
|
|
|
return panel->backlight.max - val + panel->backlight.min;
|
2013-04-12 12:18:36 +00:00
|
|
|
}
|
2012-03-15 14:56:25 +00:00
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2015-09-04 13:55:13 +00:00
|
|
|
static u32 lpt_get_backlight(struct intel_connector *connector)
|
2010-11-23 09:45:50 +00:00
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2010-11-23 09:45:50 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
return intel_de_read(dev_priv, BLC_PWM_PCH_CTL2) & BACKLIGHT_DUTY_CYCLE_MASK;
|
2013-11-14 14:17:41 +00:00
|
|
|
}
|
2013-10-31 16:55:50 +00:00
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
static u32 pch_get_backlight(struct intel_connector *connector)
|
2010-08-22 12:18:16 +00:00
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-04-12 12:18:37 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
return intel_de_read(dev_priv, BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
|
2013-11-08 14:48:56 +00:00
|
|
|
}
|
2010-08-22 12:18:16 +00:00
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
static u32 i9xx_get_backlight(struct intel_connector *connector)
|
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:49:02 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2013-11-08 14:48:56 +00:00
|
|
|
u32 val;
|
2013-10-31 16:55:50 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
val = intel_de_read(dev_priv, BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
|
2018-02-09 21:58:46 +00:00
|
|
|
if (INTEL_GEN(dev_priv) < 4)
|
2013-11-08 14:48:56 +00:00
|
|
|
val >>= 1;
|
2011-03-10 13:02:12 +00:00
|
|
|
|
2013-11-08 14:49:02 +00:00
|
|
|
if (panel->backlight.combination_mode) {
|
2013-11-08 14:48:56 +00:00
|
|
|
u8 lbpc;
|
2011-03-10 13:02:12 +00:00
|
|
|
|
2016-07-05 09:40:23 +00:00
|
|
|
pci_read_config_byte(dev_priv->drm.pdev, LBPC, &lbpc);
|
2013-11-08 14:48:56 +00:00
|
|
|
val *= lbpc;
|
2010-08-22 12:18:16 +00:00
|
|
|
}
|
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2015-12-18 08:51:35 +00:00
|
|
|
static u32 _vlv_get_backlight(struct drm_i915_private *dev_priv, enum pipe pipe)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
drm/i915/display/panel: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is readily
available.
The conversion was done automatically with below coccinelle semantic
patch.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200128181603.27767-16-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 18:15:57 +00:00
|
|
|
if (drm_WARN_ON(&dev_priv->drm, pipe != PIPE_A && pipe != PIPE_B))
|
2014-11-07 09:15:59 +00:00
|
|
|
return 0;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
return intel_de_read(dev_priv, VLV_BLC_PWM_CTL(pipe)) & BACKLIGHT_DUTY_CYCLE_MASK;
|
2013-11-08 14:48:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static u32 vlv_get_backlight(struct intel_connector *connector)
|
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2018-10-16 14:50:44 +00:00
|
|
|
enum pipe pipe = intel_connector_get_pipe(connector);
|
2013-11-08 14:48:56 +00:00
|
|
|
|
2015-12-18 08:51:35 +00:00
|
|
|
return _vlv_get_backlight(dev_priv, pipe);
|
2013-11-08 14:48:56 +00:00
|
|
|
}
|
|
|
|
|
2015-05-05 09:21:56 +00:00
|
|
|
static u32 bxt_get_backlight(struct intel_connector *connector)
|
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2015-09-30 17:04:57 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2015-05-05 09:21:56 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
return intel_de_read(dev_priv,
|
|
|
|
BXT_BLC_PWM_DUTY(panel->backlight.controller));
|
2015-05-05 09:21:56 +00:00
|
|
|
}
|
|
|
|
|
2015-06-26 09:02:10 +00:00
|
|
|
static u32 pwm_get_backlight(struct intel_connector *connector)
|
|
|
|
{
|
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
int duty_ns;
|
|
|
|
|
|
|
|
duty_ns = pwm_get_duty_cycle(panel->backlight.pwm);
|
|
|
|
return DIV_ROUND_UP(duty_ns * 100, CRC_PMIC_PWM_PERIOD_NS);
|
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void lpt_set_backlight(const struct drm_connector_state *conn_state, u32 level)
|
2013-11-11 09:12:57 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2017-06-12 10:21:15 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
u32 val = intel_de_read(dev_priv, BLC_PWM_PCH_CTL2) & ~BACKLIGHT_DUTY_CYCLE_MASK;
|
|
|
|
intel_de_write(dev_priv, BLC_PWM_PCH_CTL2, val | level);
|
2013-11-11 09:12:57 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void pch_set_backlight(const struct drm_connector_state *conn_state, u32 level)
|
2010-08-22 12:18:16 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:48:56 +00:00
|
|
|
u32 tmp;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
tmp = intel_de_read(dev_priv, BLC_PWM_CPU_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK;
|
|
|
|
intel_de_write(dev_priv, BLC_PWM_CPU_CTL, tmp | level);
|
2010-08-22 12:18:16 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void i9xx_set_backlight(const struct drm_connector_state *conn_state, u32 level)
|
2010-08-22 12:18:16 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:49:00 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2013-11-08 14:48:57 +00:00
|
|
|
u32 tmp, mask;
|
2011-03-10 13:02:12 +00:00
|
|
|
|
drm/i915/display/panel: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is readily
available.
The conversion was done automatically with below coccinelle semantic
patch.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200128181603.27767-16-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 18:15:57 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm, panel->backlight.max == 0);
|
2013-11-08 14:49:00 +00:00
|
|
|
|
2013-11-08 14:49:02 +00:00
|
|
|
if (panel->backlight.combination_mode) {
|
2011-03-10 13:02:12 +00:00
|
|
|
u8 lbpc;
|
|
|
|
|
2013-11-08 14:49:00 +00:00
|
|
|
lbpc = level * 0xfe / panel->backlight.max + 1;
|
2011-03-10 13:02:12 +00:00
|
|
|
level /= lbpc;
|
2016-07-05 09:40:23 +00:00
|
|
|
pci_write_config_byte(dev_priv->drm.pdev, LBPC, lbpc);
|
2011-03-10 13:02:12 +00:00
|
|
|
}
|
|
|
|
|
drm/i915: replace IS_GEN<N> with IS_GEN(..., N)
Define IS_GEN() similarly to our IS_GEN_RANGE(). but use gen instead of
gen_mask to do the comparison. Now callers can pass then gen as a parameter,
so we don't require one macro for each gen.
The following spatch was used to convert the users of these macros:
@@
expression e;
@@
(
- IS_GEN2(e)
+ IS_GEN(e, 2)
|
- IS_GEN3(e)
+ IS_GEN(e, 3)
|
- IS_GEN4(e)
+ IS_GEN(e, 4)
|
- IS_GEN5(e)
+ IS_GEN(e, 5)
|
- IS_GEN6(e)
+ IS_GEN(e, 6)
|
- IS_GEN7(e)
+ IS_GEN(e, 7)
|
- IS_GEN8(e)
+ IS_GEN(e, 8)
|
- IS_GEN9(e)
+ IS_GEN(e, 9)
|
- IS_GEN10(e)
+ IS_GEN(e, 10)
|
- IS_GEN11(e)
+ IS_GEN(e, 11)
)
v2: use IS_GEN rather than GT_GEN and compare to info.gen rather than
using the bitmask
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212181044.15886-2-lucas.demarchi@intel.com
2018-12-12 18:10:43 +00:00
|
|
|
if (IS_GEN(dev_priv, 4)) {
|
2013-11-08 14:48:57 +00:00
|
|
|
mask = BACKLIGHT_DUTY_CYCLE_MASK;
|
|
|
|
} else {
|
2010-08-22 12:18:16 +00:00
|
|
|
level <<= 1;
|
2013-11-08 14:48:57 +00:00
|
|
|
mask = BACKLIGHT_DUTY_CYCLE_MASK_PNV;
|
|
|
|
}
|
2013-11-08 14:48:56 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
tmp = intel_de_read(dev_priv, BLC_PWM_CTL) & ~mask;
|
|
|
|
intel_de_write(dev_priv, BLC_PWM_CTL, tmp | level);
|
2013-11-08 14:48:56 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void vlv_set_backlight(const struct drm_connector_state *conn_state, u32 level)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2017-06-12 10:21:15 +00:00
|
|
|
enum pipe pipe = to_intel_crtc(conn_state->crtc)->pipe;
|
2013-11-08 14:48:56 +00:00
|
|
|
u32 tmp;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
tmp = intel_de_read(dev_priv, VLV_BLC_PWM_CTL(pipe)) & ~BACKLIGHT_DUTY_CYCLE_MASK;
|
|
|
|
intel_de_write(dev_priv, VLV_BLC_PWM_CTL(pipe), tmp | level);
|
2013-11-08 14:48:56 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void bxt_set_backlight(const struct drm_connector_state *conn_state, u32 level)
|
2015-05-05 09:21:56 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2015-09-30 17:04:57 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2015-05-05 09:21:56 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
BXT_BLC_PWM_DUTY(panel->backlight.controller), level);
|
2015-05-05 09:21:56 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void pwm_set_backlight(const struct drm_connector_state *conn_state, u32 level)
|
2015-06-26 09:02:10 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_panel *panel = &to_intel_connector(conn_state->connector)->panel;
|
2015-06-26 09:02:10 +00:00
|
|
|
int duty_ns = DIV_ROUND_UP(level * CRC_PMIC_PWM_PERIOD_NS, 100);
|
|
|
|
|
|
|
|
pwm_config(panel->backlight.pwm, duty_ns, CRC_PMIC_PWM_PERIOD_NS);
|
|
|
|
}
|
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
static void
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(const struct drm_connector_state *conn_state, u32 level)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
drm/i915/panel: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200402114819.17232-2-jani.nikula@intel.com
2020-04-02 11:48:04 +00:00
|
|
|
struct drm_i915_private *i915 = to_i915(connector->base.dev);
|
2015-09-14 11:03:48 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2013-11-08 14:48:56 +00:00
|
|
|
|
drm/i915/panel: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200402114819.17232-2-jani.nikula@intel.com
2020-04-02 11:48:04 +00:00
|
|
|
drm_dbg_kms(&i915->drm, "set backlight PWM = %d\n", level);
|
2013-11-08 14:48:56 +00:00
|
|
|
|
|
|
|
level = intel_panel_compute_brightness(connector, level);
|
2017-06-12 10:21:15 +00:00
|
|
|
panel->backlight.set(conn_state, level);
|
2010-08-22 12:18:16 +00:00
|
|
|
}
|
2011-01-11 17:06:04 +00:00
|
|
|
|
2014-06-24 15:27:40 +00:00
|
|
|
/* set backlight brightness to level in range [0..max], assuming hw min is
|
|
|
|
* respected.
|
|
|
|
*/
|
2017-06-12 10:21:14 +00:00
|
|
|
void intel_panel_set_backlight_acpi(const struct drm_connector_state *conn_state,
|
2014-06-24 15:27:40 +00:00
|
|
|
u32 user_level, u32 user_max)
|
|
|
|
{
|
2017-06-12 10:21:14 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2014-06-24 15:27:40 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
u32 hw_level;
|
|
|
|
|
2014-11-07 13:20:23 +00:00
|
|
|
/*
|
2017-06-12 10:21:14 +00:00
|
|
|
* Lack of crtc may occur during driver init because
|
2014-11-07 13:20:23 +00:00
|
|
|
* connection_mutex isn't held across the entire backlight
|
|
|
|
* setup + modeset readout, and the BIOS can issue the
|
|
|
|
* requests at any time.
|
|
|
|
*/
|
2017-06-12 10:21:14 +00:00
|
|
|
if (!panel->backlight.present || !conn_state->crtc)
|
2014-06-24 15:27:40 +00:00
|
|
|
return;
|
|
|
|
|
2014-09-15 12:35:09 +00:00
|
|
|
mutex_lock(&dev_priv->backlight_lock);
|
2014-06-24 15:27:40 +00:00
|
|
|
|
drm/i915/display/panel: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is readily
available.
The conversion was done automatically with below coccinelle semantic
patch.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200128181603.27767-16-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 18:15:57 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm, panel->backlight.max == 0);
|
2014-06-24 15:27:40 +00:00
|
|
|
|
|
|
|
hw_level = clamp_user_to_hw(connector, user_level, user_max);
|
|
|
|
panel->backlight.level = hw_level;
|
2011-01-11 17:06:04 +00:00
|
|
|
|
2013-11-08 14:48:54 +00:00
|
|
|
if (panel->backlight.device)
|
2014-06-24 15:27:40 +00:00
|
|
|
panel->backlight.device->props.brightness =
|
|
|
|
scale_hw_to_user(connector,
|
|
|
|
panel->backlight.level,
|
|
|
|
panel->backlight.device->props.max_brightness);
|
2013-03-12 09:44:15 +00:00
|
|
|
|
2013-11-08 14:48:54 +00:00
|
|
|
if (panel->backlight.enabled)
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(conn_state, hw_level);
|
2013-11-08 14:49:00 +00:00
|
|
|
|
2014-09-15 12:35:09 +00:00
|
|
|
mutex_unlock(&dev_priv->backlight_lock);
|
2011-10-14 09:45:40 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void lpt_disable_backlight(const struct drm_connector_state *old_conn_state)
|
2015-09-04 13:55:13 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(old_conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2015-09-04 13:55:13 +00:00
|
|
|
u32 tmp;
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(old_conn_state, 0);
|
2015-09-04 13:55:13 +00:00
|
|
|
|
2015-10-28 11:57:09 +00:00
|
|
|
/*
|
|
|
|
* Although we don't support or enable CPU PWM with LPT/SPT based
|
|
|
|
* systems, it may have been enabled prior to loading the
|
|
|
|
* driver. Disable to avoid warnings on LCPLL disable.
|
|
|
|
*
|
|
|
|
* This needs rework if we need to add support for CPU PWM on PCH split
|
|
|
|
* platforms.
|
|
|
|
*/
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
tmp = intel_de_read(dev_priv, BLC_PWM_CPU_CTL2);
|
2015-10-28 11:57:09 +00:00
|
|
|
if (tmp & BLM_PWM_ENABLE) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"cpu backlight was enabled, disabling\n");
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_CPU_CTL2,
|
|
|
|
tmp & ~BLM_PWM_ENABLE);
|
2015-10-28 11:57:09 +00:00
|
|
|
}
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
tmp = intel_de_read(dev_priv, BLC_PWM_PCH_CTL1);
|
|
|
|
intel_de_write(dev_priv, BLC_PWM_PCH_CTL1, tmp & ~BLM_PCH_PWM_ENABLE);
|
2015-09-04 13:55:13 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void pch_disable_backlight(const struct drm_connector_state *old_conn_state)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(old_conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:48:56 +00:00
|
|
|
u32 tmp;
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(old_conn_state, 0);
|
2013-11-08 14:48:59 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
tmp = intel_de_read(dev_priv, BLC_PWM_CPU_CTL2);
|
|
|
|
intel_de_write(dev_priv, BLC_PWM_CPU_CTL2, tmp & ~BLM_PWM_ENABLE);
|
2013-11-08 14:48:56 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
tmp = intel_de_read(dev_priv, BLC_PWM_PCH_CTL1);
|
|
|
|
intel_de_write(dev_priv, BLC_PWM_PCH_CTL1, tmp & ~BLM_PCH_PWM_ENABLE);
|
2013-11-08 14:48:56 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void i9xx_disable_backlight(const struct drm_connector_state *old_conn_state)
|
2013-11-08 14:48:59 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(old_conn_state, 0);
|
2013-11-08 14:48:59 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void i965_disable_backlight(const struct drm_connector_state *old_conn_state)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(old_conn_state->connector->dev);
|
2013-11-08 14:48:56 +00:00
|
|
|
u32 tmp;
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(old_conn_state, 0);
|
2013-11-08 14:48:59 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
tmp = intel_de_read(dev_priv, BLC_PWM_CTL2);
|
|
|
|
intel_de_write(dev_priv, BLC_PWM_CTL2, tmp & ~BLM_PWM_ENABLE);
|
2013-11-08 14:48:56 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void vlv_disable_backlight(const struct drm_connector_state *old_conn_state)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(old_conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2017-06-12 10:21:15 +00:00
|
|
|
enum pipe pipe = to_intel_crtc(old_conn_state->crtc)->pipe;
|
2013-11-08 14:48:56 +00:00
|
|
|
u32 tmp;
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(old_conn_state, 0);
|
2013-11-08 14:48:59 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
tmp = intel_de_read(dev_priv, VLV_BLC_PWM_CTL2(pipe));
|
|
|
|
intel_de_write(dev_priv, VLV_BLC_PWM_CTL2(pipe),
|
|
|
|
tmp & ~BLM_PWM_ENABLE);
|
2013-11-08 14:48:56 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void bxt_disable_backlight(const struct drm_connector_state *old_conn_state)
|
2015-05-05 09:21:56 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(old_conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2015-09-30 17:04:57 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
u32 tmp, val;
|
2015-05-05 09:21:56 +00:00
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(old_conn_state, 0);
|
2015-05-05 09:21:56 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
tmp = intel_de_read(dev_priv,
|
|
|
|
BXT_BLC_PWM_CTL(panel->backlight.controller));
|
|
|
|
intel_de_write(dev_priv, BXT_BLC_PWM_CTL(panel->backlight.controller),
|
|
|
|
tmp & ~BXT_BLC_PWM_ENABLE);
|
2015-09-30 17:04:57 +00:00
|
|
|
|
|
|
|
if (panel->backlight.controller == 1) {
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
val = intel_de_read(dev_priv, UTIL_PIN_CTL);
|
2015-09-30 17:04:57 +00:00
|
|
|
val &= ~UTIL_PIN_ENABLE;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, UTIL_PIN_CTL, val);
|
2015-09-30 17:04:57 +00:00
|
|
|
}
|
2015-05-05 09:21:56 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void cnp_disable_backlight(const struct drm_connector_state *old_conn_state)
|
2017-06-02 20:06:42 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(old_conn_state->connector);
|
2017-06-02 20:06:42 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
u32 tmp;
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(old_conn_state, 0);
|
2017-06-02 20:06:42 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
tmp = intel_de_read(dev_priv,
|
|
|
|
BXT_BLC_PWM_CTL(panel->backlight.controller));
|
|
|
|
intel_de_write(dev_priv, BXT_BLC_PWM_CTL(panel->backlight.controller),
|
|
|
|
tmp & ~BXT_BLC_PWM_ENABLE);
|
2017-06-02 20:06:42 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void pwm_disable_backlight(const struct drm_connector_state *old_conn_state)
|
2015-06-26 09:02:10 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(old_conn_state->connector);
|
2015-06-26 09:02:10 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
|
|
|
|
/* Disable the backlight */
|
2018-10-24 15:52:08 +00:00
|
|
|
intel_panel_actually_set_backlight(old_conn_state, 0);
|
2015-06-26 09:02:10 +00:00
|
|
|
usleep_range(2000, 3000);
|
|
|
|
pwm_disable(panel->backlight.pwm);
|
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:13 +00:00
|
|
|
void intel_panel_disable_backlight(const struct drm_connector_state *old_conn_state)
|
2011-10-14 09:45:40 +00:00
|
|
|
{
|
2017-06-12 10:21:13 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(old_conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:48:54 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2013-04-12 12:18:37 +00:00
|
|
|
|
2014-11-07 13:20:23 +00:00
|
|
|
if (!panel->backlight.present)
|
2013-10-31 16:55:49 +00:00
|
|
|
return;
|
|
|
|
|
2013-07-25 11:31:30 +00:00
|
|
|
/*
|
2015-09-04 19:06:15 +00:00
|
|
|
* Do not disable backlight on the vga_switcheroo path. When switching
|
2013-07-25 11:31:30 +00:00
|
|
|
* away from i915, the other client may depend on i915 to handle the
|
|
|
|
* backlight. This will leave the backlight on unnecessarily when
|
|
|
|
* another client is not activated.
|
|
|
|
*/
|
2016-07-05 09:40:23 +00:00
|
|
|
if (dev_priv->drm.switch_power_state == DRM_SWITCH_POWER_CHANGING) {
|
drm/i915/panel: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200402114819.17232-2-jani.nikula@intel.com
2020-04-02 11:48:04 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"Skipping backlight disable on vga switch\n");
|
2013-07-25 11:31:30 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-09-15 12:35:09 +00:00
|
|
|
mutex_lock(&dev_priv->backlight_lock);
|
2011-01-11 17:06:04 +00:00
|
|
|
|
2014-08-13 09:10:12 +00:00
|
|
|
if (panel->backlight.device)
|
|
|
|
panel->backlight.device->props.power = FB_BLANK_POWERDOWN;
|
2013-11-08 14:48:54 +00:00
|
|
|
panel->backlight.enabled = false;
|
2017-06-12 10:21:15 +00:00
|
|
|
panel->backlight.disable(old_conn_state);
|
2012-06-05 10:14:54 +00:00
|
|
|
|
2014-09-15 12:35:09 +00:00
|
|
|
mutex_unlock(&dev_priv->backlight_lock);
|
2013-11-08 14:48:56 +00:00
|
|
|
}
|
2012-06-05 10:14:54 +00:00
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void lpt_enable_backlight(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2013-11-14 14:17:41 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-14 14:17:41 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2016-09-19 10:35:26 +00:00
|
|
|
u32 pch_ctl1, pch_ctl2, schicken;
|
2013-11-14 14:17:41 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
pch_ctl1 = intel_de_read(dev_priv, BLC_PWM_PCH_CTL1);
|
2013-11-14 14:17:41 +00:00
|
|
|
if (pch_ctl1 & BLM_PCH_PWM_ENABLE) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "pch backlight already enabled\n");
|
2013-11-14 14:17:41 +00:00
|
|
|
pch_ctl1 &= ~BLM_PCH_PWM_ENABLE;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_PCH_CTL1, pch_ctl1);
|
2013-11-14 14:17:41 +00:00
|
|
|
}
|
2012-06-05 10:14:54 +00:00
|
|
|
|
2016-09-19 10:35:26 +00:00
|
|
|
if (HAS_PCH_LPT(dev_priv)) {
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
schicken = intel_de_read(dev_priv, SOUTH_CHICKEN2);
|
2016-09-19 10:35:26 +00:00
|
|
|
if (panel->backlight.alternate_pwm_increment)
|
|
|
|
schicken |= LPT_PWM_GRANULARITY;
|
|
|
|
else
|
|
|
|
schicken &= ~LPT_PWM_GRANULARITY;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, SOUTH_CHICKEN2, schicken);
|
2016-09-19 10:35:26 +00:00
|
|
|
} else {
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
schicken = intel_de_read(dev_priv, SOUTH_CHICKEN1);
|
2016-09-19 10:35:26 +00:00
|
|
|
if (panel->backlight.alternate_pwm_increment)
|
|
|
|
schicken |= SPT_PWM_GRANULARITY;
|
|
|
|
else
|
|
|
|
schicken &= ~SPT_PWM_GRANULARITY;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, SOUTH_CHICKEN1, schicken);
|
2016-09-19 10:35:26 +00:00
|
|
|
}
|
|
|
|
|
2013-11-14 14:17:41 +00:00
|
|
|
pch_ctl2 = panel->backlight.max << 16;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_PCH_CTL2, pch_ctl2);
|
2012-07-14 14:57:12 +00:00
|
|
|
|
2013-11-14 14:17:41 +00:00
|
|
|
pch_ctl1 = 0;
|
|
|
|
if (panel->backlight.active_low_pwm)
|
|
|
|
pch_ctl1 |= BLM_PCH_POLARITY;
|
2013-04-12 12:18:37 +00:00
|
|
|
|
2014-10-10 14:53:33 +00:00
|
|
|
/* After LPT, override is the default. */
|
|
|
|
if (HAS_PCH_LPT(dev_priv))
|
|
|
|
pch_ctl1 |= BLM_PCH_OVERRIDE_ENABLE;
|
2013-11-14 14:17:41 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_PCH_CTL1, pch_ctl1);
|
|
|
|
intel_de_posting_read(dev_priv, BLC_PWM_PCH_CTL1);
|
|
|
|
intel_de_write(dev_priv, BLC_PWM_PCH_CTL1,
|
|
|
|
pch_ctl1 | BLM_PCH_PWM_ENABLE);
|
2013-11-14 14:17:41 +00:00
|
|
|
|
|
|
|
/* This won't stick until the above enable. */
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(conn_state, panel->backlight.level);
|
2011-01-11 17:06:04 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void pch_enable_backlight(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:48:59 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2017-06-12 10:21:15 +00:00
|
|
|
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
2013-11-14 10:13:41 +00:00
|
|
|
u32 cpu_ctl2, pch_ctl1, pch_ctl2;
|
2013-11-08 14:48:56 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
cpu_ctl2 = intel_de_read(dev_priv, BLC_PWM_CPU_CTL2);
|
2013-11-14 10:13:41 +00:00
|
|
|
if (cpu_ctl2 & BLM_PWM_ENABLE) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "cpu backlight already enabled\n");
|
2013-11-14 10:13:41 +00:00
|
|
|
cpu_ctl2 &= ~BLM_PWM_ENABLE;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_CPU_CTL2, cpu_ctl2);
|
2013-11-14 10:13:41 +00:00
|
|
|
}
|
2013-11-08 14:48:56 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
pch_ctl1 = intel_de_read(dev_priv, BLC_PWM_PCH_CTL1);
|
2013-11-14 10:13:41 +00:00
|
|
|
if (pch_ctl1 & BLM_PCH_PWM_ENABLE) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "pch backlight already enabled\n");
|
2013-11-14 10:13:41 +00:00
|
|
|
pch_ctl1 &= ~BLM_PCH_PWM_ENABLE;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_PCH_CTL1, pch_ctl1);
|
2013-11-14 10:13:41 +00:00
|
|
|
}
|
2013-11-08 14:48:56 +00:00
|
|
|
|
|
|
|
if (cpu_transcoder == TRANSCODER_EDP)
|
2013-11-14 10:13:41 +00:00
|
|
|
cpu_ctl2 = BLM_TRANSCODER_EDP;
|
2013-11-08 14:48:56 +00:00
|
|
|
else
|
2013-11-14 10:13:41 +00:00
|
|
|
cpu_ctl2 = BLM_PIPE(cpu_transcoder);
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_CPU_CTL2, cpu_ctl2);
|
|
|
|
intel_de_posting_read(dev_priv, BLC_PWM_CPU_CTL2);
|
|
|
|
intel_de_write(dev_priv, BLC_PWM_CPU_CTL2, cpu_ctl2 | BLM_PWM_ENABLE);
|
2013-11-08 14:48:59 +00:00
|
|
|
|
2013-11-14 10:13:41 +00:00
|
|
|
/* This won't stick until the above enable. */
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(conn_state, panel->backlight.level);
|
2013-11-14 10:13:41 +00:00
|
|
|
|
|
|
|
pch_ctl2 = panel->backlight.max << 16;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_PCH_CTL2, pch_ctl2);
|
2013-11-14 10:13:41 +00:00
|
|
|
|
|
|
|
pch_ctl1 = 0;
|
|
|
|
if (panel->backlight.active_low_pwm)
|
|
|
|
pch_ctl1 |= BLM_PCH_POLARITY;
|
2013-11-14 14:17:41 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_PCH_CTL1, pch_ctl1);
|
|
|
|
intel_de_posting_read(dev_priv, BLC_PWM_PCH_CTL1);
|
|
|
|
intel_de_write(dev_priv, BLC_PWM_PCH_CTL1,
|
|
|
|
pch_ctl1 | BLM_PCH_PWM_ENABLE);
|
2013-11-08 14:48:59 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void i9xx_enable_backlight(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2013-11-08 14:48:59 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:48:59 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2013-11-14 10:13:41 +00:00
|
|
|
u32 ctl, freq;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
ctl = intel_de_read(dev_priv, BLC_PWM_CTL);
|
2013-11-14 10:13:41 +00:00
|
|
|
if (ctl & BACKLIGHT_DUTY_CYCLE_MASK_PNV) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "backlight already enabled\n");
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_CTL, 0);
|
2013-11-14 10:13:41 +00:00
|
|
|
}
|
2013-11-08 14:48:59 +00:00
|
|
|
|
2013-11-14 10:13:41 +00:00
|
|
|
freq = panel->backlight.max;
|
|
|
|
if (panel->backlight.combination_mode)
|
|
|
|
freq /= 0xff;
|
|
|
|
|
|
|
|
ctl = freq << 17;
|
2014-02-25 11:11:47 +00:00
|
|
|
if (panel->backlight.combination_mode)
|
2013-11-14 10:13:41 +00:00
|
|
|
ctl |= BLM_LEGACY_MODE;
|
2015-12-18 08:51:35 +00:00
|
|
|
if (IS_PINEVIEW(dev_priv) && panel->backlight.active_low_pwm)
|
2013-11-14 10:13:41 +00:00
|
|
|
ctl |= BLM_POLARITY_PNV;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_CTL, ctl);
|
|
|
|
intel_de_posting_read(dev_priv, BLC_PWM_CTL);
|
2013-11-14 10:13:41 +00:00
|
|
|
|
|
|
|
/* XXX: combine this into above write? */
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(conn_state, panel->backlight.level);
|
2015-06-26 11:18:56 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Needed to enable backlight on some 855gm models. BLC_HIST_CTL is
|
|
|
|
* 855gm only, but checking for gen2 is safe, as 855gm is the only gen2
|
|
|
|
* that has backlight.
|
|
|
|
*/
|
drm/i915: replace IS_GEN<N> with IS_GEN(..., N)
Define IS_GEN() similarly to our IS_GEN_RANGE(). but use gen instead of
gen_mask to do the comparison. Now callers can pass then gen as a parameter,
so we don't require one macro for each gen.
The following spatch was used to convert the users of these macros:
@@
expression e;
@@
(
- IS_GEN2(e)
+ IS_GEN(e, 2)
|
- IS_GEN3(e)
+ IS_GEN(e, 3)
|
- IS_GEN4(e)
+ IS_GEN(e, 4)
|
- IS_GEN5(e)
+ IS_GEN(e, 5)
|
- IS_GEN6(e)
+ IS_GEN(e, 6)
|
- IS_GEN7(e)
+ IS_GEN(e, 7)
|
- IS_GEN8(e)
+ IS_GEN(e, 8)
|
- IS_GEN9(e)
+ IS_GEN(e, 9)
|
- IS_GEN10(e)
+ IS_GEN(e, 10)
|
- IS_GEN11(e)
+ IS_GEN(e, 11)
)
v2: use IS_GEN rather than GT_GEN and compare to info.gen rather than
using the bitmask
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212181044.15886-2-lucas.demarchi@intel.com
2018-12-12 18:10:43 +00:00
|
|
|
if (IS_GEN(dev_priv, 2))
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_HIST_CTL, BLM_HISTOGRAM_ENABLE);
|
2013-11-08 14:48:56 +00:00
|
|
|
}
|
2013-04-12 12:18:37 +00:00
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void i965_enable_backlight(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:48:59 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2017-06-12 10:21:15 +00:00
|
|
|
enum pipe pipe = to_intel_crtc(conn_state->crtc)->pipe;
|
2013-11-14 10:13:41 +00:00
|
|
|
u32 ctl, ctl2, freq;
|
2013-11-08 14:48:56 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
ctl2 = intel_de_read(dev_priv, BLC_PWM_CTL2);
|
2013-11-14 10:13:41 +00:00
|
|
|
if (ctl2 & BLM_PWM_ENABLE) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "backlight already enabled\n");
|
2013-11-14 10:13:41 +00:00
|
|
|
ctl2 &= ~BLM_PWM_ENABLE;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_CTL2, ctl2);
|
2013-11-14 10:13:41 +00:00
|
|
|
}
|
2013-11-08 14:48:56 +00:00
|
|
|
|
2013-11-14 10:13:41 +00:00
|
|
|
freq = panel->backlight.max;
|
|
|
|
if (panel->backlight.combination_mode)
|
|
|
|
freq /= 0xff;
|
2013-11-08 14:48:56 +00:00
|
|
|
|
2013-11-14 10:13:41 +00:00
|
|
|
ctl = freq << 16;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_CTL, ctl);
|
2013-11-08 14:48:59 +00:00
|
|
|
|
2013-11-14 10:13:41 +00:00
|
|
|
ctl2 = BLM_PIPE(pipe);
|
|
|
|
if (panel->backlight.combination_mode)
|
|
|
|
ctl2 |= BLM_COMBINATION_MODE;
|
|
|
|
if (panel->backlight.active_low_pwm)
|
|
|
|
ctl2 |= BLM_POLARITY_I965;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_CTL2, ctl2);
|
|
|
|
intel_de_posting_read(dev_priv, BLC_PWM_CTL2);
|
|
|
|
intel_de_write(dev_priv, BLC_PWM_CTL2, ctl2 | BLM_PWM_ENABLE);
|
2014-06-09 15:24:34 +00:00
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(conn_state, panel->backlight.level);
|
2013-11-08 14:48:56 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void vlv_enable_backlight(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:48:59 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2019-10-31 11:26:03 +00:00
|
|
|
enum pipe pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe;
|
2013-11-14 10:13:41 +00:00
|
|
|
u32 ctl, ctl2;
|
2013-11-08 14:48:56 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
ctl2 = intel_de_read(dev_priv, VLV_BLC_PWM_CTL2(pipe));
|
2013-11-14 10:13:41 +00:00
|
|
|
if (ctl2 & BLM_PWM_ENABLE) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "backlight already enabled\n");
|
2013-11-14 10:13:41 +00:00
|
|
|
ctl2 &= ~BLM_PWM_ENABLE;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, VLV_BLC_PWM_CTL2(pipe), ctl2);
|
2013-11-14 10:13:41 +00:00
|
|
|
}
|
2013-11-08 14:48:56 +00:00
|
|
|
|
2013-11-14 10:13:41 +00:00
|
|
|
ctl = panel->backlight.max << 16;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, VLV_BLC_PWM_CTL(pipe), ctl);
|
2013-11-08 14:48:56 +00:00
|
|
|
|
2013-11-14 10:13:41 +00:00
|
|
|
/* XXX: combine this into above write? */
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(conn_state, panel->backlight.level);
|
2013-11-08 14:48:56 +00:00
|
|
|
|
2013-11-14 10:13:41 +00:00
|
|
|
ctl2 = 0;
|
|
|
|
if (panel->backlight.active_low_pwm)
|
|
|
|
ctl2 |= BLM_POLARITY_I965;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, VLV_BLC_PWM_CTL2(pipe), ctl2);
|
|
|
|
intel_de_posting_read(dev_priv, VLV_BLC_PWM_CTL2(pipe));
|
|
|
|
intel_de_write(dev_priv, VLV_BLC_PWM_CTL2(pipe),
|
|
|
|
ctl2 | BLM_PWM_ENABLE);
|
2011-01-11 17:06:04 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void bxt_enable_backlight(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2015-05-05 09:21:56 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2015-05-05 09:21:56 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2019-10-31 11:26:03 +00:00
|
|
|
enum pipe pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe;
|
2015-09-30 17:04:57 +00:00
|
|
|
u32 pwm_ctl, val;
|
|
|
|
|
2016-12-08 09:26:18 +00:00
|
|
|
/* Controller 1 uses the utility pin. */
|
2015-09-30 17:04:57 +00:00
|
|
|
if (panel->backlight.controller == 1) {
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
val = intel_de_read(dev_priv, UTIL_PIN_CTL);
|
2015-09-30 17:04:57 +00:00
|
|
|
if (val & UTIL_PIN_ENABLE) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"util pin already enabled\n");
|
2015-09-30 17:04:57 +00:00
|
|
|
val &= ~UTIL_PIN_ENABLE;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, UTIL_PIN_CTL, val);
|
2015-09-30 17:04:57 +00:00
|
|
|
}
|
2015-05-05 09:21:56 +00:00
|
|
|
|
2015-09-30 17:04:57 +00:00
|
|
|
val = 0;
|
|
|
|
if (panel->backlight.util_pin_active_low)
|
|
|
|
val |= UTIL_PIN_POLARITY;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, UTIL_PIN_CTL,
|
|
|
|
val | UTIL_PIN_PIPE(pipe) | UTIL_PIN_MODE_PWM | UTIL_PIN_ENABLE);
|
2015-09-30 17:04:57 +00:00
|
|
|
}
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
pwm_ctl = intel_de_read(dev_priv,
|
|
|
|
BXT_BLC_PWM_CTL(panel->backlight.controller));
|
2015-05-05 09:21:56 +00:00
|
|
|
if (pwm_ctl & BXT_BLC_PWM_ENABLE) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "backlight already enabled\n");
|
2015-05-05 09:21:56 +00:00
|
|
|
pwm_ctl &= ~BXT_BLC_PWM_ENABLE;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
BXT_BLC_PWM_CTL(panel->backlight.controller),
|
|
|
|
pwm_ctl);
|
2015-05-05 09:21:56 +00:00
|
|
|
}
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
BXT_BLC_PWM_FREQ(panel->backlight.controller),
|
|
|
|
panel->backlight.max);
|
2015-05-05 09:21:56 +00:00
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(conn_state, panel->backlight.level);
|
2015-05-05 09:21:56 +00:00
|
|
|
|
|
|
|
pwm_ctl = 0;
|
|
|
|
if (panel->backlight.active_low_pwm)
|
|
|
|
pwm_ctl |= BXT_BLC_PWM_POLARITY;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BXT_BLC_PWM_CTL(panel->backlight.controller),
|
|
|
|
pwm_ctl);
|
|
|
|
intel_de_posting_read(dev_priv,
|
|
|
|
BXT_BLC_PWM_CTL(panel->backlight.controller));
|
|
|
|
intel_de_write(dev_priv, BXT_BLC_PWM_CTL(panel->backlight.controller),
|
|
|
|
pwm_ctl | BXT_BLC_PWM_ENABLE);
|
2015-05-05 09:21:56 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void cnp_enable_backlight(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2017-06-02 20:06:42 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2017-06-02 20:06:42 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
u32 pwm_ctl;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
pwm_ctl = intel_de_read(dev_priv,
|
|
|
|
BXT_BLC_PWM_CTL(panel->backlight.controller));
|
2017-06-02 20:06:42 +00:00
|
|
|
if (pwm_ctl & BXT_BLC_PWM_ENABLE) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "backlight already enabled\n");
|
2017-06-02 20:06:42 +00:00
|
|
|
pwm_ctl &= ~BXT_BLC_PWM_ENABLE;
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
BXT_BLC_PWM_CTL(panel->backlight.controller),
|
|
|
|
pwm_ctl);
|
2017-06-02 20:06:42 +00:00
|
|
|
}
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
BXT_BLC_PWM_FREQ(panel->backlight.controller),
|
|
|
|
panel->backlight.max);
|
2017-06-02 20:06:42 +00:00
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(conn_state, panel->backlight.level);
|
2017-06-02 20:06:42 +00:00
|
|
|
|
|
|
|
pwm_ctl = 0;
|
|
|
|
if (panel->backlight.active_low_pwm)
|
|
|
|
pwm_ctl |= BXT_BLC_PWM_POLARITY;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BXT_BLC_PWM_CTL(panel->backlight.controller),
|
|
|
|
pwm_ctl);
|
|
|
|
intel_de_posting_read(dev_priv,
|
|
|
|
BXT_BLC_PWM_CTL(panel->backlight.controller));
|
|
|
|
intel_de_write(dev_priv, BXT_BLC_PWM_CTL(panel->backlight.controller),
|
|
|
|
pwm_ctl | BXT_BLC_PWM_ENABLE);
|
2017-06-02 20:06:42 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
static void pwm_enable_backlight(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2015-06-26 09:02:10 +00:00
|
|
|
{
|
2017-06-12 10:21:15 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2015-06-26 09:02:10 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
|
|
|
|
pwm_enable(panel->backlight.pwm);
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_actually_set_backlight(conn_state, panel->backlight.level);
|
2015-06-26 09:02:10 +00:00
|
|
|
}
|
|
|
|
|
2019-01-08 16:08:38 +00:00
|
|
|
static void __intel_panel_enable_backlight(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2011-01-11 17:06:04 +00:00
|
|
|
{
|
2017-06-12 10:21:13 +00:00
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
2013-11-08 14:48:54 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2011-01-11 17:06:04 +00:00
|
|
|
|
2013-11-08 14:49:00 +00:00
|
|
|
WARN_ON(panel->backlight.max == 0);
|
|
|
|
|
2015-01-12 19:01:03 +00:00
|
|
|
if (panel->backlight.level <= panel->backlight.min) {
|
2013-11-08 14:49:00 +00:00
|
|
|
panel->backlight.level = panel->backlight.max;
|
2013-11-08 14:48:54 +00:00
|
|
|
if (panel->backlight.device)
|
|
|
|
panel->backlight.device->props.brightness =
|
2014-06-24 15:27:40 +00:00
|
|
|
scale_hw_to_user(connector,
|
|
|
|
panel->backlight.level,
|
|
|
|
panel->backlight.device->props.max_brightness);
|
2013-03-12 09:44:15 +00:00
|
|
|
}
|
2011-01-11 17:06:04 +00:00
|
|
|
|
2017-06-12 10:21:15 +00:00
|
|
|
panel->backlight.enable(crtc_state, conn_state);
|
2013-11-08 14:48:54 +00:00
|
|
|
panel->backlight.enabled = true;
|
2014-08-13 09:10:12 +00:00
|
|
|
if (panel->backlight.device)
|
|
|
|
panel->backlight.device->props.power = FB_BLANK_UNBLANK;
|
2019-01-08 16:08:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void intel_panel_enable_backlight(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
|
|
|
{
|
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
struct intel_panel *panel = &connector->panel;
|
2019-10-31 11:26:03 +00:00
|
|
|
enum pipe pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe;
|
2019-01-08 16:08:38 +00:00
|
|
|
|
|
|
|
if (!panel->backlight.present)
|
|
|
|
return;
|
|
|
|
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "pipe %c\n", pipe_name(pipe));
|
2019-01-08 16:08:38 +00:00
|
|
|
|
|
|
|
mutex_lock(&dev_priv->backlight_lock);
|
|
|
|
|
|
|
|
__intel_panel_enable_backlight(crtc_state, conn_state);
|
2013-04-12 12:18:37 +00:00
|
|
|
|
2014-09-15 12:35:09 +00:00
|
|
|
mutex_unlock(&dev_priv->backlight_lock);
|
2011-01-11 17:06:04 +00:00
|
|
|
}
|
|
|
|
|
2013-09-18 14:19:45 +00:00
|
|
|
#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
|
2017-11-27 15:10:28 +00:00
|
|
|
static u32 intel_panel_get_backlight(struct intel_connector *connector)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
u32 val = 0;
|
|
|
|
|
|
|
|
mutex_lock(&dev_priv->backlight_lock);
|
|
|
|
|
|
|
|
if (panel->backlight.enabled) {
|
|
|
|
val = panel->backlight.get(connector);
|
|
|
|
val = intel_panel_compute_brightness(connector, val);
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&dev_priv->backlight_lock);
|
|
|
|
|
drm/i915/panel: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200402114819.17232-2-jani.nikula@intel.com
2020-04-02 11:48:04 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "get backlight PWM = %d\n", val);
|
2017-11-27 15:10:28 +00:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2020-04-28 21:30:50 +00:00
|
|
|
/* Scale user_level in range [0..user_max] to [hw_min..hw_max]. */
|
|
|
|
static u32 scale_user_to_hw(struct intel_connector *connector,
|
|
|
|
u32 user_level, u32 user_max)
|
|
|
|
{
|
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
|
|
|
|
return scale(user_level, 0, user_max,
|
|
|
|
panel->backlight.min, panel->backlight.max);
|
|
|
|
}
|
|
|
|
|
2017-11-27 15:10:28 +00:00
|
|
|
/* set backlight brightness to level in range [0..max], scaling wrt hw min */
|
|
|
|
static void intel_panel_set_backlight(const struct drm_connector_state *conn_state,
|
|
|
|
u32 user_level, u32 user_max)
|
|
|
|
{
|
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
u32 hw_level;
|
|
|
|
|
|
|
|
if (!panel->backlight.present)
|
|
|
|
return;
|
|
|
|
|
|
|
|
mutex_lock(&dev_priv->backlight_lock);
|
|
|
|
|
drm/i915/display/panel: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is readily
available.
The conversion was done automatically with below coccinelle semantic
patch.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200128181603.27767-16-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 18:15:57 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm, panel->backlight.max == 0);
|
2017-11-27 15:10:28 +00:00
|
|
|
|
|
|
|
hw_level = scale_user_to_hw(connector, user_level, user_max);
|
|
|
|
panel->backlight.level = hw_level;
|
|
|
|
|
|
|
|
if (panel->backlight.enabled)
|
|
|
|
intel_panel_actually_set_backlight(conn_state, hw_level);
|
|
|
|
|
|
|
|
mutex_unlock(&dev_priv->backlight_lock);
|
|
|
|
}
|
|
|
|
|
2013-11-08 14:48:53 +00:00
|
|
|
static int intel_backlight_device_update_status(struct backlight_device *bd)
|
2011-08-12 10:11:33 +00:00
|
|
|
{
|
2013-10-31 16:55:49 +00:00
|
|
|
struct intel_connector *connector = bl_get_data(bd);
|
2014-08-13 09:10:12 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2013-10-31 16:55:49 +00:00
|
|
|
struct drm_device *dev = connector->base.dev;
|
|
|
|
|
2013-11-19 17:10:12 +00:00
|
|
|
drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
|
2013-10-13 11:56:31 +00:00
|
|
|
DRM_DEBUG_KMS("updating intel_backlight, brightness=%d/%d\n",
|
|
|
|
bd->props.brightness, bd->props.max_brightness);
|
2017-06-12 10:21:15 +00:00
|
|
|
intel_panel_set_backlight(connector->base.state, bd->props.brightness,
|
2013-04-12 12:18:36 +00:00
|
|
|
bd->props.max_brightness);
|
2014-08-13 09:10:12 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Allow flipping bl_power as a sub-state of enabled. Sadly the
|
|
|
|
* backlight class device does not make it easy to to differentiate
|
|
|
|
* between callbacks for brightness and bl_power, so our backlight_power
|
|
|
|
* callback needs to take this into account.
|
|
|
|
*/
|
|
|
|
if (panel->backlight.enabled) {
|
2015-09-14 11:03:48 +00:00
|
|
|
if (panel->backlight.power) {
|
2014-08-12 14:11:42 +00:00
|
|
|
bool enable = bd->props.power == FB_BLANK_UNBLANK &&
|
|
|
|
bd->props.brightness != 0;
|
2015-09-14 11:03:48 +00:00
|
|
|
panel->backlight.power(connector, enable);
|
2014-08-13 09:10:12 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
bd->props.power = FB_BLANK_POWERDOWN;
|
|
|
|
}
|
|
|
|
|
2013-11-19 17:10:12 +00:00
|
|
|
drm_modeset_unlock(&dev->mode_config.connection_mutex);
|
2011-08-12 10:11:33 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-11-08 14:48:53 +00:00
|
|
|
static int intel_backlight_device_get_brightness(struct backlight_device *bd)
|
2011-08-12 10:11:33 +00:00
|
|
|
{
|
2013-10-31 16:55:49 +00:00
|
|
|
struct intel_connector *connector = bl_get_data(bd);
|
|
|
|
struct drm_device *dev = connector->base.dev;
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2019-01-14 14:21:21 +00:00
|
|
|
intel_wakeref_t wakeref;
|
2019-01-14 14:21:23 +00:00
|
|
|
int ret = 0;
|
2013-10-31 16:55:49 +00:00
|
|
|
|
2019-06-13 23:21:55 +00:00
|
|
|
with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref) {
|
2019-01-14 14:21:23 +00:00
|
|
|
u32 hw_level;
|
2014-06-24 15:27:40 +00:00
|
|
|
|
2019-01-14 14:21:23 +00:00
|
|
|
drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
|
2014-06-24 15:27:40 +00:00
|
|
|
|
2019-01-14 14:21:23 +00:00
|
|
|
hw_level = intel_panel_get_backlight(connector);
|
|
|
|
ret = scale_hw_to_user(connector,
|
|
|
|
hw_level, bd->props.max_brightness);
|
|
|
|
|
|
|
|
drm_modeset_unlock(&dev->mode_config.connection_mutex);
|
|
|
|
}
|
2013-10-31 16:55:49 +00:00
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
return ret;
|
2011-08-12 10:11:33 +00:00
|
|
|
}
|
|
|
|
|
2013-11-08 14:48:53 +00:00
|
|
|
static const struct backlight_ops intel_backlight_device_ops = {
|
|
|
|
.update_status = intel_backlight_device_update_status,
|
|
|
|
.get_brightness = intel_backlight_device_get_brightness,
|
2011-08-12 10:11:33 +00:00
|
|
|
};
|
|
|
|
|
2016-06-24 13:00:15 +00:00
|
|
|
int intel_backlight_device_register(struct intel_connector *connector)
|
2011-08-12 10:11:33 +00:00
|
|
|
{
|
drm/i915/panel: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200402114819.17232-2-jani.nikula@intel.com
2020-04-02 11:48:04 +00:00
|
|
|
struct drm_i915_private *i915 = to_i915(connector->base.dev);
|
2013-11-08 14:48:54 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2011-08-12 10:11:33 +00:00
|
|
|
struct backlight_properties props;
|
|
|
|
|
2013-11-08 14:48:54 +00:00
|
|
|
if (WARN_ON(panel->backlight.device))
|
2013-04-12 12:18:38 +00:00
|
|
|
return -ENODEV;
|
|
|
|
|
2014-11-07 13:19:46 +00:00
|
|
|
if (!panel->backlight.present)
|
|
|
|
return 0;
|
|
|
|
|
2014-06-24 15:27:40 +00:00
|
|
|
WARN_ON(panel->backlight.max == 0);
|
2013-11-08 14:48:56 +00:00
|
|
|
|
2012-05-22 09:29:46 +00:00
|
|
|
memset(&props, 0, sizeof(props));
|
2011-08-12 10:11:33 +00:00
|
|
|
props.type = BACKLIGHT_RAW;
|
2014-06-24 15:27:40 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Note: Everything should work even if the backlight device max
|
|
|
|
* presented to the userspace is arbitrarily chosen.
|
|
|
|
*/
|
2013-11-08 14:48:56 +00:00
|
|
|
props.max_brightness = panel->backlight.max;
|
2014-06-24 15:27:40 +00:00
|
|
|
props.brightness = scale_hw_to_user(connector,
|
|
|
|
panel->backlight.level,
|
|
|
|
props.max_brightness);
|
2013-11-08 14:48:54 +00:00
|
|
|
|
2014-08-13 09:10:12 +00:00
|
|
|
if (panel->backlight.enabled)
|
|
|
|
props.power = FB_BLANK_UNBLANK;
|
|
|
|
else
|
|
|
|
props.power = FB_BLANK_POWERDOWN;
|
|
|
|
|
2013-11-08 14:48:54 +00:00
|
|
|
/*
|
|
|
|
* Note: using the same name independent of the connector prevents
|
|
|
|
* registration of multiple backlight devices in the driver.
|
|
|
|
*/
|
|
|
|
panel->backlight.device =
|
2011-08-12 10:11:33 +00:00
|
|
|
backlight_device_register("intel_backlight",
|
2013-11-08 14:48:53 +00:00
|
|
|
connector->base.kdev,
|
|
|
|
connector,
|
|
|
|
&intel_backlight_device_ops, &props);
|
2011-08-12 10:11:33 +00:00
|
|
|
|
2013-11-08 14:48:54 +00:00
|
|
|
if (IS_ERR(panel->backlight.device)) {
|
drm/i915/panel: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200402114819.17232-2-jani.nikula@intel.com
2020-04-02 11:48:04 +00:00
|
|
|
drm_err(&i915->drm, "Failed to register backlight: %ld\n",
|
|
|
|
PTR_ERR(panel->backlight.device));
|
2013-11-08 14:48:54 +00:00
|
|
|
panel->backlight.device = NULL;
|
2011-08-12 10:11:33 +00:00
|
|
|
return -ENODEV;
|
|
|
|
}
|
2014-11-07 13:19:46 +00:00
|
|
|
|
drm/i915/panel: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200402114819.17232-2-jani.nikula@intel.com
2020-04-02 11:48:04 +00:00
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
"Connector %s backlight sysfs interface registered\n",
|
|
|
|
connector->base.name);
|
2014-11-07 13:19:46 +00:00
|
|
|
|
2011-08-12 10:11:33 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-06-17 10:40:34 +00:00
|
|
|
void intel_backlight_device_unregister(struct intel_connector *connector)
|
2011-08-12 10:11:33 +00:00
|
|
|
{
|
2013-11-08 14:48:54 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
|
|
|
|
if (panel->backlight.device) {
|
|
|
|
backlight_device_unregister(panel->backlight.device);
|
|
|
|
panel->backlight.device = NULL;
|
2013-04-12 12:18:38 +00:00
|
|
|
}
|
2011-08-12 10:11:33 +00:00
|
|
|
}
|
2013-11-08 14:48:53 +00:00
|
|
|
#endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */
|
|
|
|
|
2017-06-02 20:06:42 +00:00
|
|
|
/*
|
|
|
|
* CNP: PWM clock frequency is 19.2 MHz or 24 MHz.
|
|
|
|
* PWM increment = 1
|
|
|
|
*/
|
|
|
|
static u32 cnp_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
2020-02-16 16:34:45 +00:00
|
|
|
return DIV_ROUND_CLOSEST(KHz(RUNTIME_INFO(dev_priv)->rawclk_freq),
|
|
|
|
pwm_freq_hz);
|
2017-06-02 20:06:42 +00:00
|
|
|
}
|
|
|
|
|
2015-12-01 08:23:50 +00:00
|
|
|
/*
|
|
|
|
* BXT: PWM clock frequency = 19.2 MHz.
|
|
|
|
*/
|
|
|
|
static u32 bxt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
|
|
|
|
{
|
2016-03-02 15:22:18 +00:00
|
|
|
return DIV_ROUND_CLOSEST(KHz(19200), pwm_freq_hz);
|
2015-12-01 08:23:50 +00:00
|
|
|
}
|
|
|
|
|
2013-11-08 14:49:00 +00:00
|
|
|
/*
|
2015-09-04 13:55:14 +00:00
|
|
|
* SPT: This value represents the period of the PWM stream in clock periods
|
|
|
|
* multiplied by 16 (default increment) or 128 (alternate increment selected in
|
|
|
|
* SCHICKEN_1 bit 0). PWM clock is 24 MHz.
|
|
|
|
*/
|
|
|
|
static u32 spt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
|
|
|
|
{
|
2016-09-19 10:35:25 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2016-03-02 15:22:13 +00:00
|
|
|
u32 mul;
|
2015-09-04 13:55:14 +00:00
|
|
|
|
2016-09-19 10:35:25 +00:00
|
|
|
if (panel->backlight.alternate_pwm_increment)
|
2015-09-04 13:55:14 +00:00
|
|
|
mul = 128;
|
|
|
|
else
|
|
|
|
mul = 16;
|
|
|
|
|
2016-03-02 15:22:18 +00:00
|
|
|
return DIV_ROUND_CLOSEST(MHz(24), pwm_freq_hz * mul);
|
2015-09-04 13:55:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* LPT: This value represents the period of the PWM stream in clock periods
|
|
|
|
* multiplied by 128 (default increment) or 16 (alternate increment, selected in
|
|
|
|
* LPT SOUTH_CHICKEN2 register bit 5).
|
|
|
|
*/
|
|
|
|
static u32 lpt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
|
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2016-09-19 10:35:25 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2015-09-04 13:55:14 +00:00
|
|
|
u32 mul, clock;
|
|
|
|
|
2016-09-19 10:35:25 +00:00
|
|
|
if (panel->backlight.alternate_pwm_increment)
|
2015-09-04 13:55:14 +00:00
|
|
|
mul = 16;
|
|
|
|
else
|
|
|
|
mul = 128;
|
|
|
|
|
2015-11-30 14:23:44 +00:00
|
|
|
if (HAS_PCH_LPT_H(dev_priv))
|
2015-09-04 13:55:14 +00:00
|
|
|
clock = MHz(135); /* LPT:H */
|
|
|
|
else
|
|
|
|
clock = MHz(24); /* LPT:LP */
|
|
|
|
|
2016-03-02 15:22:18 +00:00
|
|
|
return DIV_ROUND_CLOSEST(clock, pwm_freq_hz * mul);
|
2015-09-04 13:55:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ILK/SNB/IVB: This value represents the period of the PWM stream in PCH
|
|
|
|
* display raw clocks multiplied by 128.
|
|
|
|
*/
|
|
|
|
static u32 pch_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
|
|
|
|
{
|
2016-03-02 15:22:13 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2015-09-04 13:55:14 +00:00
|
|
|
|
2020-02-16 16:34:45 +00:00
|
|
|
return DIV_ROUND_CLOSEST(KHz(RUNTIME_INFO(dev_priv)->rawclk_freq),
|
|
|
|
pwm_freq_hz * 128);
|
2015-09-04 13:55:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Gen2: This field determines the number of time base events (display core
|
|
|
|
* clock frequency/32) in total for a complete cycle of modulated backlight
|
|
|
|
* control.
|
2013-11-08 14:49:00 +00:00
|
|
|
*
|
2015-09-04 13:55:14 +00:00
|
|
|
* Gen3: A time base event equals the display core clock ([DevPNV] HRAW clock)
|
|
|
|
* divided by 32.
|
|
|
|
*/
|
|
|
|
static u32 i9xx_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
|
|
|
|
{
|
2016-03-02 15:22:13 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2015-09-04 13:55:14 +00:00
|
|
|
int clock;
|
|
|
|
|
2016-03-02 15:22:13 +00:00
|
|
|
if (IS_PINEVIEW(dev_priv))
|
2020-02-16 16:34:45 +00:00
|
|
|
clock = KHz(RUNTIME_INFO(dev_priv)->rawclk_freq);
|
2015-09-04 13:55:14 +00:00
|
|
|
else
|
2017-02-07 18:33:45 +00:00
|
|
|
clock = KHz(dev_priv->cdclk.hw.cdclk);
|
2015-09-04 13:55:14 +00:00
|
|
|
|
2016-03-02 15:22:18 +00:00
|
|
|
return DIV_ROUND_CLOSEST(clock, pwm_freq_hz * 32);
|
2015-09-04 13:55:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Gen4: This value represents the period of the PWM stream in display core
|
2015-11-30 14:23:43 +00:00
|
|
|
* clocks ([DevCTG] HRAW clocks) multiplied by 128.
|
|
|
|
*
|
2015-09-04 13:55:14 +00:00
|
|
|
*/
|
|
|
|
static u32 i965_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
|
|
|
|
{
|
2016-12-13 08:02:49 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2015-11-30 14:23:43 +00:00
|
|
|
int clock;
|
|
|
|
|
|
|
|
if (IS_G4X(dev_priv))
|
2020-02-16 16:34:45 +00:00
|
|
|
clock = KHz(RUNTIME_INFO(dev_priv)->rawclk_freq);
|
2015-11-30 14:23:43 +00:00
|
|
|
else
|
2017-02-07 18:33:45 +00:00
|
|
|
clock = KHz(dev_priv->cdclk.hw.cdclk);
|
2015-09-04 13:55:14 +00:00
|
|
|
|
2016-03-02 15:22:18 +00:00
|
|
|
return DIV_ROUND_CLOSEST(clock, pwm_freq_hz * 128);
|
2015-09-04 13:55:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* VLV: This value represents the period of the PWM stream in display core
|
|
|
|
* clocks ([DevCTG] 200MHz HRAW clocks) multiplied by 128 or 25MHz S0IX clocks
|
|
|
|
* multiplied by 16. CHV uses a 19.2MHz S0IX clock.
|
|
|
|
*/
|
|
|
|
static u32 vlv_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
|
|
|
|
{
|
2016-03-02 15:22:13 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
int mul, clock;
|
2015-09-04 13:55:14 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
if ((intel_de_read(dev_priv, CBR1_VLV) & CBR_PWM_CLOCK_MUX_SELECT) == 0) {
|
2016-03-02 15:22:13 +00:00
|
|
|
if (IS_CHERRYVIEW(dev_priv))
|
|
|
|
clock = KHz(19200);
|
2015-09-04 13:55:14 +00:00
|
|
|
else
|
2016-03-02 15:22:13 +00:00
|
|
|
clock = MHz(25);
|
|
|
|
mul = 16;
|
2015-09-04 13:55:14 +00:00
|
|
|
} else {
|
2020-02-16 16:34:45 +00:00
|
|
|
clock = KHz(RUNTIME_INFO(dev_priv)->rawclk_freq);
|
2016-03-02 15:22:13 +00:00
|
|
|
mul = 128;
|
2015-09-04 13:55:14 +00:00
|
|
|
}
|
2016-03-02 15:22:13 +00:00
|
|
|
|
2016-03-02 15:22:18 +00:00
|
|
|
return DIV_ROUND_CLOSEST(clock, pwm_freq_hz * mul);
|
2015-09-04 13:55:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static u32 get_backlight_max_vbt(struct intel_connector *connector)
|
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2015-09-14 11:03:48 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2015-09-04 13:55:14 +00:00
|
|
|
u16 pwm_freq_hz = dev_priv->vbt.backlight.pwm_freq_hz;
|
|
|
|
u32 pwm;
|
|
|
|
|
2015-12-01 08:23:51 +00:00
|
|
|
if (!panel->backlight.hz_to_pwm) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"backlight frequency conversion not supported\n");
|
2015-09-04 13:55:14 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-12-01 08:23:51 +00:00
|
|
|
if (pwm_freq_hz) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"VBT defined backlight frequency %u Hz\n",
|
|
|
|
pwm_freq_hz);
|
2015-12-01 08:23:51 +00:00
|
|
|
} else {
|
|
|
|
pwm_freq_hz = 200;
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"default backlight frequency %u Hz\n",
|
|
|
|
pwm_freq_hz);
|
2015-09-04 13:55:14 +00:00
|
|
|
}
|
|
|
|
|
2015-09-14 11:03:48 +00:00
|
|
|
pwm = panel->backlight.hz_to_pwm(connector, pwm_freq_hz);
|
2015-09-04 13:55:14 +00:00
|
|
|
if (!pwm) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"backlight frequency conversion failed\n");
|
2015-09-04 13:55:14 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pwm;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Note: The setup hooks can't assume pipe is set!
|
2013-11-08 14:49:00 +00:00
|
|
|
*/
|
2014-06-24 15:27:40 +00:00
|
|
|
static u32 get_backlight_min_vbt(struct intel_connector *connector)
|
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2014-06-24 15:27:40 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2014-11-05 12:46:31 +00:00
|
|
|
int min;
|
2014-06-24 15:27:40 +00:00
|
|
|
|
drm/i915/display/panel: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is readily
available.
The conversion was done automatically with below coccinelle semantic
patch.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200128181603.27767-16-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 18:15:57 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm, panel->backlight.max == 0);
|
2014-06-24 15:27:40 +00:00
|
|
|
|
2014-11-05 12:46:31 +00:00
|
|
|
/*
|
|
|
|
* XXX: If the vbt value is 255, it makes min equal to max, which leads
|
|
|
|
* to problems. There are such machines out there. Either our
|
|
|
|
* interpretation is wrong or the vbt has bogus data. Or both. Safeguard
|
|
|
|
* against this by letting the minimum be at most (arbitrarily chosen)
|
|
|
|
* 25% of the max.
|
|
|
|
*/
|
|
|
|
min = clamp_t(int, dev_priv->vbt.backlight.min_brightness, 0, 64);
|
|
|
|
if (min != dev_priv->vbt.backlight.min_brightness) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"clamping VBT min backlight %d/255 to %d/255\n",
|
|
|
|
dev_priv->vbt.backlight.min_brightness, min);
|
2014-11-05 12:46:31 +00:00
|
|
|
}
|
|
|
|
|
2014-06-24 15:27:40 +00:00
|
|
|
/* vbt value is a coefficient in range [0..255] */
|
2014-11-05 12:46:31 +00:00
|
|
|
return scale(min, 0, 255, 0, panel->backlight.max);
|
2014-06-24 15:27:40 +00:00
|
|
|
}
|
|
|
|
|
2015-09-04 13:55:13 +00:00
|
|
|
static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unused)
|
2011-08-12 10:11:33 +00:00
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-14 14:17:41 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2019-01-08 16:08:39 +00:00
|
|
|
u32 cpu_ctl2, pch_ctl1, pch_ctl2, val;
|
|
|
|
bool alt, cpu_mode;
|
2016-09-19 10:35:25 +00:00
|
|
|
|
|
|
|
if (HAS_PCH_LPT(dev_priv))
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
alt = intel_de_read(dev_priv, SOUTH_CHICKEN2) & LPT_PWM_GRANULARITY;
|
2016-09-19 10:35:25 +00:00
|
|
|
else
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
alt = intel_de_read(dev_priv, SOUTH_CHICKEN1) & SPT_PWM_GRANULARITY;
|
2016-09-19 10:35:25 +00:00
|
|
|
panel->backlight.alternate_pwm_increment = alt;
|
2013-11-14 14:17:41 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
pch_ctl1 = intel_de_read(dev_priv, BLC_PWM_PCH_CTL1);
|
2013-11-14 14:17:41 +00:00
|
|
|
panel->backlight.active_low_pwm = pch_ctl1 & BLM_PCH_POLARITY;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
pch_ctl2 = intel_de_read(dev_priv, BLC_PWM_PCH_CTL2);
|
2013-11-14 14:17:41 +00:00
|
|
|
panel->backlight.max = pch_ctl2 >> 16;
|
2015-09-04 13:55:14 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
cpu_ctl2 = intel_de_read(dev_priv, BLC_PWM_CPU_CTL2);
|
2019-01-08 16:08:39 +00:00
|
|
|
|
2015-09-04 13:55:14 +00:00
|
|
|
if (!panel->backlight.max)
|
|
|
|
panel->backlight.max = get_backlight_max_vbt(connector);
|
|
|
|
|
2013-11-14 14:17:41 +00:00
|
|
|
if (!panel->backlight.max)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2014-06-24 15:27:40 +00:00
|
|
|
panel->backlight.min = get_backlight_min_vbt(connector);
|
|
|
|
|
2019-01-08 16:08:39 +00:00
|
|
|
panel->backlight.enabled = pch_ctl1 & BLM_PCH_PWM_ENABLE;
|
|
|
|
|
|
|
|
cpu_mode = panel->backlight.enabled && HAS_PCH_LPT(dev_priv) &&
|
|
|
|
!(pch_ctl1 & BLM_PCH_OVERRIDE_ENABLE) &&
|
|
|
|
(cpu_ctl2 & BLM_PWM_ENABLE);
|
|
|
|
if (cpu_mode)
|
|
|
|
val = pch_get_backlight(connector);
|
|
|
|
else
|
|
|
|
val = lpt_get_backlight(connector);
|
2016-08-23 08:10:05 +00:00
|
|
|
val = intel_panel_compute_brightness(connector, val);
|
|
|
|
panel->backlight.level = clamp(val, panel->backlight.min,
|
|
|
|
panel->backlight.max);
|
2013-11-14 14:17:41 +00:00
|
|
|
|
2019-01-08 16:08:39 +00:00
|
|
|
if (cpu_mode) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"CPU backlight register was enabled, switching to PCH override\n");
|
2019-01-08 16:08:39 +00:00
|
|
|
|
|
|
|
/* Write converted CPU PWM value to PCH override register */
|
|
|
|
lpt_set_backlight(connector->base.state, panel->backlight.level);
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_PCH_CTL1,
|
|
|
|
pch_ctl1 | BLM_PCH_OVERRIDE_ENABLE);
|
2019-01-08 16:08:39 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_write(dev_priv, BLC_PWM_CPU_CTL2,
|
|
|
|
cpu_ctl2 & ~BLM_PWM_ENABLE);
|
2019-01-08 16:08:39 +00:00
|
|
|
}
|
2013-11-14 14:17:41 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-07 09:16:02 +00:00
|
|
|
static int pch_setup_backlight(struct intel_connector *connector, enum pipe unused)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:48:56 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2013-11-08 14:49:02 +00:00
|
|
|
u32 cpu_ctl2, pch_ctl1, pch_ctl2, val;
|
2013-11-08 14:48:56 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
pch_ctl1 = intel_de_read(dev_priv, BLC_PWM_PCH_CTL1);
|
2013-11-08 14:49:02 +00:00
|
|
|
panel->backlight.active_low_pwm = pch_ctl1 & BLM_PCH_POLARITY;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
pch_ctl2 = intel_de_read(dev_priv, BLC_PWM_PCH_CTL2);
|
2013-11-08 14:49:02 +00:00
|
|
|
panel->backlight.max = pch_ctl2 >> 16;
|
2015-09-04 13:55:14 +00:00
|
|
|
|
|
|
|
if (!panel->backlight.max)
|
|
|
|
panel->backlight.max = get_backlight_max_vbt(connector);
|
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
if (!panel->backlight.max)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2014-06-24 15:27:40 +00:00
|
|
|
panel->backlight.min = get_backlight_min_vbt(connector);
|
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
val = pch_get_backlight(connector);
|
2016-08-23 08:10:05 +00:00
|
|
|
val = intel_panel_compute_brightness(connector, val);
|
|
|
|
panel->backlight.level = clamp(val, panel->backlight.min,
|
|
|
|
panel->backlight.max);
|
2013-11-08 14:48:56 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
cpu_ctl2 = intel_de_read(dev_priv, BLC_PWM_CPU_CTL2);
|
2013-11-08 14:49:02 +00:00
|
|
|
panel->backlight.enabled = (cpu_ctl2 & BLM_PWM_ENABLE) &&
|
2016-08-23 08:10:05 +00:00
|
|
|
(pch_ctl1 & BLM_PCH_PWM_ENABLE);
|
2013-11-08 14:49:02 +00:00
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-07 09:16:02 +00:00
|
|
|
static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unused)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:48:56 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2013-11-08 14:49:02 +00:00
|
|
|
u32 ctl, val;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
ctl = intel_de_read(dev_priv, BLC_PWM_CTL);
|
2013-11-08 14:49:02 +00:00
|
|
|
|
drm/i915: replace IS_GEN<N> with IS_GEN(..., N)
Define IS_GEN() similarly to our IS_GEN_RANGE(). but use gen instead of
gen_mask to do the comparison. Now callers can pass then gen as a parameter,
so we don't require one macro for each gen.
The following spatch was used to convert the users of these macros:
@@
expression e;
@@
(
- IS_GEN2(e)
+ IS_GEN(e, 2)
|
- IS_GEN3(e)
+ IS_GEN(e, 3)
|
- IS_GEN4(e)
+ IS_GEN(e, 4)
|
- IS_GEN5(e)
+ IS_GEN(e, 5)
|
- IS_GEN6(e)
+ IS_GEN(e, 6)
|
- IS_GEN7(e)
+ IS_GEN(e, 7)
|
- IS_GEN8(e)
+ IS_GEN(e, 8)
|
- IS_GEN9(e)
+ IS_GEN(e, 9)
|
- IS_GEN10(e)
+ IS_GEN(e, 10)
|
- IS_GEN11(e)
+ IS_GEN(e, 11)
)
v2: use IS_GEN rather than GT_GEN and compare to info.gen rather than
using the bitmask
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212181044.15886-2-lucas.demarchi@intel.com
2018-12-12 18:10:43 +00:00
|
|
|
if (IS_GEN(dev_priv, 2) || IS_I915GM(dev_priv) || IS_I945GM(dev_priv))
|
2013-11-08 14:49:02 +00:00
|
|
|
panel->backlight.combination_mode = ctl & BLM_LEGACY_MODE;
|
|
|
|
|
2015-12-18 08:51:35 +00:00
|
|
|
if (IS_PINEVIEW(dev_priv))
|
2013-11-08 14:49:02 +00:00
|
|
|
panel->backlight.active_low_pwm = ctl & BLM_POLARITY_PNV;
|
|
|
|
|
|
|
|
panel->backlight.max = ctl >> 17;
|
2015-09-04 13:55:14 +00:00
|
|
|
|
|
|
|
if (!panel->backlight.max) {
|
|
|
|
panel->backlight.max = get_backlight_max_vbt(connector);
|
|
|
|
panel->backlight.max >>= 1;
|
|
|
|
}
|
2013-11-08 14:48:56 +00:00
|
|
|
|
|
|
|
if (!panel->backlight.max)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2015-09-04 13:55:14 +00:00
|
|
|
if (panel->backlight.combination_mode)
|
|
|
|
panel->backlight.max *= 0xff;
|
|
|
|
|
2014-06-24 15:27:40 +00:00
|
|
|
panel->backlight.min = get_backlight_min_vbt(connector);
|
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
val = i9xx_get_backlight(connector);
|
2016-08-23 08:10:05 +00:00
|
|
|
val = intel_panel_compute_brightness(connector, val);
|
|
|
|
panel->backlight.level = clamp(val, panel->backlight.min,
|
|
|
|
panel->backlight.max);
|
2013-11-08 14:48:56 +00:00
|
|
|
|
2016-08-23 08:10:05 +00:00
|
|
|
panel->backlight.enabled = val != 0;
|
2013-11-08 14:49:02 +00:00
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-07 09:16:02 +00:00
|
|
|
static int i965_setup_backlight(struct intel_connector *connector, enum pipe unused)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:48:56 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2013-11-08 14:49:02 +00:00
|
|
|
u32 ctl, ctl2, val;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
ctl2 = intel_de_read(dev_priv, BLC_PWM_CTL2);
|
2013-11-08 14:49:02 +00:00
|
|
|
panel->backlight.combination_mode = ctl2 & BLM_COMBINATION_MODE;
|
|
|
|
panel->backlight.active_low_pwm = ctl2 & BLM_POLARITY_I965;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
ctl = intel_de_read(dev_priv, BLC_PWM_CTL);
|
2013-11-08 14:49:02 +00:00
|
|
|
panel->backlight.max = ctl >> 16;
|
2015-09-04 13:55:14 +00:00
|
|
|
|
|
|
|
if (!panel->backlight.max)
|
|
|
|
panel->backlight.max = get_backlight_max_vbt(connector);
|
2013-11-08 14:48:56 +00:00
|
|
|
|
|
|
|
if (!panel->backlight.max)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2015-09-04 13:55:14 +00:00
|
|
|
if (panel->backlight.combination_mode)
|
|
|
|
panel->backlight.max *= 0xff;
|
|
|
|
|
2014-06-24 15:27:40 +00:00
|
|
|
panel->backlight.min = get_backlight_min_vbt(connector);
|
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
val = i9xx_get_backlight(connector);
|
2016-08-23 08:10:05 +00:00
|
|
|
val = intel_panel_compute_brightness(connector, val);
|
|
|
|
panel->backlight.level = clamp(val, panel->backlight.min,
|
|
|
|
panel->backlight.max);
|
2013-11-08 14:48:56 +00:00
|
|
|
|
2016-08-23 08:10:05 +00:00
|
|
|
panel->backlight.enabled = ctl2 & BLM_PWM_ENABLE;
|
2013-11-08 14:49:02 +00:00
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-07 09:16:02 +00:00
|
|
|
static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:48:56 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2013-11-08 14:49:02 +00:00
|
|
|
u32 ctl, ctl2, val;
|
2013-11-08 14:48:56 +00:00
|
|
|
|
drm/i915/display/panel: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is readily
available.
The conversion was done automatically with below coccinelle semantic
patch.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200128181603.27767-16-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 18:15:57 +00:00
|
|
|
if (drm_WARN_ON(&dev_priv->drm, pipe != PIPE_A && pipe != PIPE_B))
|
2014-11-07 09:16:02 +00:00
|
|
|
return -ENODEV;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
ctl2 = intel_de_read(dev_priv, VLV_BLC_PWM_CTL2(pipe));
|
2013-11-08 14:49:02 +00:00
|
|
|
panel->backlight.active_low_pwm = ctl2 & BLM_POLARITY_I965;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
ctl = intel_de_read(dev_priv, VLV_BLC_PWM_CTL(pipe));
|
2013-11-08 14:49:02 +00:00
|
|
|
panel->backlight.max = ctl >> 16;
|
2015-09-04 13:55:14 +00:00
|
|
|
|
|
|
|
if (!panel->backlight.max)
|
|
|
|
panel->backlight.max = get_backlight_max_vbt(connector);
|
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
if (!panel->backlight.max)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2014-06-24 15:27:40 +00:00
|
|
|
panel->backlight.min = get_backlight_min_vbt(connector);
|
|
|
|
|
2015-12-18 08:51:35 +00:00
|
|
|
val = _vlv_get_backlight(dev_priv, pipe);
|
2016-08-23 08:10:05 +00:00
|
|
|
val = intel_panel_compute_brightness(connector, val);
|
|
|
|
panel->backlight.level = clamp(val, panel->backlight.min,
|
|
|
|
panel->backlight.max);
|
2013-11-08 14:48:56 +00:00
|
|
|
|
2016-08-23 08:10:05 +00:00
|
|
|
panel->backlight.enabled = ctl2 & BLM_PWM_ENABLE;
|
2013-11-08 14:49:02 +00:00
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-05-05 09:21:56 +00:00
|
|
|
static int
|
|
|
|
bxt_setup_backlight(struct intel_connector *connector, enum pipe unused)
|
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2015-05-05 09:21:56 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
u32 pwm_ctl, val;
|
|
|
|
|
2016-12-08 09:26:18 +00:00
|
|
|
panel->backlight.controller = dev_priv->vbt.backlight.controller;
|
2015-05-05 09:21:56 +00:00
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
pwm_ctl = intel_de_read(dev_priv,
|
|
|
|
BXT_BLC_PWM_CTL(panel->backlight.controller));
|
2015-09-30 17:04:57 +00:00
|
|
|
|
2016-12-08 09:26:18 +00:00
|
|
|
/* Controller 1 uses the utility pin. */
|
2015-09-30 17:04:57 +00:00
|
|
|
if (panel->backlight.controller == 1) {
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
val = intel_de_read(dev_priv, UTIL_PIN_CTL);
|
2015-09-30 17:04:57 +00:00
|
|
|
panel->backlight.util_pin_active_low =
|
|
|
|
val & UTIL_PIN_POLARITY;
|
|
|
|
}
|
|
|
|
|
|
|
|
panel->backlight.active_low_pwm = pwm_ctl & BXT_BLC_PWM_POLARITY;
|
|
|
|
panel->backlight.max =
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_read(dev_priv,
|
|
|
|
BXT_BLC_PWM_FREQ(panel->backlight.controller));
|
2015-09-04 13:55:14 +00:00
|
|
|
|
|
|
|
if (!panel->backlight.max)
|
|
|
|
panel->backlight.max = get_backlight_max_vbt(connector);
|
|
|
|
|
2015-05-05 09:21:56 +00:00
|
|
|
if (!panel->backlight.max)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2017-09-12 03:36:30 +00:00
|
|
|
panel->backlight.min = get_backlight_min_vbt(connector);
|
|
|
|
|
2015-05-05 09:21:56 +00:00
|
|
|
val = bxt_get_backlight(connector);
|
2016-08-23 08:10:05 +00:00
|
|
|
val = intel_panel_compute_brightness(connector, val);
|
|
|
|
panel->backlight.level = clamp(val, panel->backlight.min,
|
|
|
|
panel->backlight.max);
|
2015-05-05 09:21:56 +00:00
|
|
|
|
2016-08-23 08:10:05 +00:00
|
|
|
panel->backlight.enabled = pwm_ctl & BXT_BLC_PWM_ENABLE;
|
2015-05-05 09:21:56 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-06-02 20:06:42 +00:00
|
|
|
static int
|
|
|
|
cnp_setup_backlight(struct intel_connector *connector, enum pipe unused)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
u32 pwm_ctl, val;
|
|
|
|
|
|
|
|
/*
|
2018-01-19 18:48:12 +00:00
|
|
|
* CNP has the BXT implementation of backlight, but with only one
|
|
|
|
* controller. TODO: ICP has multiple controllers but we only use
|
|
|
|
* controller 0 for now.
|
2017-06-02 20:06:42 +00:00
|
|
|
*/
|
|
|
|
panel->backlight.controller = 0;
|
|
|
|
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
pwm_ctl = intel_de_read(dev_priv,
|
|
|
|
BXT_BLC_PWM_CTL(panel->backlight.controller));
|
2017-06-02 20:06:42 +00:00
|
|
|
|
|
|
|
panel->backlight.active_low_pwm = pwm_ctl & BXT_BLC_PWM_POLARITY;
|
|
|
|
panel->backlight.max =
|
drm/i915/panel: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efd117ff0a63ef6ec1a4514f2ee133ca33b3f0a0.1579871655.git.jani.nikula@intel.com
2020-01-24 13:25:45 +00:00
|
|
|
intel_de_read(dev_priv,
|
|
|
|
BXT_BLC_PWM_FREQ(panel->backlight.controller));
|
2017-06-02 20:06:42 +00:00
|
|
|
|
|
|
|
if (!panel->backlight.max)
|
|
|
|
panel->backlight.max = get_backlight_max_vbt(connector);
|
|
|
|
|
|
|
|
if (!panel->backlight.max)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2017-09-13 05:19:20 +00:00
|
|
|
panel->backlight.min = get_backlight_min_vbt(connector);
|
|
|
|
|
2017-06-02 20:06:42 +00:00
|
|
|
val = bxt_get_backlight(connector);
|
|
|
|
val = intel_panel_compute_brightness(connector, val);
|
|
|
|
panel->backlight.level = clamp(val, panel->backlight.min,
|
|
|
|
panel->backlight.max);
|
|
|
|
|
|
|
|
panel->backlight.enabled = pwm_ctl & BXT_BLC_PWM_ENABLE;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-06-26 09:02:10 +00:00
|
|
|
static int pwm_setup_backlight(struct intel_connector *connector,
|
|
|
|
enum pipe pipe)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = connector->base.dev;
|
2019-12-16 20:29:06 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2015-06-26 09:02:10 +00:00
|
|
|
struct intel_panel *panel = &connector->panel;
|
2019-12-16 20:29:06 +00:00
|
|
|
const char *desc;
|
2020-02-21 17:29:26 +00:00
|
|
|
u32 level, ns;
|
2015-06-26 09:02:10 +00:00
|
|
|
int retval;
|
|
|
|
|
2019-12-16 20:29:06 +00:00
|
|
|
/* Get the right PWM chip for DSI backlight according to VBT */
|
|
|
|
if (dev_priv->vbt.dsi.config->pwm_blc == PPS_BLC_PMIC) {
|
|
|
|
panel->backlight.pwm = pwm_get(dev->dev, "pwm_pmic_backlight");
|
|
|
|
desc = "PMIC";
|
|
|
|
} else {
|
|
|
|
panel->backlight.pwm = pwm_get(dev->dev, "pwm_soc_backlight");
|
|
|
|
desc = "SoC";
|
|
|
|
}
|
|
|
|
|
2015-06-26 09:02:10 +00:00
|
|
|
if (IS_ERR(panel->backlight.pwm)) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_err(&dev_priv->drm, "Failed to get the %s PWM chip\n",
|
|
|
|
desc);
|
2015-06-26 09:02:10 +00:00
|
|
|
panel->backlight.pwm = NULL;
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
2016-04-14 19:17:35 +00:00
|
|
|
/*
|
|
|
|
* FIXME: pwm_apply_args() should be removed when switching to
|
|
|
|
* the atomic PWM API.
|
|
|
|
*/
|
|
|
|
pwm_apply_args(panel->backlight.pwm);
|
|
|
|
|
2020-02-21 17:29:26 +00:00
|
|
|
panel->backlight.min = 0; /* 0% */
|
|
|
|
panel->backlight.max = 100; /* 100% */
|
|
|
|
level = intel_panel_compute_brightness(connector, 100);
|
|
|
|
ns = DIV_ROUND_UP(level * CRC_PMIC_PWM_PERIOD_NS, 100);
|
|
|
|
|
|
|
|
retval = pwm_config(panel->backlight.pwm, ns, CRC_PMIC_PWM_PERIOD_NS);
|
2015-06-26 09:02:10 +00:00
|
|
|
if (retval < 0) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_err(&dev_priv->drm, "Failed to configure the pwm chip\n");
|
2015-06-26 09:02:10 +00:00
|
|
|
pwm_put(panel->backlight.pwm);
|
|
|
|
panel->backlight.pwm = NULL;
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2020-06-02 22:31:05 +00:00
|
|
|
level = DIV_ROUND_UP_ULL(pwm_get_duty_cycle(panel->backlight.pwm) * 100,
|
2020-02-21 17:29:26 +00:00
|
|
|
CRC_PMIC_PWM_PERIOD_NS);
|
|
|
|
panel->backlight.level =
|
|
|
|
intel_panel_compute_brightness(connector, level);
|
2015-06-26 09:02:10 +00:00
|
|
|
panel->backlight.enabled = panel->backlight.level != 0;
|
|
|
|
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_info(&dev_priv->drm, "Using %s PWM for LCD backlight control\n",
|
|
|
|
desc);
|
2015-06-26 09:02:10 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
void intel_panel_update_backlight(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2019-01-08 16:08:38 +00:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
|
|
|
{
|
|
|
|
struct intel_connector *connector = to_intel_connector(conn_state->connector);
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
struct intel_panel *panel = &connector->panel;
|
|
|
|
|
|
|
|
if (!panel->backlight.present)
|
|
|
|
return;
|
|
|
|
|
|
|
|
mutex_lock(&dev_priv->backlight_lock);
|
|
|
|
if (!panel->backlight.enabled)
|
|
|
|
__intel_panel_enable_backlight(crtc_state, conn_state);
|
|
|
|
|
|
|
|
mutex_unlock(&dev_priv->backlight_lock);
|
|
|
|
}
|
|
|
|
|
2014-11-07 09:16:02 +00:00
|
|
|
int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe)
|
2011-08-12 10:11:33 +00:00
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
2013-11-08 14:48:53 +00:00
|
|
|
struct intel_connector *intel_connector = to_intel_connector(connector);
|
2013-11-08 14:48:54 +00:00
|
|
|
struct intel_panel *panel = &intel_connector->panel;
|
2013-11-08 14:48:56 +00:00
|
|
|
int ret;
|
2013-11-08 14:48:53 +00:00
|
|
|
|
2014-04-09 08:31:37 +00:00
|
|
|
if (!dev_priv->vbt.backlight.present) {
|
2014-07-03 23:27:50 +00:00
|
|
|
if (dev_priv->quirks & QUIRK_BACKLIGHT_PRESENT) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"no backlight present per VBT, but present per quirk\n");
|
2014-07-03 23:27:50 +00:00
|
|
|
} else {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"no backlight present per VBT\n");
|
2014-07-03 23:27:50 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2014-04-09 08:31:37 +00:00
|
|
|
}
|
|
|
|
|
2015-09-14 11:03:48 +00:00
|
|
|
/* ensure intel_panel has been initialized first */
|
drm/i915/display/panel: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is readily
available.
The conversion was done automatically with below coccinelle semantic
patch.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200128181603.27767-16-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 18:15:57 +00:00
|
|
|
if (drm_WARN_ON(&dev_priv->drm, !panel->backlight.setup))
|
2015-09-14 11:03:48 +00:00
|
|
|
return -ENODEV;
|
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
/* set level and max in panel struct */
|
2014-09-15 12:35:09 +00:00
|
|
|
mutex_lock(&dev_priv->backlight_lock);
|
2015-09-14 11:03:48 +00:00
|
|
|
ret = panel->backlight.setup(intel_connector, pipe);
|
2014-09-15 12:35:09 +00:00
|
|
|
mutex_unlock(&dev_priv->backlight_lock);
|
2013-11-08 14:48:56 +00:00
|
|
|
|
|
|
|
if (ret) {
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"failed to setup backlight for connector %s\n",
|
|
|
|
connector->name);
|
2013-11-08 14:48:56 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2013-11-08 14:48:53 +00:00
|
|
|
|
2013-11-08 14:48:55 +00:00
|
|
|
panel->backlight.present = true;
|
|
|
|
|
drm/i915/panel: automatic conversion to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_panel.c
using the following coccinelle script that transforms based on the
existence of a struct drm_i915_private device pointer:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-13-wambui.karugax@gmail.com
2020-01-30 08:32:29 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"Connector %s backlight initialized, %s, brightness %u/%u\n",
|
|
|
|
connector->name,
|
|
|
|
enableddisabled(panel->backlight.enabled),
|
|
|
|
panel->backlight.level, panel->backlight.max);
|
2013-11-08 14:49:01 +00:00
|
|
|
|
2011-08-12 10:11:33 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-10-08 13:46:40 +00:00
|
|
|
static void intel_panel_destroy_backlight(struct intel_panel *panel)
|
2011-08-12 10:11:33 +00:00
|
|
|
{
|
2015-06-26 09:02:10 +00:00
|
|
|
/* dispose of the pwm */
|
|
|
|
if (panel->backlight.pwm)
|
|
|
|
pwm_put(panel->backlight.pwm);
|
|
|
|
|
2013-11-08 14:48:55 +00:00
|
|
|
panel->backlight.present = false;
|
2011-08-12 10:11:33 +00:00
|
|
|
}
|
2012-10-19 11:51:49 +00:00
|
|
|
|
2013-11-08 14:48:56 +00:00
|
|
|
/* Set up chip specific backlight functions */
|
2015-09-14 11:03:48 +00:00
|
|
|
static void
|
|
|
|
intel_panel_init_backlight_funcs(struct intel_panel *panel)
|
2013-11-08 14:48:56 +00:00
|
|
|
{
|
2015-12-18 08:51:35 +00:00
|
|
|
struct intel_connector *connector =
|
2015-09-14 11:03:48 +00:00
|
|
|
container_of(panel, struct intel_connector, panel);
|
2015-12-18 08:51:35 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2013-11-08 14:48:56 +00:00
|
|
|
|
2016-04-05 14:10:52 +00:00
|
|
|
if (connector->base.connector_type == DRM_MODE_CONNECTOR_eDP &&
|
|
|
|
intel_dp_aux_init_backlight_funcs(connector) == 0)
|
|
|
|
return;
|
|
|
|
|
2016-04-26 13:14:25 +00:00
|
|
|
if (connector->base.connector_type == DRM_MODE_CONNECTOR_DSI &&
|
|
|
|
intel_dsi_dcs_init_backlight_funcs(connector) == 0)
|
|
|
|
return;
|
|
|
|
|
2016-12-02 08:23:49 +00:00
|
|
|
if (IS_GEN9_LP(dev_priv)) {
|
2015-09-14 11:03:48 +00:00
|
|
|
panel->backlight.setup = bxt_setup_backlight;
|
|
|
|
panel->backlight.enable = bxt_enable_backlight;
|
|
|
|
panel->backlight.disable = bxt_disable_backlight;
|
|
|
|
panel->backlight.set = bxt_set_backlight;
|
|
|
|
panel->backlight.get = bxt_get_backlight;
|
2015-12-01 08:23:50 +00:00
|
|
|
panel->backlight.hz_to_pwm = bxt_hz_to_pwm;
|
2019-03-08 21:43:00 +00:00
|
|
|
} else if (INTEL_PCH_TYPE(dev_priv) >= PCH_CNP) {
|
2017-06-02 20:06:42 +00:00
|
|
|
panel->backlight.setup = cnp_setup_backlight;
|
|
|
|
panel->backlight.enable = cnp_enable_backlight;
|
|
|
|
panel->backlight.disable = cnp_disable_backlight;
|
|
|
|
panel->backlight.set = bxt_set_backlight;
|
|
|
|
panel->backlight.get = bxt_get_backlight;
|
|
|
|
panel->backlight.hz_to_pwm = cnp_hz_to_pwm;
|
2019-03-08 21:43:00 +00:00
|
|
|
} else if (INTEL_PCH_TYPE(dev_priv) >= PCH_LPT) {
|
2015-09-14 11:03:48 +00:00
|
|
|
panel->backlight.setup = lpt_setup_backlight;
|
|
|
|
panel->backlight.enable = lpt_enable_backlight;
|
|
|
|
panel->backlight.disable = lpt_disable_backlight;
|
|
|
|
panel->backlight.set = lpt_set_backlight;
|
|
|
|
panel->backlight.get = lpt_get_backlight;
|
2015-12-18 08:51:35 +00:00
|
|
|
if (HAS_PCH_LPT(dev_priv))
|
2015-09-14 11:03:48 +00:00
|
|
|
panel->backlight.hz_to_pwm = lpt_hz_to_pwm;
|
2015-09-04 13:55:14 +00:00
|
|
|
else
|
2015-09-14 11:03:48 +00:00
|
|
|
panel->backlight.hz_to_pwm = spt_hz_to_pwm;
|
2015-12-18 08:51:35 +00:00
|
|
|
} else if (HAS_PCH_SPLIT(dev_priv)) {
|
2015-09-14 11:03:48 +00:00
|
|
|
panel->backlight.setup = pch_setup_backlight;
|
|
|
|
panel->backlight.enable = pch_enable_backlight;
|
|
|
|
panel->backlight.disable = pch_disable_backlight;
|
|
|
|
panel->backlight.set = pch_set_backlight;
|
|
|
|
panel->backlight.get = pch_get_backlight;
|
|
|
|
panel->backlight.hz_to_pwm = pch_hz_to_pwm;
|
2015-12-18 08:51:35 +00:00
|
|
|
} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
|
2016-03-16 10:43:33 +00:00
|
|
|
if (connector->base.connector_type == DRM_MODE_CONNECTOR_DSI) {
|
2015-09-14 11:03:48 +00:00
|
|
|
panel->backlight.setup = pwm_setup_backlight;
|
|
|
|
panel->backlight.enable = pwm_enable_backlight;
|
|
|
|
panel->backlight.disable = pwm_disable_backlight;
|
|
|
|
panel->backlight.set = pwm_set_backlight;
|
|
|
|
panel->backlight.get = pwm_get_backlight;
|
2015-06-26 09:02:10 +00:00
|
|
|
} else {
|
2015-09-14 11:03:48 +00:00
|
|
|
panel->backlight.setup = vlv_setup_backlight;
|
|
|
|
panel->backlight.enable = vlv_enable_backlight;
|
|
|
|
panel->backlight.disable = vlv_disable_backlight;
|
|
|
|
panel->backlight.set = vlv_set_backlight;
|
|
|
|
panel->backlight.get = vlv_get_backlight;
|
|
|
|
panel->backlight.hz_to_pwm = vlv_hz_to_pwm;
|
2015-06-26 09:02:10 +00:00
|
|
|
}
|
drm/i915: replace IS_GEN<N> with IS_GEN(..., N)
Define IS_GEN() similarly to our IS_GEN_RANGE(). but use gen instead of
gen_mask to do the comparison. Now callers can pass then gen as a parameter,
so we don't require one macro for each gen.
The following spatch was used to convert the users of these macros:
@@
expression e;
@@
(
- IS_GEN2(e)
+ IS_GEN(e, 2)
|
- IS_GEN3(e)
+ IS_GEN(e, 3)
|
- IS_GEN4(e)
+ IS_GEN(e, 4)
|
- IS_GEN5(e)
+ IS_GEN(e, 5)
|
- IS_GEN6(e)
+ IS_GEN(e, 6)
|
- IS_GEN7(e)
+ IS_GEN(e, 7)
|
- IS_GEN8(e)
+ IS_GEN(e, 8)
|
- IS_GEN9(e)
+ IS_GEN(e, 9)
|
- IS_GEN10(e)
+ IS_GEN(e, 10)
|
- IS_GEN11(e)
+ IS_GEN(e, 11)
)
v2: use IS_GEN rather than GT_GEN and compare to info.gen rather than
using the bitmask
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212181044.15886-2-lucas.demarchi@intel.com
2018-12-12 18:10:43 +00:00
|
|
|
} else if (IS_GEN(dev_priv, 4)) {
|
2015-09-14 11:03:48 +00:00
|
|
|
panel->backlight.setup = i965_setup_backlight;
|
|
|
|
panel->backlight.enable = i965_enable_backlight;
|
|
|
|
panel->backlight.disable = i965_disable_backlight;
|
|
|
|
panel->backlight.set = i9xx_set_backlight;
|
|
|
|
panel->backlight.get = i9xx_get_backlight;
|
|
|
|
panel->backlight.hz_to_pwm = i965_hz_to_pwm;
|
2013-11-08 14:48:56 +00:00
|
|
|
} else {
|
2015-09-14 11:03:48 +00:00
|
|
|
panel->backlight.setup = i9xx_setup_backlight;
|
|
|
|
panel->backlight.enable = i9xx_enable_backlight;
|
|
|
|
panel->backlight.disable = i9xx_disable_backlight;
|
|
|
|
panel->backlight.set = i9xx_set_backlight;
|
|
|
|
panel->backlight.get = i9xx_get_backlight;
|
|
|
|
panel->backlight.hz_to_pwm = i9xx_hz_to_pwm;
|
2013-11-08 14:48:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-19 11:51:50 +00:00
|
|
|
int intel_panel_init(struct intel_panel *panel,
|
2014-02-11 08:56:36 +00:00
|
|
|
struct drm_display_mode *fixed_mode,
|
|
|
|
struct drm_display_mode *downclock_mode)
|
2012-10-19 11:51:49 +00:00
|
|
|
{
|
2015-09-14 11:03:48 +00:00
|
|
|
intel_panel_init_backlight_funcs(panel);
|
|
|
|
|
2012-10-19 11:51:50 +00:00
|
|
|
panel->fixed_mode = fixed_mode;
|
2014-02-11 08:56:36 +00:00
|
|
|
panel->downclock_mode = downclock_mode;
|
2012-10-19 11:51:50 +00:00
|
|
|
|
2012-10-19 11:51:49 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void intel_panel_fini(struct intel_panel *panel)
|
|
|
|
{
|
2012-10-19 11:51:50 +00:00
|
|
|
struct intel_connector *intel_connector =
|
|
|
|
container_of(panel, struct intel_connector, panel);
|
|
|
|
|
2018-10-08 13:46:40 +00:00
|
|
|
intel_panel_destroy_backlight(panel);
|
|
|
|
|
2012-10-19 11:51:50 +00:00
|
|
|
if (panel->fixed_mode)
|
|
|
|
drm_mode_destroy(intel_connector->base.dev, panel->fixed_mode);
|
2013-12-10 08:07:36 +00:00
|
|
|
|
|
|
|
if (panel->downclock_mode)
|
|
|
|
drm_mode_destroy(intel_connector->base.dev,
|
|
|
|
panel->downclock_mode);
|
2012-10-19 11:51:49 +00:00
|
|
|
}
|