From 99ebb75d84ef6989a8a127bb884ae1b4d6651ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Sat, 28 Nov 2015 17:37:41 +0000 Subject: [PATCH] drm/i915: Further reduce the diff in i915_dma.c MFC after: 2 months --- sys/dev/drm2/i915/i915_dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/drm2/i915/i915_dma.c b/sys/dev/drm2/i915/i915_dma.c index 2d0f57d6a26..ad2c147ada0 100644 --- a/sys/dev/drm2/i915/i915_dma.c +++ b/sys/dev/drm2/i915/i915_dma.c @@ -542,8 +542,7 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev, return ret; if (INTEL_INFO(dev)->gen >= 4) { - OUT_RING(MI_BATCH_BUFFER_START | (2 << 6) | - MI_BATCH_NON_SECURE_I965); + OUT_RING(MI_BATCH_BUFFER_START | (2 << 6) | MI_BATCH_NON_SECURE_I965); OUT_RING(batch->start); } else { OUT_RING(MI_BATCH_BUFFER_START | (2 << 6)); @@ -724,7 +723,8 @@ int i915_cmdbuffer(struct drm_device *dev, void *data, cliprects = malloc(cmdbuf->num_cliprects * sizeof(struct drm_clip_rect), DRM_MEM_DMA, M_WAITOK | M_ZERO); ret = -copyin(cmdbuf->cliprects, cliprects, - cmdbuf->num_cliprects * sizeof(struct drm_clip_rect)); + cmdbuf->num_cliprects * + sizeof(struct drm_clip_rect)); if (ret != 0) goto fail_clip_free; } @@ -1325,7 +1325,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master) */ int i915_driver_load(struct drm_device *dev, unsigned long flags) { - struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_i915_private *dev_priv; const struct intel_device_info *info; unsigned long base, size; int ret = 0, mmio_bar;