Chris Wilson <[email protected]> writes: > 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: Chris Wilson <[email protected]> > Reviewed-by: Joonas Lahtinen <[email protected]>
Reviewed-by: Mika Kuoppala <[email protected]> > --- > drivers/gpu/drm/i915/i915_drv.c | 2 +- > drivers/gpu/drm/i915/i915_drv.h | 1 - > drivers/gpu/drm/i915/intel_display.c | 7 ------- > 3 files changed, 1 insertion(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index e7e9e061073b..1b440f2b90a5 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -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; > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 72bb5b51035a..593714fe5c5e 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -4118,7 +4118,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 *); > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index c3bf87c2036c..5debb79540a2 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -15170,13 +15170,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); > -- > 2.15.0 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
