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

Commit fce7d61b authored by Joe Perches's avatar Joe Perches Committed by Dave Airlie
Browse files

drivers/gpu/drm: Update WARN uses 



Coalesce long formats.
Align arguments.
Add missing newlines.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 85b54e0c

drivers/gpu/drm/drm_crtc_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder, 
	struct drm_crtc *tmp;

	int crtc_mask = 1;



	WARN(!crtc, "checking null crtc?");

	WARN(!crtc, "checking null crtc?\n");



	dev = crtc->dev;

drivers/gpu/drm/i915/i915_gem.c

+1 −2
Original line number Diff line number Diff line
@@ -4065,8 +4065,7 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment) 
			alignment = i915_gem_get_gtt_alignment(obj);

		if (obj_priv->gtt_offset & (alignment - 1)) {

			WARN(obj_priv->pin_count,

			     "bo is already pinned with incorrect alignment:"

			     " offset=%x, req.alignment=%x\n",

			     "bo is already pinned with incorrect alignment: offset=%x, req.alignment=%x\n",

			     obj_priv->gtt_offset, alignment);

			ret = i915_gem_object_unbind(obj);

			if (ret)

drivers/gpu/drm/radeon/evergreen.c

+1 −1
Original line number Diff line number Diff line
@@ -2033,7 +2033,7 @@ int evergreen_irq_set(struct radeon_device *rdev) 
	u32 grbm_int_cntl = 0;



	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;

	}

	/* don't enable anything if the ih is disabled */

drivers/gpu/drm/radeon/r100.c

+2 −2
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ int r100_pci_gart_init(struct radeon_device *rdev) 
	int r;



	if (rdev->gart.table.ram.ptr) {

		WARN(1, "R100 PCI GART already initialized.\n");

		WARN(1, "R100 PCI GART already initialized\n");

		return 0;

	}

	/* Initialize common gart structure */
@@ -516,7 +516,7 @@ int r100_irq_set(struct radeon_device *rdev) 
	uint32_t tmp = 0;



	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);

		return -EINVAL;

	}

drivers/gpu/drm/radeon/r300.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ int rv370_pcie_gart_init(struct radeon_device *rdev) 
	int r;



	if (rdev->gart.table.vram.robj) {

		WARN(1, "RV370 PCIE GART already initialized.\n");

		WARN(1, "RV370 PCIE GART already initialized\n");

		return 0;

	}

	/* Initialize common gart structure */