diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-03-03 17:19:26 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-04-05 13:22:37 +0300 |
| commit | 709f3fc92c113c88c96c5def37acb92e2eef610a (patch) | |
| tree | 11f34bb521de564f4f0bf7651a165cbc4082e13a /drivers/gpu/drm/i915/intel_pm.c | |
| parent | b53af8bb18b85188b5c8cacaa6a966774b548f17 (diff) | |
| download | op-kernel-dev-709f3fc92c113c88c96c5def37acb92e2eef610a.zip op-kernel-dev-709f3fc92c113c88c96c5def37acb92e2eef610a.tar.gz | |
drm/i915: Check for id==PLANE_CURSOR instead of type==DRM_PLANE_TYPE_CURSOR
The VLV/CHV watermark calculation is really interested in the hardware
plane type rather than the plane type (which is more of a software
concept). Let's check plane->id rather plane->type.
No functional changes.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170303151928.23053-3-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 570bd60..2807054 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -1039,7 +1039,7 @@ static uint16_t vlv_compute_wm_level(const struct intel_crtc_state *crtc_state, if (WARN_ON(htotal == 0)) htotal = 1; - if (plane->base.type == DRM_PLANE_TYPE_CURSOR) { + if (plane->id == PLANE_CURSOR) { /* * FIXME the formula gives values that are * too big for the cursor FIFO, and hence we |
