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

Commit 6bf129df authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Use an intermediate variable to avoid repeating ourselves 



The code look slightly better this way and will ease the next commit,
changing where we take the fb pointer from.

Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5ba76c41

drivers/gpu/drm/i915/intel_display.c

+7 −6
Original line number Diff line number Diff line
@@ -2371,6 +2371,7 @@ intel_alloc_plane_obj(struct intel_crtc *crtc, 
	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_gem_object *obj = NULL;

	struct drm_mode_fb_cmd2 mode_cmd = { 0 };

	struct drm_framebuffer *fb = crtc->base.primary->fb;

	u32 base = plane_config->base;



	if (plane_config->size == 0)
@@ -2383,16 +2384,16 @@ intel_alloc_plane_obj(struct intel_crtc *crtc, 


	obj->tiling_mode = plane_config->tiling;

	if (obj->tiling_mode == I915_TILING_X)

		obj->stride = crtc->base.primary->fb->pitches[0];

		obj->stride = fb->pitches[0];



	mode_cmd.pixel_format = crtc->base.primary->fb->pixel_format;

	mode_cmd.width = crtc->base.primary->fb->width;

	mode_cmd.height = crtc->base.primary->fb->height;

	mode_cmd.pitches[0] = crtc->base.primary->fb->pitches[0];

	mode_cmd.pixel_format = fb->pixel_format;

	mode_cmd.width = fb->width;

	mode_cmd.height = fb->height;

	mode_cmd.pitches[0] = fb->pitches[0];



	mutex_lock(&dev->struct_mutex);



	if (intel_framebuffer_init(dev, to_intel_framebuffer(crtc->base.primary->fb),

	if (intel_framebuffer_init(dev, to_intel_framebuffer(fb),

				   &mode_cmd, obj)) {

		DRM_DEBUG_KMS("intel fb init failed\n");

		goto out_unref_obj;