diff options
| author | Paulo Zanoni | 2016-01-19 14:35:49 +0100 |
|---|---|---|
| committer | Paulo Zanoni | 2016-01-29 21:16:27 +0100 |
| commit | dd8b3bdbdb748e1ae6a7025bf113ab08b09952bb (patch) | |
| tree | f4b73887d9c61b1a55ec71e4b8e8fbab8bdae88a /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915/fbc: rewrite the multiple_pipes_ok() code for locking (diff) | |
| download | kernel-qcow2-linux-dd8b3bdbdb748e1ae6a7025bf113ab08b09952bb.tar.gz kernel-qcow2-linux-dd8b3bdbdb748e1ae6a7025bf113ab08b09952bb.tar.xz kernel-qcow2-linux-dd8b3bdbdb748e1ae6a7025bf113ab08b09952bb.zip | |
drm/i915: simplify struct drm_device access at intel_atomic_check()
We already have a dev variable, there's no need to access state->dev.
Also, I plan to add another dev_priv user here, so declare one for the
current user.
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453210558-7875-17-git-send-email-paulo.r.zanoni@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 136668a4e684..189367cea993 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13327,6 +13327,7 @@ static void calc_watermark_data(struct drm_atomic_state *state) static int intel_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) { + struct drm_i915_private *dev_priv = to_i915(dev); struct intel_atomic_state *intel_state = to_intel_atomic_state(state); struct drm_crtc *crtc; struct drm_crtc_state *crtc_state; @@ -13369,7 +13370,7 @@ static int intel_atomic_check(struct drm_device *dev, return ret; if (i915.fastboot && - intel_pipe_config_compare(state->dev, + intel_pipe_config_compare(dev, to_intel_crtc_state(crtc->state), pipe_config, true)) { crtc_state->mode_changed = false; @@ -13395,9 +13396,9 @@ static int intel_atomic_check(struct drm_device *dev, if (ret) return ret; } else - intel_state->cdclk = to_i915(state->dev)->cdclk_freq; + intel_state->cdclk = dev_priv->cdclk_freq; - ret = drm_atomic_helper_check_planes(state->dev, state); + ret = drm_atomic_helper_check_planes(dev, state); if (ret) return ret; |