diff options
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 65fce56646b9..01dc80b50df5 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6584,13 +6584,16 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc, int fourcc, pixel_format; int aligned_height; struct drm_framebuffer *fb; + struct intel_framebuffer *intel_fb; - fb = kzalloc(sizeof(struct intel_framebuffer), GFP_KERNEL); - if (!fb) { + intel_fb = kzalloc(sizeof(struct intel_framebuffer), GFP_KERNEL); + if (!intel_fb) { DRM_DEBUG_KMS("failed to alloc fb\n"); return; } + fb = &intel_fb->base; + val = I915_READ(DSPCNTR(plane)); if (INTEL_INFO(dev)->gen >= 4) @@ -7613,13 +7616,16 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc, int fourcc, pixel_format; int aligned_height; struct drm_framebuffer *fb; + struct intel_framebuffer *intel_fb; - fb = kzalloc(sizeof(struct intel_framebuffer), GFP_KERNEL); - if (!fb) { + intel_fb = kzalloc(sizeof(struct intel_framebuffer), GFP_KERNEL); + if (!intel_fb) { DRM_DEBUG_KMS("failed to alloc fb\n"); return; } + fb = &intel_fb->base; + val = I915_READ(PLANE_CTL(pipe, 0)); if (val & PLANE_CTL_TILED_MASK) plane_config->tiling = I915_TILING_X; @@ -7706,13 +7712,16 @@ ironlake_get_initial_plane_config(struct intel_crtc *crtc, int fourcc, pixel_format; int aligned_height; struct drm_framebuffer *fb; + struct intel_framebuffer *intel_fb; - fb = kzalloc(sizeof(struct intel_framebuffer), GFP_KERNEL); - if (!fb) { + intel_fb = kzalloc(sizeof(struct intel_framebuffer), GFP_KERNEL); + if (!intel_fb) { DRM_DEBUG_KMS("failed to alloc fb\n"); return; } + fb = &intel_fb->base; + val = I915_READ(DSPCNTR(pipe)); if (INTEL_INFO(dev)->gen >= 4) |