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

Commit 00648f18 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Nuke intel_modeset_preclose 



Now that the drm core unlinks/disarms events there's no need to do so
ourselves anymore. Nuke the code.

Acked-by: default avatarDaniel Stone <daniels@collabora.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453756616-28942-4-git-send-email-daniel.vetter@ffwll.ch
parent 7eb98020

drivers/gpu/drm/i915/i915_dma.c

+0 −2
Original line number Diff line number Diff line
@@ -1261,8 +1261,6 @@ void i915_driver_preclose(struct drm_device *dev, struct drm_file *file) 
	i915_gem_context_close(dev, file);

	i915_gem_release(dev, file);

	mutex_unlock(&dev->struct_mutex);



	intel_modeset_preclose(dev, file);

}



void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)

drivers/gpu/drm/i915/intel_display.c

+0 −21
Original line number Diff line number Diff line
@@ -16140,24 +16140,3 @@ intel_display_print_error_state(struct drm_i915_error_state_buf *m, 
		err_printf(m, "  VSYNC: %08x\n", error->transcoder[i].vsync);

	}

}
 


void intel_modeset_preclose(struct drm_device *dev, struct drm_file *file)

{

	struct intel_crtc *crtc;



	for_each_intel_crtc(dev, crtc) {

		struct intel_unpin_work *work;



		spin_lock_irq(&dev->event_lock);



		work = crtc->unpin_work;



		if (work && work->event &&

		    work->event->base.file_priv == file) {

			kfree(work->event);

			work->event = NULL;

		}



		spin_unlock_irq(&dev->event_lock);

	}

}

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -1207,7 +1207,6 @@ enum intel_display_power_domain 
intel_display_port_aux_power_domain(struct intel_encoder *intel_encoder);

void intel_mode_from_pipe_config(struct drm_display_mode *mode,

				 struct intel_crtc_state *pipe_config);

void intel_modeset_preclose(struct drm_device *dev, struct drm_file *file);



int skl_update_scaler_crtc(struct intel_crtc_state *crtc_state);

int skl_max_scale(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state);