Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeebeac5 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarDaniel Stone <daniels@collabora.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent be5651f2

drivers/gpu/drm/i915/intel_display.c

+10 −9
Original line number Diff line number Diff line
@@ -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);

							   &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);

		}

		intel_find_initial_plane_obj(crtc, &plane_config);

	}

}

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -550,7 +550,6 @@ struct intel_crtc { 
	uint32_t cursor_size;

	uint32_t cursor_base;



	struct intel_initial_plane_config plane_config;

	struct intel_crtc_state *config;

	bool new_enabled;