提交 fce7d61b 编写于 作者: J Joe Perches 提交者: Dave Airlie

drivers/gpu/drm: Update WARN uses

Coalesce long formats.
Align arguments.
Add missing newlines.
Signed-off-by: NJoe Perches <joe@perches.com>
Signed-off-by: NDave Airlie <airlied@redhat.com>
上级 85b54e0c
...@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder, ...@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
struct drm_crtc *tmp; struct drm_crtc *tmp;
int crtc_mask = 1; int crtc_mask = 1;
WARN(!crtc, "checking null crtc?"); WARN(!crtc, "checking null crtc?\n");
dev = crtc->dev; dev = crtc->dev;
......
...@@ -4065,8 +4065,7 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment) ...@@ -4065,8 +4065,7 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment)
alignment = i915_gem_get_gtt_alignment(obj); alignment = i915_gem_get_gtt_alignment(obj);
if (obj_priv->gtt_offset & (alignment - 1)) { if (obj_priv->gtt_offset & (alignment - 1)) {
WARN(obj_priv->pin_count, WARN(obj_priv->pin_count,
"bo is already pinned with incorrect alignment:" "bo is already pinned with incorrect alignment: offset=%x, req.alignment=%x\n",
" offset=%x, req.alignment=%x\n",
obj_priv->gtt_offset, alignment); obj_priv->gtt_offset, alignment);
ret = i915_gem_object_unbind(obj); ret = i915_gem_object_unbind(obj);
if (ret) if (ret)
......
...@@ -2033,7 +2033,7 @@ int evergreen_irq_set(struct radeon_device *rdev) ...@@ -2033,7 +2033,7 @@ int evergreen_irq_set(struct radeon_device *rdev)
u32 grbm_int_cntl = 0; u32 grbm_int_cntl = 0;
if (!rdev->irq.installed) { if (!rdev->irq.installed) {
WARN(1, "Can't enable IRQ/MSI because no handler is installed.\n"); WARN(1, "Can't enable IRQ/MSI because no handler is installed\n");
return -EINVAL; return -EINVAL;
} }
/* don't enable anything if the ih is disabled */ /* don't enable anything if the ih is disabled */
......
...@@ -442,7 +442,7 @@ int r100_pci_gart_init(struct radeon_device *rdev) ...@@ -442,7 +442,7 @@ int r100_pci_gart_init(struct radeon_device *rdev)
int r; int r;
if (rdev->gart.table.ram.ptr) { if (rdev->gart.table.ram.ptr) {
WARN(1, "R100 PCI GART already initialized.\n"); WARN(1, "R100 PCI GART already initialized\n");
return 0; return 0;
} }
/* Initialize common gart structure */ /* Initialize common gart structure */
...@@ -516,7 +516,7 @@ int r100_irq_set(struct radeon_device *rdev) ...@@ -516,7 +516,7 @@ int r100_irq_set(struct radeon_device *rdev)
uint32_t tmp = 0; uint32_t tmp = 0;
if (!rdev->irq.installed) { if (!rdev->irq.installed) {
WARN(1, "Can't enable IRQ/MSI because no handler is installed.\n"); WARN(1, "Can't enable IRQ/MSI because no handler is installed\n");
WREG32(R_000040_GEN_INT_CNTL, 0); WREG32(R_000040_GEN_INT_CNTL, 0);
return -EINVAL; return -EINVAL;
} }
......
...@@ -91,7 +91,7 @@ int rv370_pcie_gart_init(struct radeon_device *rdev) ...@@ -91,7 +91,7 @@ int rv370_pcie_gart_init(struct radeon_device *rdev)
int r; int r;
if (rdev->gart.table.vram.robj) { if (rdev->gart.table.vram.robj) {
WARN(1, "RV370 PCIE GART already initialized.\n"); WARN(1, "RV370 PCIE GART already initialized\n");
return 0; return 0;
} }
/* Initialize common gart structure */ /* Initialize common gart structure */
......
...@@ -919,7 +919,7 @@ int r600_pcie_gart_init(struct radeon_device *rdev) ...@@ -919,7 +919,7 @@ int r600_pcie_gart_init(struct radeon_device *rdev)
int r; int r;
if (rdev->gart.table.vram.robj) { if (rdev->gart.table.vram.robj) {
WARN(1, "R600 PCIE GART already initialized.\n"); WARN(1, "R600 PCIE GART already initialized\n");
return 0; return 0;
} }
/* Initialize common gart structure */ /* Initialize common gart structure */
...@@ -2995,7 +2995,7 @@ int r600_irq_set(struct radeon_device *rdev) ...@@ -2995,7 +2995,7 @@ int r600_irq_set(struct radeon_device *rdev)
u32 hdmi1, hdmi2; u32 hdmi1, hdmi2;
if (!rdev->irq.installed) { if (!rdev->irq.installed) {
WARN(1, "Can't enable IRQ/MSI because no handler is installed.\n"); WARN(1, "Can't enable IRQ/MSI because no handler is installed\n");
return -EINVAL; return -EINVAL;
} }
/* don't enable anything if the ih is disabled */ /* don't enable anything if the ih is disabled */
......
...@@ -240,7 +240,8 @@ int radeon_fence_wait(struct radeon_fence *fence, bool intr) ...@@ -240,7 +240,8 @@ int radeon_fence_wait(struct radeon_fence *fence, bool intr)
*/ */
if (seq == rdev->fence_drv.last_seq && radeon_gpu_is_lockup(rdev)) { if (seq == rdev->fence_drv.last_seq && radeon_gpu_is_lockup(rdev)) {
/* good news we believe it's a lockup */ /* good news we believe it's a lockup */
WARN(1, "GPU lockup (waiting for 0x%08X last fence id 0x%08X)\n", fence->seq, seq); WARN(1, "GPU lockup (waiting for 0x%08X last fence id 0x%08X)\n",
fence->seq, seq);
/* FIXME: what should we do ? marking everyone /* FIXME: what should we do ? marking everyone
* as signaled for now * as signaled for now
*/ */
......
...@@ -689,7 +689,8 @@ static int radeon_ttm_backend_bind(struct ttm_backend *backend, ...@@ -689,7 +689,8 @@ static int radeon_ttm_backend_bind(struct ttm_backend *backend,
gtt = container_of(backend, struct radeon_ttm_backend, backend); gtt = container_of(backend, struct radeon_ttm_backend, backend);
gtt->offset = bo_mem->start << PAGE_SHIFT; gtt->offset = bo_mem->start << PAGE_SHIFT;
if (!gtt->num_pages) { if (!gtt->num_pages) {
WARN(1, "nothing to bind %lu pages for mreg %p back %p!\n", gtt->num_pages, bo_mem, backend); WARN(1, "nothing to bind %lu pages for mreg %p back %p!\n",
gtt->num_pages, bo_mem, backend);
} }
r = radeon_gart_bind(gtt->rdev, gtt->offset, r = radeon_gart_bind(gtt->rdev, gtt->offset,
gtt->num_pages, gtt->pages); gtt->num_pages, gtt->pages);
......
...@@ -78,7 +78,7 @@ int rs400_gart_init(struct radeon_device *rdev) ...@@ -78,7 +78,7 @@ int rs400_gart_init(struct radeon_device *rdev)
int r; int r;
if (rdev->gart.table.ram.ptr) { if (rdev->gart.table.ram.ptr) {
WARN(1, "RS400 GART already initialized.\n"); WARN(1, "RS400 GART already initialized\n");
return 0; return 0;
} }
/* Check gart size */ /* Check gart size */
......
...@@ -375,7 +375,7 @@ int rs600_gart_init(struct radeon_device *rdev) ...@@ -375,7 +375,7 @@ int rs600_gart_init(struct radeon_device *rdev)
int r; int r;
if (rdev->gart.table.vram.robj) { if (rdev->gart.table.vram.robj) {
WARN(1, "RS600 GART already initialized.\n"); WARN(1, "RS600 GART already initialized\n");
return 0; return 0;
} }
/* Initialize common gart structure */ /* Initialize common gart structure */
...@@ -505,7 +505,7 @@ int rs600_irq_set(struct radeon_device *rdev) ...@@ -505,7 +505,7 @@ int rs600_irq_set(struct radeon_device *rdev)
~S_007D18_DC_HOT_PLUG_DETECT2_INT_EN(1); ~S_007D18_DC_HOT_PLUG_DETECT2_INT_EN(1);
if (!rdev->irq.installed) { if (!rdev->irq.installed) {
WARN(1, "Can't enable IRQ/MSI because no handler is installed.\n"); WARN(1, "Can't enable IRQ/MSI because no handler is installed\n");
WREG32(R_000040_GEN_INT_CNTL, 0); WREG32(R_000040_GEN_INT_CNTL, 0);
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册