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

Commit d378a3ef authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Inline intel_modeset_gem_init() 



intel_modeset_gem_init() now only sets up the legacy overlay, so let's
remove the function and call the setup directly during driver load. This
should help us find a better point in the initialisation sequence for it
later.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171110142634.10551-5-chris@chris-wilson.co.uk
parent cc6a818a

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ static int i915_load_modeset_init(struct drm_device *dev) 
	if (ret)

		goto cleanup_uc;



	intel_modeset_gem_init(dev);

	intel_setup_overlay(dev_priv);



	if (INTEL_INFO(dev_priv)->num_pipes == 0)

		return 0;

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -4124,7 +4124,6 @@ void intel_device_info_dump(struct drm_i915_private *dev_priv); 
/* modesetting */

extern void intel_modeset_init_hw(struct drm_device *dev);

extern int intel_modeset_init(struct drm_device *dev);

extern void intel_modeset_gem_init(struct drm_device *dev);

extern void intel_modeset_cleanup(struct drm_device *dev);

extern int intel_connector_register(struct drm_connector *);

extern void intel_connector_unregister(struct drm_connector *);

drivers/gpu/drm/i915/intel_display.c

+0 −7
Original line number Diff line number Diff line
@@ -15194,13 +15194,6 @@ void intel_display_resume(struct drm_device *dev) 
		drm_atomic_state_put(state);

}



void intel_modeset_gem_init(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = to_i915(dev);



	intel_setup_overlay(dev_priv);

}



int intel_connector_register(struct drm_connector *connector)

{

	struct intel_connector *intel_connector = to_intel_connector(connector);