drm/i915: Use dev_priv as first argument of for_each_pipe()
Chris has decided that enough is enough. It's time to fixup dev Vs dev_priv. This is a modest contribution to the crusade. v2: Still use INTEL_INFO(), for the (mythical!) case we want to hardcode the info struct with defines (Chris) Rename the macro argument from 'dev' to 'dev_priv' (Jani) v3: Use names unlikely to be used as macro arguments (Chris) Suggested-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
这个提交包含在:
@@ -2654,7 +2654,7 @@ static struct intel_pipe_wm *ilk_find_best_result(struct drm_device *dev,
|
||||
#define WM_DIRTY_FBC (1 << 24)
|
||||
#define WM_DIRTY_DDB (1 << 25)
|
||||
|
||||
static unsigned int ilk_compute_wm_dirty(struct drm_device *dev,
|
||||
static unsigned int ilk_compute_wm_dirty(struct drm_i915_private *dev_priv,
|
||||
const struct ilk_wm_values *old,
|
||||
const struct ilk_wm_values *new)
|
||||
{
|
||||
@@ -2662,7 +2662,7 @@ static unsigned int ilk_compute_wm_dirty(struct drm_device *dev,
|
||||
enum pipe pipe;
|
||||
int wm_lp;
|
||||
|
||||
for_each_pipe(pipe) {
|
||||
for_each_pipe(dev_priv, pipe) {
|
||||
if (old->wm_linetime[pipe] != new->wm_linetime[pipe]) {
|
||||
dirty |= WM_DIRTY_LINETIME(pipe);
|
||||
/* Must disable LP1+ watermarks too */
|
||||
@@ -2748,7 +2748,7 @@ static void ilk_write_wm_values(struct drm_i915_private *dev_priv,
|
||||
unsigned int dirty;
|
||||
uint32_t val;
|
||||
|
||||
dirty = ilk_compute_wm_dirty(dev, previous, results);
|
||||
dirty = ilk_compute_wm_dirty(dev_priv, previous, results);
|
||||
if (!dirty)
|
||||
return;
|
||||
|
||||
@@ -5213,7 +5213,7 @@ static void g4x_disable_trickle_feed(struct drm_device *dev)
|
||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||
int pipe;
|
||||
|
||||
for_each_pipe(pipe) {
|
||||
for_each_pipe(dev_priv, pipe) {
|
||||
I915_WRITE(DSPCNTR(pipe),
|
||||
I915_READ(DSPCNTR(pipe)) |
|
||||
DISPPLANE_TRICKLE_FEED_DISABLE);
|
||||
@@ -5328,7 +5328,7 @@ static void cpt_init_clock_gating(struct drm_device *dev)
|
||||
/* The below fixes the weird display corruption, a few pixels shifted
|
||||
* downward, on (only) LVDS of some HP laptops with IVY.
|
||||
*/
|
||||
for_each_pipe(pipe) {
|
||||
for_each_pipe(dev_priv, pipe) {
|
||||
val = I915_READ(TRANS_CHICKEN2(pipe));
|
||||
val |= TRANS_CHICKEN2_TIMING_OVERRIDE;
|
||||
val &= ~TRANS_CHICKEN2_FDI_POLARITY_REVERSED;
|
||||
@@ -5340,7 +5340,7 @@ static void cpt_init_clock_gating(struct drm_device *dev)
|
||||
I915_WRITE(TRANS_CHICKEN2(pipe), val);
|
||||
}
|
||||
/* WADP0ClockGatingDisable */
|
||||
for_each_pipe(pipe) {
|
||||
for_each_pipe(dev_priv, pipe) {
|
||||
I915_WRITE(TRANS_CHICKEN1(pipe),
|
||||
TRANS_CHICKEN1_DP0UNIT_GC_DISABLE);
|
||||
}
|
||||
@@ -5560,7 +5560,7 @@ static void gen8_init_clock_gating(struct drm_device *dev)
|
||||
I915_READ(CHICKEN_PAR1_1) | DPA_MASK_VBLANK_SRD);
|
||||
|
||||
/* WaPsrDPRSUnmaskVBlankInSRD:bdw */
|
||||
for_each_pipe(pipe) {
|
||||
for_each_pipe(dev_priv, pipe) {
|
||||
I915_WRITE(CHICKEN_PIPESL_1(pipe),
|
||||
I915_READ(CHICKEN_PIPESL_1(pipe)) |
|
||||
BDW_DPRS_MASK_VBLANK_SRD);
|
||||
@@ -6363,12 +6363,11 @@ static void vlv_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,
|
||||
static void vlv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,
|
||||
struct i915_power_well *power_well)
|
||||
{
|
||||
struct drm_device *dev = dev_priv->dev;
|
||||
enum pipe pipe;
|
||||
|
||||
WARN_ON_ONCE(power_well->data != PUNIT_POWER_WELL_DPIO_CMN_BC);
|
||||
|
||||
for_each_pipe(pipe)
|
||||
for_each_pipe(dev_priv, pipe)
|
||||
assert_pll_disabled(dev_priv, pipe);
|
||||
|
||||
/* Assert common reset */
|
||||
|
在新工单中引用
屏蔽一个用户