diff options
| author | Ville Syrjälä <[email protected]> | 2017-11-17 21:19:16 +0200 |
|---|---|---|
| committer | Ville Syrjälä <[email protected]> | 2017-11-21 19:52:28 +0200 |
| commit | 2924b8cc415a950687a890cb6dea8dbc0e930447 (patch) | |
| tree | 28ae5bcc7ee966504ce0483a82f64ea0953a5300 | |
| parent | b1558c7ea16038f3c3dcc40dd5c1cf7ad6004ada (diff) | |
drm/i915: Use plane->get_hw_state() for initial plane fb readout
Since we now have a ->get_hw_state() method for planes, let's use
that during the initial plane fb readout.
v2: s/plane/i9xx_plane/ etc. (James)
Cc: James Ausmus <[email protected]>
Cc: Daniel Vetter <[email protected]>
Suggested-by: Daniel Vetter <[email protected]>
Reviewed-by: James Ausmus <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Signed-off-by: Ville Syrjälä <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 62cc2a600205..ed58311e8da0 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7413,8 +7413,7 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc, struct drm_framebuffer *fb; struct intel_framebuffer *intel_fb; - val = I915_READ(DSPCNTR(i9xx_plane)); - if (!(val & DISPLAY_PLANE_ENABLE)) + if (!plane->get_hw_state(plane)) return; intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL); @@ -7427,6 +7426,8 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc, fb->dev = dev; + val = I915_READ(DSPCNTR(i9xx_plane)); + if (INTEL_GEN(dev_priv) >= 4) { if (val & DISPPLANE_TILED) { plane_config->tiling = I915_TILING_X; @@ -8442,6 +8443,9 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc, struct drm_framebuffer *fb; struct intel_framebuffer *intel_fb; + if (!plane->get_hw_state(plane)) + return; + intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL); if (!intel_fb) { DRM_DEBUG_KMS("failed to alloc fb\n"); @@ -8453,8 +8457,6 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc, fb->dev = dev; val = I915_READ(PLANE_CTL(pipe, plane_id)); - if (!(val & PLANE_CTL_ENABLE)) - goto error; pixel_format = val & PLANE_CTL_FORMAT_MASK; |