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

Commit f19ec8cb authored by Dave Gordon's avatar Dave Gordon Committed by Chris Wilson
Browse files

drm/i915: convert a few more E->dev_private to to_i915(E) 



Also remove some redundant dev and dev_priv locals

Signed-off-by: default avatarDave Gordon <david.s.gordon@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1467626365-29871-1-git-send-email-david.s.gordon@intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1467628477-25379-2-git-send-email-chris@chris-wilson.co.uk
parent fac5e23e

drivers/gpu/drm/i915/i915_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -4772,7 +4772,7 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj, 
	obj->fence_reg = I915_FENCE_REG_NONE;

	obj->madv = I915_MADV_WILLNEED;



	i915_gem_info_add_obj(obj->base.dev->dev_private, obj->base.size);

	i915_gem_info_add_obj(to_i915(obj->base.dev), obj->base.size);

}



static const struct drm_i915_gem_object_ops i915_gem_object_ops = {
@@ -5398,7 +5398,7 @@ int i915_gem_open(struct drm_device *dev, struct drm_file *file) 
		return -ENOMEM;



	file->driver_priv = file_priv;

	file_priv->dev_priv = dev->dev_private;

	file_priv->dev_priv = to_i915(dev);

	file_priv->file = file;

	INIT_LIST_HEAD(&file_priv->rps.link);

drivers/gpu/drm/i915/intel_display.c

+0 −4
Original line number Diff line number Diff line
@@ -14144,15 +14144,11 @@ int 
skl_max_scale(struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state)

{

	int max_scale;

	struct drm_device *dev;

	struct drm_i915_private *dev_priv;

	int crtc_clock, cdclk;



	if (!intel_crtc || !crtc_state->base.enable)

		return DRM_PLANE_HELPER_NO_SCALING;



	dev = intel_crtc->base.dev;

	dev_priv = dev->dev_private;

	crtc_clock = crtc_state->base.adjusted_mode.crtc_clock;

	cdclk = to_intel_atomic_state(crtc_state->base.state)->cdclk;

drivers/gpu/drm/i915/intel_guc_loader.c

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw) 


	/* Header and uCode will be loaded to WOPCM. Size of the two. */

	size = guc_fw->header_size + guc_fw->ucode_size;

	if (size > guc_wopcm_size(dev->dev_private)) {

	if (size > guc_wopcm_size(to_i915(dev))) {

		DRM_ERROR("Firmware is too large to fit in WOPCM\n");

		goto fail;

	}