From: Dave Airlie Date: Sun, 18 Aug 2013 23:24:13 +0000 (+1000) Subject: Merge remote-tracking branch 'pfdo/drm-rcar-for-v3.12' into drm-next X-Git-Tag: v3.12-rc1~136^2~118 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1dda8d02acbba80444a98e71d9d419232c109e94;p=linux.git Merge remote-tracking branch 'pfdo/drm-rcar-for-v3.12' into drm-next Merge the rcar stable branch that is being shared with the arm-soc tree. Signed-off-by: Dave Airlie * pfdo/drm-rcar-for-v3.12: (220 commits) drm/rcar-du: Add FBDEV emulation support drm/rcar-du: Add internal LVDS encoder support drm/rcar-du: Configure RGB output routing to DPAD0 drm/rcar-du: Rework output routing support drm/rcar-du: Add support for DEFR8 register drm/rcar-du: Add support for multiple groups drm/rcar-du: Fix buffer pitch alignment for R8A7790 DU drm/rcar-du: Add support for the R8A7790 DU drm/rcar-du: Move output routing configuration to group drm/rcar-du: Remove register definitions for the second channel drm/rcar-du: Use dynamic number of CRTCs instead of CRTCs array size drm/rcar-du: Introduce CRTCs groups drm/rcar-du: Rename rcar_du_plane_(init|register) to rcar_du_planes_* drm/rcar-du: Create rcar_du_planes structure drm/rcar-du: Rename platform data fields to match what they describe drm/rcar-du: Merge LVDS and VGA encoder code drm/rcar-du: Split VGA encoder and connector drm/rcar-du: Split LVDS encoder and connector drm/rcar-du: Clarify comment regarding plane Y source coordinate drm/rcar-du: Support per-CRTC clock and IRQ ... Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/intel_pm.c drivers/gpu/drm/qxl/qxl_release.c --- 1dda8d02acbba80444a98e71d9d419232c109e94 diff --cc drivers/gpu/drm/qxl/qxl_release.c index 1a648e1da6a6,b61449e52cd5..0109a9644cb2 --- a/drivers/gpu/drm/qxl/qxl_release.c +++ b/drivers/gpu/drm/qxl/qxl_release.c @@@ -85,12 -85,13 +85,13 @@@ qxl_release_free(struct qxl_device *qde if (release->surface_release_id) qxl_surface_id_dealloc(qdev, release->surface_release_id); - for (i = 0 ; i < release->bo_count; ++i) { + list_for_each_entry_safe(entry, tmp, &release->bos, tv.head) { + struct qxl_bo *bo = to_qxl_bo(entry->tv.bo); QXL_INFO(qdev, "release %llx\n", - drm_vma_node_offset_addr(&release->bos[i]->tbo.vma_node) - entry->tv.bo->addr_space_offset ++ drm_vma_node_offset_addr(&entry->tv.bo->vma_node) - DRM_FILE_OFFSET); - qxl_fence_remove_release(&release->bos[i]->fence, release->id); - qxl_bo_unref(&release->bos[i]); + qxl_fence_remove_release(&bo->fence, release->id); + qxl_bo_unref(&bo); } spin_lock(&qdev->release_idr_lock); idr_remove(&qdev->release_idr, release->id);