mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

drm/i915: Do not use plane_config in intel_fbdev.c 

Use the atomic state instead, this allows removing plane_config
from the crtc after the full hw readout is completed.

The size can be found in the fb, no need for the plane_config.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Maarten Lankhorst 2015-07-13 16:30:16 +02:00 committed by Daniel Vetter
parent e435d6e52b
commit 8e9ba31a0f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/i915/intel_fbdev.c
View File

@ -581,7 +581,6 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
struct intel_framebuffer *fb = NULL; struct intel_framebuffer *fb = NULL;
struct drm_crtc *crtc; struct drm_crtc *crtc;
struct intel_crtc *intel_crtc; struct intel_crtc *intel_crtc;
struct intel_initial_plane_config *plane_config = NULL;
unsigned int max_size = 0; unsigned int max_size = 0;
if (!i915.fastboot) if (!i915.fastboot)
@ -589,20 +588,21 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
/* Find the largest fb */ /* Find the largest fb */
for_each_crtc(dev, crtc) { for_each_crtc(dev, crtc) {
struct drm_i915_gem_object *obj =
intel_fb_obj(crtc->primary->state->fb);
intel_crtc = to_intel_crtc(crtc); intel_crtc = to_intel_crtc(crtc);
if (!intel_crtc->active || !crtc->primary->fb) { if (!intel_crtc->active || !obj) {
DRM_DEBUG_KMS("pipe %c not active or no fb, skipping\n", DRM_DEBUG_KMS("pipe %c not active or no fb, skipping\n",
pipe_name(intel_crtc->pipe)); pipe_name(intel_crtc->pipe));
continue; continue;
} }
if (intel_crtc->plane_config.size > max_size) { if (obj->base.size > max_size) {
DRM_DEBUG_KMS("found possible fb from plane %c\n", DRM_DEBUG_KMS("found possible fb from plane %c\n",
pipe_name(intel_crtc->pipe)); pipe_name(intel_crtc->pipe));
plane_config = &intel_crtc->plane_config; fb = to_intel_framebuffer(crtc->primary->state->fb);
fb = to_intel_framebuffer(crtc->primary->fb); max_size = obj->base.size;
max_size = plane_config->size;
} }
} }
@ -637,7 +637,6 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
DRM_DEBUG_KMS("fb not wide enough for plane %c (%d vs %d)\n", DRM_DEBUG_KMS("fb not wide enough for plane %c (%d vs %d)\n",
pipe_name(intel_crtc->pipe), pipe_name(intel_crtc->pipe),
cur_size, fb->base.pitches[0]); cur_size, fb->base.pitches[0]);
plane_config = NULL;
fb = NULL; fb = NULL;
break; break;
} }
@ -658,7 +657,6 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
DRM_DEBUG_KMS("fb not big enough for plane %c (%d vs %d)\n", DRM_DEBUG_KMS("fb not big enough for plane %c (%d vs %d)\n",
pipe_name(intel_crtc->pipe), pipe_name(intel_crtc->pipe),
cur_size, max_size); cur_size, max_size);
plane_config = NULL;
fb = NULL; fb = NULL;
break; break;
} }