* [PATCH] drm/i915/backlight: prefer dev_priv over dev pointer
@ 2015-12-18 8:51 Jani Nikula
2015-12-18 9:03 ` Mika Kuoppala
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Jani Nikula @ 2015-12-18 8:51 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Use dev_priv rather than dev pointer where applicable. Remove plenty of
unnecessary temp variables. No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_panel.c | 156 ++++++++++++++-----------------------
1 file changed, 58 insertions(+), 98 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index f5b4c98de608..21ee6477bf98 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -461,8 +461,7 @@ static inline u32 scale_hw_to_user(struct intel_connector *connector,
static u32 intel_panel_compute_brightness(struct intel_connector *connector,
u32 val)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
WARN_ON(panel->backlight.max == 0);
@@ -480,45 +479,40 @@ static u32 intel_panel_compute_brightness(struct intel_connector *connector,
static u32 lpt_get_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
return I915_READ(BLC_PWM_PCH_CTL2) & BACKLIGHT_DUTY_CYCLE_MASK;
}
static u32 pch_get_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
return I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
}
static u32 i9xx_get_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u32 val;
val = I915_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
- if (INTEL_INFO(dev)->gen < 4)
+ if (INTEL_INFO(dev_priv)->gen < 4)
val >>= 1;
if (panel->backlight.combination_mode) {
u8 lbpc;
- pci_read_config_byte(dev->pdev, PCI_LBPC, &lbpc);
+ pci_read_config_byte(dev_priv->dev->pdev, PCI_LBPC, &lbpc);
val *= lbpc;
}
return val;
}
-static u32 _vlv_get_backlight(struct drm_device *dev, enum pipe pipe)
+static u32 _vlv_get_backlight(struct drm_i915_private *dev_priv, enum pipe pipe)
{
- struct drm_i915_private *dev_priv = dev->dev_private;
-
if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))
return 0;
@@ -527,17 +521,16 @@ static u32 _vlv_get_backlight(struct drm_device *dev, enum pipe pipe)
static u32 vlv_get_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
enum pipe pipe = intel_get_pipe_from_connector(connector);
- return _vlv_get_backlight(dev, pipe);
+ return _vlv_get_backlight(dev_priv, pipe);
}
static u32 bxt_get_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
- struct drm_i915_private *dev_priv = dev->dev_private;
return I915_READ(BXT_BLC_PWM_DUTY(panel->backlight.controller));
}
@@ -553,8 +546,7 @@ static u32 pwm_get_backlight(struct intel_connector *connector)
static u32 intel_panel_get_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u32 val = 0;
@@ -573,16 +565,14 @@ static u32 intel_panel_get_backlight(struct intel_connector *connector)
static void lpt_set_backlight(struct intel_connector *connector, u32 level)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
u32 val = I915_READ(BLC_PWM_PCH_CTL2) & ~BACKLIGHT_DUTY_CYCLE_MASK;
I915_WRITE(BLC_PWM_PCH_CTL2, val | level);
}
static void pch_set_backlight(struct intel_connector *connector, u32 level)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
u32 tmp;
tmp = I915_READ(BLC_PWM_CPU_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK;
@@ -591,8 +581,7 @@ static void pch_set_backlight(struct intel_connector *connector, u32 level)
static void i9xx_set_backlight(struct intel_connector *connector, u32 level)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u32 tmp, mask;
@@ -603,10 +592,10 @@ static void i9xx_set_backlight(struct intel_connector *connector, u32 level)
lbpc = level * 0xfe / panel->backlight.max + 1;
level /= lbpc;
- pci_write_config_byte(dev->pdev, PCI_LBPC, lbpc);
+ pci_write_config_byte(dev_priv->dev->pdev, PCI_LBPC, lbpc);
}
- if (IS_GEN4(dev)) {
+ if (IS_GEN4(dev_priv)) {
mask = BACKLIGHT_DUTY_CYCLE_MASK;
} else {
level <<= 1;
@@ -619,8 +608,7 @@ static void i9xx_set_backlight(struct intel_connector *connector, u32 level)
static void vlv_set_backlight(struct intel_connector *connector, u32 level)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
enum pipe pipe = intel_get_pipe_from_connector(connector);
u32 tmp;
@@ -633,8 +621,7 @@ static void vlv_set_backlight(struct intel_connector *connector, u32 level)
static void bxt_set_backlight(struct intel_connector *connector, u32 level)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
I915_WRITE(BXT_BLC_PWM_DUTY(panel->backlight.controller), level);
@@ -663,8 +650,7 @@ intel_panel_actually_set_backlight(struct intel_connector *connector, u32 level)
static void intel_panel_set_backlight(struct intel_connector *connector,
u32 user_level, u32 user_max)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u32 hw_level;
@@ -690,8 +676,7 @@ static void intel_panel_set_backlight(struct intel_connector *connector,
void intel_panel_set_backlight_acpi(struct intel_connector *connector,
u32 user_level, u32 user_max)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
enum pipe pipe = intel_get_pipe_from_connector(connector);
u32 hw_level;
@@ -726,8 +711,7 @@ void intel_panel_set_backlight_acpi(struct intel_connector *connector,
static void lpt_disable_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
u32 tmp;
intel_panel_actually_set_backlight(connector, 0);
@@ -752,8 +736,7 @@ static void lpt_disable_backlight(struct intel_connector *connector)
static void pch_disable_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
u32 tmp;
intel_panel_actually_set_backlight(connector, 0);
@@ -772,8 +755,7 @@ static void i9xx_disable_backlight(struct intel_connector *connector)
static void i965_disable_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
u32 tmp;
intel_panel_actually_set_backlight(connector, 0);
@@ -784,8 +766,7 @@ static void i965_disable_backlight(struct intel_connector *connector)
static void vlv_disable_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
enum pipe pipe = intel_get_pipe_from_connector(connector);
u32 tmp;
@@ -800,8 +781,7 @@ static void vlv_disable_backlight(struct intel_connector *connector)
static void bxt_disable_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u32 tmp, val;
@@ -830,8 +810,7 @@ static void pwm_disable_backlight(struct intel_connector *connector)
void intel_panel_disable_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
if (!panel->backlight.present)
@@ -843,7 +822,7 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
* backlight. This will leave the backlight on unnecessarily when
* another client is not activated.
*/
- if (dev->switch_power_state == DRM_SWITCH_POWER_CHANGING) {
+ if (dev_priv->dev->switch_power_state == DRM_SWITCH_POWER_CHANGING) {
DRM_DEBUG_DRIVER("Skipping backlight disable on vga switch\n");
return;
}
@@ -860,8 +839,7 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
static void lpt_enable_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u32 pch_ctl1, pch_ctl2;
@@ -893,8 +871,7 @@ static void lpt_enable_backlight(struct intel_connector *connector)
static void pch_enable_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
enum pipe pipe = intel_get_pipe_from_connector(connector);
enum transcoder cpu_transcoder =
@@ -940,8 +917,7 @@ static void pch_enable_backlight(struct intel_connector *connector)
static void i9xx_enable_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u32 ctl, freq;
@@ -958,7 +934,7 @@ static void i9xx_enable_backlight(struct intel_connector *connector)
ctl = freq << 17;
if (panel->backlight.combination_mode)
ctl |= BLM_LEGACY_MODE;
- if (IS_PINEVIEW(dev) && panel->backlight.active_low_pwm)
+ if (IS_PINEVIEW(dev_priv) && panel->backlight.active_low_pwm)
ctl |= BLM_POLARITY_PNV;
I915_WRITE(BLC_PWM_CTL, ctl);
@@ -972,14 +948,13 @@ static void i9xx_enable_backlight(struct intel_connector *connector)
* 855gm only, but checking for gen2 is safe, as 855gm is the only gen2
* that has backlight.
*/
- if (IS_GEN2(dev))
+ if (IS_GEN2(dev_priv))
I915_WRITE(BLC_HIST_CTL, BLM_HISTOGRAM_ENABLE);
}
static void i965_enable_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
enum pipe pipe = intel_get_pipe_from_connector(connector);
u32 ctl, ctl2, freq;
@@ -1012,8 +987,7 @@ static void i965_enable_backlight(struct intel_connector *connector)
static void vlv_enable_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
enum pipe pipe = intel_get_pipe_from_connector(connector);
u32 ctl, ctl2;
@@ -1044,8 +1018,7 @@ static void vlv_enable_backlight(struct intel_connector *connector)
static void bxt_enable_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
enum pipe pipe = intel_get_pipe_from_connector(connector);
u32 pwm_ctl, val;
@@ -1102,8 +1075,7 @@ static void pwm_enable_backlight(struct intel_connector *connector)
void intel_panel_enable_backlight(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
enum pipe pipe = intel_get_pipe_from_connector(connector);
@@ -1278,8 +1250,7 @@ static u32 bxt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
*/
static u32 spt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
u32 mul, clock;
if (I915_READ(SOUTH_CHICKEN1) & SPT_PWM_GRANULARITY)
@@ -1299,8 +1270,7 @@ static u32 spt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
*/
static u32 lpt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
u32 mul, clock;
if (I915_READ(SOUTH_CHICKEN2) & LPT_PWM_GRANULARITY)
@@ -1393,8 +1363,7 @@ static u32 vlv_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
static u32 get_backlight_max_vbt(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u16 pwm_freq_hz = dev_priv->vbt.backlight.pwm_freq_hz;
u32 pwm;
@@ -1427,8 +1396,7 @@ static u32 get_backlight_max_vbt(struct intel_connector *connector)
*/
static u32 get_backlight_min_vbt(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
int min;
@@ -1453,8 +1421,7 @@ static u32 get_backlight_min_vbt(struct intel_connector *connector)
static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unused)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u32 pch_ctl1, pch_ctl2, val;
@@ -1483,8 +1450,7 @@ static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unus
static int pch_setup_backlight(struct intel_connector *connector, enum pipe unused)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u32 cpu_ctl2, pch_ctl1, pch_ctl2, val;
@@ -1514,17 +1480,16 @@ static int pch_setup_backlight(struct intel_connector *connector, enum pipe unus
static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unused)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u32 ctl, val;
ctl = I915_READ(BLC_PWM_CTL);
- if (IS_GEN2(dev) || IS_I915GM(dev) || IS_I945GM(dev))
+ if (IS_GEN2(dev_priv) || IS_I915GM(dev_priv) || IS_I945GM(dev_priv))
panel->backlight.combination_mode = ctl & BLM_LEGACY_MODE;
- if (IS_PINEVIEW(dev))
+ if (IS_PINEVIEW(dev_priv))
panel->backlight.active_low_pwm = ctl & BLM_POLARITY_PNV;
panel->backlight.max = ctl >> 17;
@@ -1552,8 +1517,7 @@ static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unu
static int i965_setup_backlight(struct intel_connector *connector, enum pipe unused)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u32 ctl, ctl2, val;
@@ -1586,8 +1550,7 @@ static int i965_setup_backlight(struct intel_connector *connector, enum pipe unu
static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u32 ctl, ctl2, val;
@@ -1608,7 +1571,7 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe
panel->backlight.min = get_backlight_min_vbt(connector);
- val = _vlv_get_backlight(dev, pipe);
+ val = _vlv_get_backlight(dev_priv, pipe);
panel->backlight.level = intel_panel_compute_brightness(connector, val);
panel->backlight.enabled = (ctl2 & BLM_PWM_ENABLE) &&
@@ -1620,8 +1583,7 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe
static int
bxt_setup_backlight(struct intel_connector *connector, enum pipe unused)
{
- struct drm_device *dev = connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel;
u32 pwm_ctl, val;
@@ -1699,8 +1661,7 @@ static int pwm_setup_backlight(struct intel_connector *connector,
int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe)
{
- struct drm_device *dev = connector->dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->dev);
struct intel_connector *intel_connector = to_intel_connector(connector);
struct intel_panel *panel = &intel_connector->panel;
int ret;
@@ -1755,36 +1716,35 @@ void intel_panel_destroy_backlight(struct drm_connector *connector)
static void
intel_panel_init_backlight_funcs(struct intel_panel *panel)
{
- struct intel_connector *intel_connector =
+ struct intel_connector *connector =
container_of(panel, struct intel_connector, panel);
- struct drm_device *dev = intel_connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- if (IS_BROXTON(dev)) {
+ if (IS_BROXTON(dev_priv)) {
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;
panel->backlight.hz_to_pwm = bxt_hz_to_pwm;
- } else if (HAS_PCH_LPT(dev) || HAS_PCH_SPT(dev)) {
+ } else if (HAS_PCH_LPT(dev_priv) || HAS_PCH_SPT(dev_priv)) {
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;
- if (HAS_PCH_LPT(dev))
+ if (HAS_PCH_LPT(dev_priv))
panel->backlight.hz_to_pwm = lpt_hz_to_pwm;
else
panel->backlight.hz_to_pwm = spt_hz_to_pwm;
- } else if (HAS_PCH_SPLIT(dev)) {
+ } else if (HAS_PCH_SPLIT(dev_priv)) {
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;
- } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
+ } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
if (dev_priv->vbt.has_mipi) {
panel->backlight.setup = pwm_setup_backlight;
panel->backlight.enable = pwm_enable_backlight;
@@ -1799,7 +1759,7 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)
panel->backlight.get = vlv_get_backlight;
panel->backlight.hz_to_pwm = vlv_hz_to_pwm;
}
- } else if (IS_GEN4(dev)) {
+ } else if (IS_GEN4(dev_priv)) {
panel->backlight.setup = i965_setup_backlight;
panel->backlight.enable = i965_enable_backlight;
panel->backlight.disable = i965_disable_backlight;
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915/backlight: prefer dev_priv over dev pointer
2015-12-18 8:51 [PATCH] drm/i915/backlight: prefer dev_priv over dev pointer Jani Nikula
@ 2015-12-18 9:03 ` Mika Kuoppala
2015-12-18 9:43 ` Jani Nikula
2015-12-18 9:10 ` Chris Wilson
2015-12-18 9:49 ` ✗ warning: Fi.CI.BAT Patchwork
2 siblings, 1 reply; 7+ messages in thread
From: Mika Kuoppala @ 2015-12-18 9:03 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Jani Nikula <jani.nikula@intel.com> writes:
> Use dev_priv rather than dev pointer where applicable. Remove plenty of
> unnecessary temp variables. No functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
> ---
> drivers/gpu/drm/i915/intel_panel.c | 156 ++++++++++++++-----------------------
> 1 file changed, 58 insertions(+), 98 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index f5b4c98de608..21ee6477bf98 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -461,8 +461,7 @@ static inline u32 scale_hw_to_user(struct intel_connector *connector,
> static u32 intel_panel_compute_brightness(struct intel_connector *connector,
> u32 val)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
>
> WARN_ON(panel->backlight.max == 0);
> @@ -480,45 +479,40 @@ static u32 intel_panel_compute_brightness(struct intel_connector *connector,
>
> static u32 lpt_get_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>
> return I915_READ(BLC_PWM_PCH_CTL2) & BACKLIGHT_DUTY_CYCLE_MASK;
> }
>
> static u32 pch_get_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>
> return I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
> }
>
> static u32 i9xx_get_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 val;
>
> val = I915_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
> - if (INTEL_INFO(dev)->gen < 4)
> + if (INTEL_INFO(dev_priv)->gen < 4)
> val >>= 1;
>
> if (panel->backlight.combination_mode) {
> u8 lbpc;
>
> - pci_read_config_byte(dev->pdev, PCI_LBPC, &lbpc);
> + pci_read_config_byte(dev_priv->dev->pdev, PCI_LBPC, &lbpc);
> val *= lbpc;
> }
>
> return val;
> }
>
> -static u32 _vlv_get_backlight(struct drm_device *dev, enum pipe pipe)
> +static u32 _vlv_get_backlight(struct drm_i915_private *dev_priv, enum pipe pipe)
> {
> - struct drm_i915_private *dev_priv = dev->dev_private;
> -
> if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))
> return 0;
>
> @@ -527,17 +521,16 @@ static u32 _vlv_get_backlight(struct drm_device *dev, enum pipe pipe)
>
> static u32 vlv_get_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> enum pipe pipe = intel_get_pipe_from_connector(connector);
>
> - return _vlv_get_backlight(dev, pipe);
> + return _vlv_get_backlight(dev_priv, pipe);
> }
>
> static u32 bxt_get_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> - struct drm_i915_private *dev_priv = dev->dev_private;
>
> return I915_READ(BXT_BLC_PWM_DUTY(panel->backlight.controller));
> }
> @@ -553,8 +546,7 @@ static u32 pwm_get_backlight(struct intel_connector *connector)
>
> static u32 intel_panel_get_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 val = 0;
>
> @@ -573,16 +565,14 @@ static u32 intel_panel_get_backlight(struct intel_connector *connector)
>
> static void lpt_set_backlight(struct intel_connector *connector, u32 level)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> u32 val = I915_READ(BLC_PWM_PCH_CTL2) & ~BACKLIGHT_DUTY_CYCLE_MASK;
> I915_WRITE(BLC_PWM_PCH_CTL2, val | level);
> }
>
> static void pch_set_backlight(struct intel_connector *connector, u32 level)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> u32 tmp;
>
> tmp = I915_READ(BLC_PWM_CPU_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK;
> @@ -591,8 +581,7 @@ static void pch_set_backlight(struct intel_connector *connector, u32 level)
>
> static void i9xx_set_backlight(struct intel_connector *connector, u32 level)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 tmp, mask;
>
> @@ -603,10 +592,10 @@ static void i9xx_set_backlight(struct intel_connector *connector, u32 level)
>
> lbpc = level * 0xfe / panel->backlight.max + 1;
> level /= lbpc;
> - pci_write_config_byte(dev->pdev, PCI_LBPC, lbpc);
> + pci_write_config_byte(dev_priv->dev->pdev, PCI_LBPC, lbpc);
> }
>
> - if (IS_GEN4(dev)) {
> + if (IS_GEN4(dev_priv)) {
> mask = BACKLIGHT_DUTY_CYCLE_MASK;
> } else {
> level <<= 1;
> @@ -619,8 +608,7 @@ static void i9xx_set_backlight(struct intel_connector *connector, u32 level)
>
> static void vlv_set_backlight(struct intel_connector *connector, u32 level)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> enum pipe pipe = intel_get_pipe_from_connector(connector);
> u32 tmp;
>
> @@ -633,8 +621,7 @@ static void vlv_set_backlight(struct intel_connector *connector, u32 level)
>
> static void bxt_set_backlight(struct intel_connector *connector, u32 level)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
>
> I915_WRITE(BXT_BLC_PWM_DUTY(panel->backlight.controller), level);
> @@ -663,8 +650,7 @@ intel_panel_actually_set_backlight(struct intel_connector *connector, u32 level)
> static void intel_panel_set_backlight(struct intel_connector *connector,
> u32 user_level, u32 user_max)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 hw_level;
>
> @@ -690,8 +676,7 @@ static void intel_panel_set_backlight(struct intel_connector *connector,
> void intel_panel_set_backlight_acpi(struct intel_connector *connector,
> u32 user_level, u32 user_max)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> enum pipe pipe = intel_get_pipe_from_connector(connector);
> u32 hw_level;
> @@ -726,8 +711,7 @@ void intel_panel_set_backlight_acpi(struct intel_connector *connector,
>
> static void lpt_disable_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> u32 tmp;
>
> intel_panel_actually_set_backlight(connector, 0);
> @@ -752,8 +736,7 @@ static void lpt_disable_backlight(struct intel_connector *connector)
>
> static void pch_disable_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> u32 tmp;
>
> intel_panel_actually_set_backlight(connector, 0);
> @@ -772,8 +755,7 @@ static void i9xx_disable_backlight(struct intel_connector *connector)
>
> static void i965_disable_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> u32 tmp;
>
> intel_panel_actually_set_backlight(connector, 0);
> @@ -784,8 +766,7 @@ static void i965_disable_backlight(struct intel_connector *connector)
>
> static void vlv_disable_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> enum pipe pipe = intel_get_pipe_from_connector(connector);
> u32 tmp;
>
> @@ -800,8 +781,7 @@ static void vlv_disable_backlight(struct intel_connector *connector)
>
> static void bxt_disable_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 tmp, val;
>
> @@ -830,8 +810,7 @@ static void pwm_disable_backlight(struct intel_connector *connector)
>
> void intel_panel_disable_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
>
> if (!panel->backlight.present)
> @@ -843,7 +822,7 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
> * backlight. This will leave the backlight on unnecessarily when
> * another client is not activated.
> */
> - if (dev->switch_power_state == DRM_SWITCH_POWER_CHANGING) {
> + if (dev_priv->dev->switch_power_state == DRM_SWITCH_POWER_CHANGING) {
> DRM_DEBUG_DRIVER("Skipping backlight disable on vga switch\n");
> return;
> }
> @@ -860,8 +839,7 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
>
> static void lpt_enable_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 pch_ctl1, pch_ctl2;
>
> @@ -893,8 +871,7 @@ static void lpt_enable_backlight(struct intel_connector *connector)
>
> static void pch_enable_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> enum pipe pipe = intel_get_pipe_from_connector(connector);
> enum transcoder cpu_transcoder =
> @@ -940,8 +917,7 @@ static void pch_enable_backlight(struct intel_connector *connector)
>
> static void i9xx_enable_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 ctl, freq;
>
> @@ -958,7 +934,7 @@ static void i9xx_enable_backlight(struct intel_connector *connector)
> ctl = freq << 17;
> if (panel->backlight.combination_mode)
> ctl |= BLM_LEGACY_MODE;
> - if (IS_PINEVIEW(dev) && panel->backlight.active_low_pwm)
> + if (IS_PINEVIEW(dev_priv) && panel->backlight.active_low_pwm)
> ctl |= BLM_POLARITY_PNV;
>
> I915_WRITE(BLC_PWM_CTL, ctl);
> @@ -972,14 +948,13 @@ static void i9xx_enable_backlight(struct intel_connector *connector)
> * 855gm only, but checking for gen2 is safe, as 855gm is the only gen2
> * that has backlight.
> */
> - if (IS_GEN2(dev))
> + if (IS_GEN2(dev_priv))
> I915_WRITE(BLC_HIST_CTL, BLM_HISTOGRAM_ENABLE);
> }
>
> static void i965_enable_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> enum pipe pipe = intel_get_pipe_from_connector(connector);
> u32 ctl, ctl2, freq;
> @@ -1012,8 +987,7 @@ static void i965_enable_backlight(struct intel_connector *connector)
>
> static void vlv_enable_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> enum pipe pipe = intel_get_pipe_from_connector(connector);
> u32 ctl, ctl2;
> @@ -1044,8 +1018,7 @@ static void vlv_enable_backlight(struct intel_connector *connector)
>
> static void bxt_enable_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> enum pipe pipe = intel_get_pipe_from_connector(connector);
> u32 pwm_ctl, val;
> @@ -1102,8 +1075,7 @@ static void pwm_enable_backlight(struct intel_connector *connector)
>
> void intel_panel_enable_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> enum pipe pipe = intel_get_pipe_from_connector(connector);
>
> @@ -1278,8 +1250,7 @@ static u32 bxt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
> */
> static u32 spt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> u32 mul, clock;
>
> if (I915_READ(SOUTH_CHICKEN1) & SPT_PWM_GRANULARITY)
> @@ -1299,8 +1270,7 @@ static u32 spt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
> */
> static u32 lpt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> u32 mul, clock;
>
> if (I915_READ(SOUTH_CHICKEN2) & LPT_PWM_GRANULARITY)
> @@ -1393,8 +1363,7 @@ static u32 vlv_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
>
> static u32 get_backlight_max_vbt(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u16 pwm_freq_hz = dev_priv->vbt.backlight.pwm_freq_hz;
> u32 pwm;
> @@ -1427,8 +1396,7 @@ static u32 get_backlight_max_vbt(struct intel_connector *connector)
> */
> static u32 get_backlight_min_vbt(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> int min;
>
> @@ -1453,8 +1421,7 @@ static u32 get_backlight_min_vbt(struct intel_connector *connector)
>
> static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unused)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 pch_ctl1, pch_ctl2, val;
>
> @@ -1483,8 +1450,7 @@ static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unus
>
> static int pch_setup_backlight(struct intel_connector *connector, enum pipe unused)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 cpu_ctl2, pch_ctl1, pch_ctl2, val;
>
> @@ -1514,17 +1480,16 @@ static int pch_setup_backlight(struct intel_connector *connector, enum pipe unus
>
> static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unused)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 ctl, val;
>
> ctl = I915_READ(BLC_PWM_CTL);
>
> - if (IS_GEN2(dev) || IS_I915GM(dev) || IS_I945GM(dev))
> + if (IS_GEN2(dev_priv) || IS_I915GM(dev_priv) || IS_I945GM(dev_priv))
> panel->backlight.combination_mode = ctl & BLM_LEGACY_MODE;
>
> - if (IS_PINEVIEW(dev))
> + if (IS_PINEVIEW(dev_priv))
> panel->backlight.active_low_pwm = ctl & BLM_POLARITY_PNV;
>
> panel->backlight.max = ctl >> 17;
> @@ -1552,8 +1517,7 @@ static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unu
>
> static int i965_setup_backlight(struct intel_connector *connector, enum pipe unused)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 ctl, ctl2, val;
>
> @@ -1586,8 +1550,7 @@ static int i965_setup_backlight(struct intel_connector *connector, enum pipe unu
>
> static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 ctl, ctl2, val;
>
> @@ -1608,7 +1571,7 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe
>
> panel->backlight.min = get_backlight_min_vbt(connector);
>
> - val = _vlv_get_backlight(dev, pipe);
> + val = _vlv_get_backlight(dev_priv, pipe);
> panel->backlight.level = intel_panel_compute_brightness(connector, val);
>
> panel->backlight.enabled = (ctl2 & BLM_PWM_ENABLE) &&
> @@ -1620,8 +1583,7 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe
> static int
> bxt_setup_backlight(struct intel_connector *connector, enum pipe unused)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 pwm_ctl, val;
>
> @@ -1699,8 +1661,7 @@ static int pwm_setup_backlight(struct intel_connector *connector,
>
> int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe)
> {
> - struct drm_device *dev = connector->dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->dev);
> struct intel_connector *intel_connector = to_intel_connector(connector);
> struct intel_panel *panel = &intel_connector->panel;
> int ret;
> @@ -1755,36 +1716,35 @@ void intel_panel_destroy_backlight(struct drm_connector *connector)
> static void
> intel_panel_init_backlight_funcs(struct intel_panel *panel)
> {
> - struct intel_connector *intel_connector =
> + struct intel_connector *connector =
> container_of(panel, struct intel_connector, panel);
> - struct drm_device *dev = intel_connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>
> - if (IS_BROXTON(dev)) {
> + if (IS_BROXTON(dev_priv)) {
> 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;
> panel->backlight.hz_to_pwm = bxt_hz_to_pwm;
> - } else if (HAS_PCH_LPT(dev) || HAS_PCH_SPT(dev)) {
> + } else if (HAS_PCH_LPT(dev_priv) || HAS_PCH_SPT(dev_priv)) {
> 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;
> - if (HAS_PCH_LPT(dev))
> + if (HAS_PCH_LPT(dev_priv))
> panel->backlight.hz_to_pwm = lpt_hz_to_pwm;
> else
> panel->backlight.hz_to_pwm = spt_hz_to_pwm;
> - } else if (HAS_PCH_SPLIT(dev)) {
> + } else if (HAS_PCH_SPLIT(dev_priv)) {
> 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;
> - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
> + } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
> if (dev_priv->vbt.has_mipi) {
> panel->backlight.setup = pwm_setup_backlight;
> panel->backlight.enable = pwm_enable_backlight;
> @@ -1799,7 +1759,7 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)
> panel->backlight.get = vlv_get_backlight;
> panel->backlight.hz_to_pwm = vlv_hz_to_pwm;
> }
> - } else if (IS_GEN4(dev)) {
> + } else if (IS_GEN4(dev_priv)) {
> panel->backlight.setup = i965_setup_backlight;
> panel->backlight.enable = i965_enable_backlight;
> panel->backlight.disable = i965_disable_backlight;
> --
> 2.1.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915/backlight: prefer dev_priv over dev pointer
2015-12-18 8:51 [PATCH] drm/i915/backlight: prefer dev_priv over dev pointer Jani Nikula
2015-12-18 9:03 ` Mika Kuoppala
@ 2015-12-18 9:10 ` Chris Wilson
2015-12-18 9:49 ` Jani Nikula
2015-12-18 9:49 ` ✗ warning: Fi.CI.BAT Patchwork
2 siblings, 1 reply; 7+ messages in thread
From: Chris Wilson @ 2015-12-18 9:10 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Dec 18, 2015 at 10:51:35AM +0200, Jani Nikula wrote:
> Use dev_priv rather than dev pointer where applicable. Remove plenty of
> unnecessary temp variables. No functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_panel.c | 156 ++++++++++++++-----------------------
> 1 file changed, 58 insertions(+), 98 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index f5b4c98de608..21ee6477bf98 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -461,8 +461,7 @@ static inline u32 scale_hw_to_user(struct intel_connector *connector,
> static u32 intel_panel_compute_brightness(struct intel_connector *connector,
> u32 val)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
>
> WARN_ON(panel->backlight.max == 0);
> @@ -480,45 +479,40 @@ static u32 intel_panel_compute_brightness(struct intel_connector *connector,
>
> static u32 lpt_get_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>
> return I915_READ(BLC_PWM_PCH_CTL2) & BACKLIGHT_DUTY_CYCLE_MASK;
> }
>
> static u32 pch_get_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>
> return I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
> }
>
> static u32 i9xx_get_backlight(struct intel_connector *connector)
> {
> - struct drm_device *dev = connector->base.dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_panel *panel = &connector->panel;
> u32 val;
>
> val = I915_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
> - if (INTEL_INFO(dev)->gen < 4)
> + if (INTEL_INFO(dev_priv)->gen < 4)
> val >>= 1;
>
> if (panel->backlight.combination_mode) {
> u8 lbpc;
>
> - pci_read_config_byte(dev->pdev, PCI_LBPC, &lbpc);
> + pci_read_config_byte(dev_priv->dev->pdev, PCI_LBPC, &lbpc);
dev_priv->dev->pdev
to_pci_dev(dev_priv)
to_i915(connector->base.dev);
to_i915_from_connector(connector);
to_i915(crtc->base.dev);
to_i915_from_crtc(crtc);
Just thinking aloud.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915/backlight: prefer dev_priv over dev pointer
2015-12-18 9:03 ` Mika Kuoppala
@ 2015-12-18 9:43 ` Jani Nikula
0 siblings, 0 replies; 7+ messages in thread
From: Jani Nikula @ 2015-12-18 9:43 UTC (permalink / raw)
To: Mika Kuoppala, intel-gfx
On Fri, 18 Dec 2015, Mika Kuoppala <mika.kuoppala@linux.intel.com> wrote:
> Jani Nikula <jani.nikula@intel.com> writes:
>
>> Use dev_priv rather than dev pointer where applicable. Remove plenty of
>> unnecessary temp variables. No functional changes.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Pushed to drm-intel-next-queued, thanks for the review.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/intel_panel.c | 156 ++++++++++++++-----------------------
>> 1 file changed, 58 insertions(+), 98 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
>> index f5b4c98de608..21ee6477bf98 100644
>> --- a/drivers/gpu/drm/i915/intel_panel.c
>> +++ b/drivers/gpu/drm/i915/intel_panel.c
>> @@ -461,8 +461,7 @@ static inline u32 scale_hw_to_user(struct intel_connector *connector,
>> static u32 intel_panel_compute_brightness(struct intel_connector *connector,
>> u32 val)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>>
>> WARN_ON(panel->backlight.max == 0);
>> @@ -480,45 +479,40 @@ static u32 intel_panel_compute_brightness(struct intel_connector *connector,
>>
>> static u32 lpt_get_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>>
>> return I915_READ(BLC_PWM_PCH_CTL2) & BACKLIGHT_DUTY_CYCLE_MASK;
>> }
>>
>> static u32 pch_get_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>>
>> return I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
>> }
>>
>> static u32 i9xx_get_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 val;
>>
>> val = I915_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
>> - if (INTEL_INFO(dev)->gen < 4)
>> + if (INTEL_INFO(dev_priv)->gen < 4)
>> val >>= 1;
>>
>> if (panel->backlight.combination_mode) {
>> u8 lbpc;
>>
>> - pci_read_config_byte(dev->pdev, PCI_LBPC, &lbpc);
>> + pci_read_config_byte(dev_priv->dev->pdev, PCI_LBPC, &lbpc);
>> val *= lbpc;
>> }
>>
>> return val;
>> }
>>
>> -static u32 _vlv_get_backlight(struct drm_device *dev, enum pipe pipe)
>> +static u32 _vlv_get_backlight(struct drm_i915_private *dev_priv, enum pipe pipe)
>> {
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> -
>> if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))
>> return 0;
>>
>> @@ -527,17 +521,16 @@ static u32 _vlv_get_backlight(struct drm_device *dev, enum pipe pipe)
>>
>> static u32 vlv_get_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> enum pipe pipe = intel_get_pipe_from_connector(connector);
>>
>> - return _vlv_get_backlight(dev, pipe);
>> + return _vlv_get_backlight(dev_priv, pipe);
>> }
>>
>> static u32 bxt_get_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>>
>> return I915_READ(BXT_BLC_PWM_DUTY(panel->backlight.controller));
>> }
>> @@ -553,8 +546,7 @@ static u32 pwm_get_backlight(struct intel_connector *connector)
>>
>> static u32 intel_panel_get_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 val = 0;
>>
>> @@ -573,16 +565,14 @@ static u32 intel_panel_get_backlight(struct intel_connector *connector)
>>
>> static void lpt_set_backlight(struct intel_connector *connector, u32 level)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> u32 val = I915_READ(BLC_PWM_PCH_CTL2) & ~BACKLIGHT_DUTY_CYCLE_MASK;
>> I915_WRITE(BLC_PWM_PCH_CTL2, val | level);
>> }
>>
>> static void pch_set_backlight(struct intel_connector *connector, u32 level)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> u32 tmp;
>>
>> tmp = I915_READ(BLC_PWM_CPU_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK;
>> @@ -591,8 +581,7 @@ static void pch_set_backlight(struct intel_connector *connector, u32 level)
>>
>> static void i9xx_set_backlight(struct intel_connector *connector, u32 level)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 tmp, mask;
>>
>> @@ -603,10 +592,10 @@ static void i9xx_set_backlight(struct intel_connector *connector, u32 level)
>>
>> lbpc = level * 0xfe / panel->backlight.max + 1;
>> level /= lbpc;
>> - pci_write_config_byte(dev->pdev, PCI_LBPC, lbpc);
>> + pci_write_config_byte(dev_priv->dev->pdev, PCI_LBPC, lbpc);
>> }
>>
>> - if (IS_GEN4(dev)) {
>> + if (IS_GEN4(dev_priv)) {
>> mask = BACKLIGHT_DUTY_CYCLE_MASK;
>> } else {
>> level <<= 1;
>> @@ -619,8 +608,7 @@ static void i9xx_set_backlight(struct intel_connector *connector, u32 level)
>>
>> static void vlv_set_backlight(struct intel_connector *connector, u32 level)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> enum pipe pipe = intel_get_pipe_from_connector(connector);
>> u32 tmp;
>>
>> @@ -633,8 +621,7 @@ static void vlv_set_backlight(struct intel_connector *connector, u32 level)
>>
>> static void bxt_set_backlight(struct intel_connector *connector, u32 level)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>>
>> I915_WRITE(BXT_BLC_PWM_DUTY(panel->backlight.controller), level);
>> @@ -663,8 +650,7 @@ intel_panel_actually_set_backlight(struct intel_connector *connector, u32 level)
>> static void intel_panel_set_backlight(struct intel_connector *connector,
>> u32 user_level, u32 user_max)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 hw_level;
>>
>> @@ -690,8 +676,7 @@ static void intel_panel_set_backlight(struct intel_connector *connector,
>> void intel_panel_set_backlight_acpi(struct intel_connector *connector,
>> u32 user_level, u32 user_max)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> enum pipe pipe = intel_get_pipe_from_connector(connector);
>> u32 hw_level;
>> @@ -726,8 +711,7 @@ void intel_panel_set_backlight_acpi(struct intel_connector *connector,
>>
>> static void lpt_disable_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> u32 tmp;
>>
>> intel_panel_actually_set_backlight(connector, 0);
>> @@ -752,8 +736,7 @@ static void lpt_disable_backlight(struct intel_connector *connector)
>>
>> static void pch_disable_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> u32 tmp;
>>
>> intel_panel_actually_set_backlight(connector, 0);
>> @@ -772,8 +755,7 @@ static void i9xx_disable_backlight(struct intel_connector *connector)
>>
>> static void i965_disable_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> u32 tmp;
>>
>> intel_panel_actually_set_backlight(connector, 0);
>> @@ -784,8 +766,7 @@ static void i965_disable_backlight(struct intel_connector *connector)
>>
>> static void vlv_disable_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> enum pipe pipe = intel_get_pipe_from_connector(connector);
>> u32 tmp;
>>
>> @@ -800,8 +781,7 @@ static void vlv_disable_backlight(struct intel_connector *connector)
>>
>> static void bxt_disable_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 tmp, val;
>>
>> @@ -830,8 +810,7 @@ static void pwm_disable_backlight(struct intel_connector *connector)
>>
>> void intel_panel_disable_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>>
>> if (!panel->backlight.present)
>> @@ -843,7 +822,7 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
>> * backlight. This will leave the backlight on unnecessarily when
>> * another client is not activated.
>> */
>> - if (dev->switch_power_state == DRM_SWITCH_POWER_CHANGING) {
>> + if (dev_priv->dev->switch_power_state == DRM_SWITCH_POWER_CHANGING) {
>> DRM_DEBUG_DRIVER("Skipping backlight disable on vga switch\n");
>> return;
>> }
>> @@ -860,8 +839,7 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
>>
>> static void lpt_enable_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 pch_ctl1, pch_ctl2;
>>
>> @@ -893,8 +871,7 @@ static void lpt_enable_backlight(struct intel_connector *connector)
>>
>> static void pch_enable_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> enum pipe pipe = intel_get_pipe_from_connector(connector);
>> enum transcoder cpu_transcoder =
>> @@ -940,8 +917,7 @@ static void pch_enable_backlight(struct intel_connector *connector)
>>
>> static void i9xx_enable_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 ctl, freq;
>>
>> @@ -958,7 +934,7 @@ static void i9xx_enable_backlight(struct intel_connector *connector)
>> ctl = freq << 17;
>> if (panel->backlight.combination_mode)
>> ctl |= BLM_LEGACY_MODE;
>> - if (IS_PINEVIEW(dev) && panel->backlight.active_low_pwm)
>> + if (IS_PINEVIEW(dev_priv) && panel->backlight.active_low_pwm)
>> ctl |= BLM_POLARITY_PNV;
>>
>> I915_WRITE(BLC_PWM_CTL, ctl);
>> @@ -972,14 +948,13 @@ static void i9xx_enable_backlight(struct intel_connector *connector)
>> * 855gm only, but checking for gen2 is safe, as 855gm is the only gen2
>> * that has backlight.
>> */
>> - if (IS_GEN2(dev))
>> + if (IS_GEN2(dev_priv))
>> I915_WRITE(BLC_HIST_CTL, BLM_HISTOGRAM_ENABLE);
>> }
>>
>> static void i965_enable_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> enum pipe pipe = intel_get_pipe_from_connector(connector);
>> u32 ctl, ctl2, freq;
>> @@ -1012,8 +987,7 @@ static void i965_enable_backlight(struct intel_connector *connector)
>>
>> static void vlv_enable_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> enum pipe pipe = intel_get_pipe_from_connector(connector);
>> u32 ctl, ctl2;
>> @@ -1044,8 +1018,7 @@ static void vlv_enable_backlight(struct intel_connector *connector)
>>
>> static void bxt_enable_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> enum pipe pipe = intel_get_pipe_from_connector(connector);
>> u32 pwm_ctl, val;
>> @@ -1102,8 +1075,7 @@ static void pwm_enable_backlight(struct intel_connector *connector)
>>
>> void intel_panel_enable_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> enum pipe pipe = intel_get_pipe_from_connector(connector);
>>
>> @@ -1278,8 +1250,7 @@ static u32 bxt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
>> */
>> static u32 spt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> u32 mul, clock;
>>
>> if (I915_READ(SOUTH_CHICKEN1) & SPT_PWM_GRANULARITY)
>> @@ -1299,8 +1270,7 @@ static u32 spt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
>> */
>> static u32 lpt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> u32 mul, clock;
>>
>> if (I915_READ(SOUTH_CHICKEN2) & LPT_PWM_GRANULARITY)
>> @@ -1393,8 +1363,7 @@ static u32 vlv_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
>>
>> static u32 get_backlight_max_vbt(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u16 pwm_freq_hz = dev_priv->vbt.backlight.pwm_freq_hz;
>> u32 pwm;
>> @@ -1427,8 +1396,7 @@ static u32 get_backlight_max_vbt(struct intel_connector *connector)
>> */
>> static u32 get_backlight_min_vbt(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> int min;
>>
>> @@ -1453,8 +1421,7 @@ static u32 get_backlight_min_vbt(struct intel_connector *connector)
>>
>> static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unused)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 pch_ctl1, pch_ctl2, val;
>>
>> @@ -1483,8 +1450,7 @@ static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unus
>>
>> static int pch_setup_backlight(struct intel_connector *connector, enum pipe unused)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 cpu_ctl2, pch_ctl1, pch_ctl2, val;
>>
>> @@ -1514,17 +1480,16 @@ static int pch_setup_backlight(struct intel_connector *connector, enum pipe unus
>>
>> static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unused)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 ctl, val;
>>
>> ctl = I915_READ(BLC_PWM_CTL);
>>
>> - if (IS_GEN2(dev) || IS_I915GM(dev) || IS_I945GM(dev))
>> + if (IS_GEN2(dev_priv) || IS_I915GM(dev_priv) || IS_I945GM(dev_priv))
>> panel->backlight.combination_mode = ctl & BLM_LEGACY_MODE;
>>
>> - if (IS_PINEVIEW(dev))
>> + if (IS_PINEVIEW(dev_priv))
>> panel->backlight.active_low_pwm = ctl & BLM_POLARITY_PNV;
>>
>> panel->backlight.max = ctl >> 17;
>> @@ -1552,8 +1517,7 @@ static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unu
>>
>> static int i965_setup_backlight(struct intel_connector *connector, enum pipe unused)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 ctl, ctl2, val;
>>
>> @@ -1586,8 +1550,7 @@ static int i965_setup_backlight(struct intel_connector *connector, enum pipe unu
>>
>> static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 ctl, ctl2, val;
>>
>> @@ -1608,7 +1571,7 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe
>>
>> panel->backlight.min = get_backlight_min_vbt(connector);
>>
>> - val = _vlv_get_backlight(dev, pipe);
>> + val = _vlv_get_backlight(dev_priv, pipe);
>> panel->backlight.level = intel_panel_compute_brightness(connector, val);
>>
>> panel->backlight.enabled = (ctl2 & BLM_PWM_ENABLE) &&
>> @@ -1620,8 +1583,7 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe
>> static int
>> bxt_setup_backlight(struct intel_connector *connector, enum pipe unused)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 pwm_ctl, val;
>>
>> @@ -1699,8 +1661,7 @@ static int pwm_setup_backlight(struct intel_connector *connector,
>>
>> int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe)
>> {
>> - struct drm_device *dev = connector->dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->dev);
>> struct intel_connector *intel_connector = to_intel_connector(connector);
>> struct intel_panel *panel = &intel_connector->panel;
>> int ret;
>> @@ -1755,36 +1716,35 @@ void intel_panel_destroy_backlight(struct drm_connector *connector)
>> static void
>> intel_panel_init_backlight_funcs(struct intel_panel *panel)
>> {
>> - struct intel_connector *intel_connector =
>> + struct intel_connector *connector =
>> container_of(panel, struct intel_connector, panel);
>> - struct drm_device *dev = intel_connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>>
>> - if (IS_BROXTON(dev)) {
>> + if (IS_BROXTON(dev_priv)) {
>> 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;
>> panel->backlight.hz_to_pwm = bxt_hz_to_pwm;
>> - } else if (HAS_PCH_LPT(dev) || HAS_PCH_SPT(dev)) {
>> + } else if (HAS_PCH_LPT(dev_priv) || HAS_PCH_SPT(dev_priv)) {
>> 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;
>> - if (HAS_PCH_LPT(dev))
>> + if (HAS_PCH_LPT(dev_priv))
>> panel->backlight.hz_to_pwm = lpt_hz_to_pwm;
>> else
>> panel->backlight.hz_to_pwm = spt_hz_to_pwm;
>> - } else if (HAS_PCH_SPLIT(dev)) {
>> + } else if (HAS_PCH_SPLIT(dev_priv)) {
>> 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;
>> - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
>> + } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
>> if (dev_priv->vbt.has_mipi) {
>> panel->backlight.setup = pwm_setup_backlight;
>> panel->backlight.enable = pwm_enable_backlight;
>> @@ -1799,7 +1759,7 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)
>> panel->backlight.get = vlv_get_backlight;
>> panel->backlight.hz_to_pwm = vlv_hz_to_pwm;
>> }
>> - } else if (IS_GEN4(dev)) {
>> + } else if (IS_GEN4(dev_priv)) {
>> panel->backlight.setup = i965_setup_backlight;
>> panel->backlight.enable = i965_enable_backlight;
>> panel->backlight.disable = i965_disable_backlight;
>> --
>> 2.1.4
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915/backlight: prefer dev_priv over dev pointer
2015-12-18 9:10 ` Chris Wilson
@ 2015-12-18 9:49 ` Jani Nikula
2015-12-18 17:02 ` Dave Gordon
0 siblings, 1 reply; 7+ messages in thread
From: Jani Nikula @ 2015-12-18 9:49 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Fri, 18 Dec 2015, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Fri, Dec 18, 2015 at 10:51:35AM +0200, Jani Nikula wrote:
>> Use dev_priv rather than dev pointer where applicable. Remove plenty of
>> unnecessary temp variables. No functional changes.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_panel.c | 156 ++++++++++++++-----------------------
>> 1 file changed, 58 insertions(+), 98 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
>> index f5b4c98de608..21ee6477bf98 100644
>> --- a/drivers/gpu/drm/i915/intel_panel.c
>> +++ b/drivers/gpu/drm/i915/intel_panel.c
>> @@ -461,8 +461,7 @@ static inline u32 scale_hw_to_user(struct intel_connector *connector,
>> static u32 intel_panel_compute_brightness(struct intel_connector *connector,
>> u32 val)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>>
>> WARN_ON(panel->backlight.max == 0);
>> @@ -480,45 +479,40 @@ static u32 intel_panel_compute_brightness(struct intel_connector *connector,
>>
>> static u32 lpt_get_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>>
>> return I915_READ(BLC_PWM_PCH_CTL2) & BACKLIGHT_DUTY_CYCLE_MASK;
>> }
>>
>> static u32 pch_get_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>>
>> return I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
>> }
>>
>> static u32 i9xx_get_backlight(struct intel_connector *connector)
>> {
>> - struct drm_device *dev = connector->base.dev;
>> - struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> struct intel_panel *panel = &connector->panel;
>> u32 val;
>>
>> val = I915_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
>> - if (INTEL_INFO(dev)->gen < 4)
>> + if (INTEL_INFO(dev_priv)->gen < 4)
>> val >>= 1;
>>
>> if (panel->backlight.combination_mode) {
>> u8 lbpc;
>>
>> - pci_read_config_byte(dev->pdev, PCI_LBPC, &lbpc);
>> + pci_read_config_byte(dev_priv->dev->pdev, PCI_LBPC, &lbpc);
>
> dev_priv->dev->pdev
> to_pci_dev(dev_priv)
Makes sense.
> to_i915(connector->base.dev);
> to_i915_from_connector(connector);
>
> to_i915(crtc->base.dev);
> to_i915_from_crtc(crtc);
In practise, to_i915_from_connector(&intel_connector->base) is not so
neat. Would have to try out some patches to see what it turns out to be
like.
> Just thinking aloud.
>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Thanks,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* ✗ warning: Fi.CI.BAT
2015-12-18 8:51 [PATCH] drm/i915/backlight: prefer dev_priv over dev pointer Jani Nikula
2015-12-18 9:03 ` Mika Kuoppala
2015-12-18 9:10 ` Chris Wilson
@ 2015-12-18 9:49 ` Patchwork
2 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2015-12-18 9:49 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Summary ==
Built on ac2305b6c91b9a84cc12566016ece257c3ebcba3 drm-intel-nightly: 2015y-12m-17d-16h-19m-23s UTC integration manifest
Test igt@kms_flip@basic-flip-vs-wf_vblank on byt-nuc dmesg-warn -> skip
Test igt@kms_flip@basic-flip-vs-wf_vblank on skl-i7k-2 dmesg-fail -> dmesg-warn
Test igt@kms_pipe_crc_basic@hang-read-crc-pipe-b on byt-nuc pass -> skip
Test igt@kms_pipe_crc_basic@hang-read-crc-pipe-a on byt-nuc pass -> skip
Test igt@kms_flip@basic-flip-vs-dpms on ilk-hp8440p pass -> dmesg-warn
Test igt@kms_flip@basic-flip-vs-dpms on byt-nuc pass -> skip
Test igt@drv_module_reload_basic on byt-nuc pass -> dmesg-warn
Test igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b on snb-x220t dmesg-warn -> pass
Test igt@kms_pipe_crc_basic@read-crc-pipe-c on skl-i5k-2 pass -> dmesg-warn
Test igt@kms_pipe_crc_basic@read-crc-pipe-c on skl-i7k-2 dmesg-warn -> pass
Test igt@kms_pipe_crc_basic@read-crc-pipe-c-frame-sequence on bsw-nuc-2 dmesg-warn -> pass
Test igt@kms_flip@basic-flip-vs-modeset on snb-x220t pass -> dmesg-warn
Test igt@kms_flip@basic-flip-vs-modeset on hsw-brixbox pass -> dmesg-warn
Test igt@kms_flip@basic-flip-vs-modeset on bsw-nuc-2 dmesg-warn -> pass
Test igt@kms_flip@basic-flip-vs-modeset on skl-i5k-2 dmesg-warn -> pass
Test igt@kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence on byt-nuc dmesg-warn -> pass
bsw-nuc-2 total:135 pass:115 dwarn:0 dfail:0 fail:0 skip:20
byt-nuc total:135 pass:116 dwarn:2 dfail:0 fail:0 skip:17
hsw-brixbox total:135 pass:126 dwarn:2 dfail:0 fail:0 skip:7
hsw-gt2 total:135 pass:130 dwarn:1 dfail:0 fail:0 skip:4
ilk-hp8440p total:135 pass:99 dwarn:1 dfail:0 fail:2 skip:33
ivb-t430s total:135 pass:128 dwarn:1 dfail:1 fail:1 skip:4
skl-i5k-2 total:135 pass:122 dwarn:5 dfail:0 fail:0 skip:8
skl-i7k-2 total:135 pass:123 dwarn:4 dfail:0 fail:0 skip:8
snb-dellxps total:135 pass:121 dwarn:2 dfail:0 fail:0 skip:12
snb-x220t total:135 pass:121 dwarn:2 dfail:0 fail:1 skip:11
Results at /archive/results/CI_IGT_test/Patchwork_711/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915/backlight: prefer dev_priv over dev pointer
2015-12-18 9:49 ` Jani Nikula
@ 2015-12-18 17:02 ` Dave Gordon
0 siblings, 0 replies; 7+ messages in thread
From: Dave Gordon @ 2015-12-18 17:02 UTC (permalink / raw)
To: Jani Nikula, Chris Wilson; +Cc: intel-gfx
On 18/12/15 09:49, Jani Nikula wrote:
> On Fri, 18 Dec 2015, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>> On Fri, Dec 18, 2015 at 10:51:35AM +0200, Jani Nikula wrote:
>>> Use dev_priv rather than dev pointer where applicable. Remove plenty of
>>> unnecessary temp variables. No functional changes.
>>>
>>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>> ---
>>> drivers/gpu/drm/i915/intel_panel.c | 156 ++++++++++++++-----------------------
>>> 1 file changed, 58 insertions(+), 98 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
>>> index f5b4c98de608..21ee6477bf98 100644
>>> --- a/drivers/gpu/drm/i915/intel_panel.c
>>> +++ b/drivers/gpu/drm/i915/intel_panel.c
>>> @@ -461,8 +461,7 @@ static inline u32 scale_hw_to_user(struct intel_connector *connector,
>>> static u32 intel_panel_compute_brightness(struct intel_connector *connector,
>>> u32 val)
>>> {
>>> - struct drm_device *dev = connector->base.dev;
>>> - struct drm_i915_private *dev_priv = dev->dev_private;
>>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>>> struct intel_panel *panel = &connector->panel;
>>>
>>> WARN_ON(panel->backlight.max == 0);
>>> @@ -480,45 +479,40 @@ static u32 intel_panel_compute_brightness(struct intel_connector *connector,
>>>
>>> static u32 lpt_get_backlight(struct intel_connector *connector)
>>> {
>>> - struct drm_device *dev = connector->base.dev;
>>> - struct drm_i915_private *dev_priv = dev->dev_private;
>>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>>>
>>> return I915_READ(BLC_PWM_PCH_CTL2) & BACKLIGHT_DUTY_CYCLE_MASK;
>>> }
>>>
>>> static u32 pch_get_backlight(struct intel_connector *connector)
>>> {
>>> - struct drm_device *dev = connector->base.dev;
>>> - struct drm_i915_private *dev_priv = dev->dev_private;
>>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>>>
>>> return I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
>>> }
>>>
>>> static u32 i9xx_get_backlight(struct intel_connector *connector)
>>> {
>>> - struct drm_device *dev = connector->base.dev;
>>> - struct drm_i915_private *dev_priv = dev->dev_private;
>>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>>> struct intel_panel *panel = &connector->panel;
>>> u32 val;
>>>
>>> val = I915_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
>>> - if (INTEL_INFO(dev)->gen < 4)
>>> + if (INTEL_INFO(dev_priv)->gen < 4)
>>> val >>= 1;
>>>
>>> if (panel->backlight.combination_mode) {
>>> u8 lbpc;
>>>
>>> - pci_read_config_byte(dev->pdev, PCI_LBPC, &lbpc);
>>> + pci_read_config_byte(dev_priv->dev->pdev, PCI_LBPC, &lbpc);
>>
>> dev_priv->dev->pdev
>> to_pci_dev(dev_priv)
>
> Makes sense.
>
>> to_i915(connector->base.dev);
>> to_i915_from_connector(connector);
>>
>> to_i915(crtc->base.dev);
>> to_i915_from_crtc(crtc);
>
> In practise, to_i915_from_connector(&intel_connector->base) is not so
> neat. Would have to try out some patches to see what it turns out to be
> like.
Prefer crtc_to_i915() and connector_to_i915(). c.f. guc_to_i915()
Or we could eventually make a magic macro that takes any object that it
knows about: any_to_i915(thing) :)
.Dave.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-12-18 17:02 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-18 8:51 [PATCH] drm/i915/backlight: prefer dev_priv over dev pointer Jani Nikula
2015-12-18 9:03 ` Mika Kuoppala
2015-12-18 9:43 ` Jani Nikula
2015-12-18 9:10 ` Chris Wilson
2015-12-18 9:49 ` Jani Nikula
2015-12-18 17:02 ` Dave Gordon
2015-12-18 9:49 ` ✗ warning: Fi.CI.BAT Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.