diff options
| author | Maarten Lankhorst | 2015-07-14 12:33:29 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-07-14 14:01:31 +0200 |
| commit | eeebeac5e476800991ea1d10827307c41650ba11 (patch) | |
| tree | 93c6290e3168cd92c2ddcd3bd52c00be39d4464d /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Update missing properties in find_initial_plane_obj (diff) | |
| download | kernel-qcow2-linux-eeebeac5e476800991ea1d10827307c41650ba11.tar.gz kernel-qcow2-linux-eeebeac5e476800991ea1d10827307c41650ba11.tar.xz kernel-qcow2-linux-eeebeac5e476800991ea1d10827307c41650ba11.zip | |
drm/i915: Remove plane_config from struct intel_crtc, v2.
Nothing depends on this outside initial hw readout, so keep this
struct on the stack instead.
Changes since v1:
- Remove unrelated changes.
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d013a34dde7f..b0a3120c6da1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15202,6 +15202,8 @@ void intel_modeset_init(struct drm_device *dev) drm_modeset_unlock_all(dev); for_each_intel_crtc(dev, crtc) { + struct intel_initial_plane_config plane_config = {}; + if (!crtc->active) continue; @@ -15212,15 +15214,14 @@ void intel_modeset_init(struct drm_device *dev) * can even allow for smooth boot transitions if the BIOS * fb is large enough for the active pipe configuration. */ - if (dev_priv->display.get_initial_plane_config) { - dev_priv->display.get_initial_plane_config(crtc, - &crtc->plane_config); - /* - * If the fb is shared between multiple heads, we'll - * just get the first one. - */ - intel_find_initial_plane_obj(crtc, &crtc->plane_config); - } + dev_priv->display.get_initial_plane_config(crtc, + &plane_config); + + /* + * If the fb is shared between multiple heads, we'll + * just get the first one. + */ + intel_find_initial_plane_obj(crtc, &plane_config); } } |