openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Maarten Lankhorst 2015-07-14 12:33:29 +02:00 committed by Daniel Vetter
parent be5651f2d5
commit eeebeac5e4
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/i915/intel_display.c
View File

@ -15202,6 +15202,8 @@ void intel_modeset_init(struct drm_device *dev)
drm_modeset_unlock_all(dev); drm_modeset_unlock_all(dev);
for_each_intel_crtc(dev, crtc) { for_each_intel_crtc(dev, crtc) {
struct intel_initial_plane_config plane_config = {};
if (!crtc->active) if (!crtc->active)
continue; continue;
@ -15212,15 +15214,14 @@ void intel_modeset_init(struct drm_device *dev)
* can even allow for smooth boot transitions if the BIOS * can even allow for smooth boot transitions if the BIOS
* fb is large enough for the active pipe configuration. * 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,
dev_priv->display.get_initial_plane_config(crtc, &plane_config);
&crtc->plane_config);
/* /*
* If the fb is shared between multiple heads, we'll * If the fb is shared between multiple heads, we'll
* just get the first one. * just get the first one.
*/ */
intel_find_initial_plane_obj(crtc, &crtc->plane_config); intel_find_initial_plane_obj(crtc, &plane_config);
}
} }
} }

1
drivers/gpu/drm/i915/intel_drv.h
View File

@ -550,7 +550,6 @@ struct intel_crtc {
uint32_t cursor_size; uint32_t cursor_size;
uint32_t cursor_base; uint32_t cursor_base;
struct intel_initial_plane_config plane_config;
struct intel_crtc_state *config; struct intel_crtc_state *config;
bool new_enabled; bool new_enabled;