[PATCH] drm, i915: Fix pointer size cast

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Borislav Petkov <bp@alien8.de>
Newsgroups	linux.kernel
Subject	[PATCH] drm, i915: Fix pointer size cast
Date	Mon, 21 Dec 2015 20:00:02 +0100
Message-ID	<qIdQC-1Js-9@gated-at.bofh.it> (permalink)
X-Original-To	LKML <linux-kernel@vger.kernel.org>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1450724054; bh=nQqudMRtRImVtcJ4kiNzCtSrRLD+gRNtFciUTM16u38=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding; b=LBDJ4zBqmjJS6V4YRXmXA7rEDjyfZUiw3Pgdz R6C7IwFf8T5d/NrGRJhinlXW65Ek1iwIwkI6W+8axTvt4QyUmj87/BK/7O65AA0pVCJ /ZQ/VfvUKZrh4QpJeiVc4bnJM2GOK7X6IS8Wv6YKK4WNML4ug29uVC8N/WJsf37z0So =
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1450724053; bh=nQqudMRtRImVtcJ4kiNzCtSrRLD+gRNtFciUTM16u38=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding; b=dviCqs8Gmip0fgaSd6nV3O8CgjGNMjcNXpjcK fJ9qcXffusxxJOaNAxWB6d5MjfS1OFdxCMAWBGt1g/PaQf3SV3axyMQhcXTZtJZSjwD jMDGapvGMGrwVv7D3FBBfog4F2/IaRKsyT+wz1kn6UXNqI3stVZAtL711sszM/o7Fuc =
X-Mailer	git-send-email 2.3.5
MIME-Version	1.0
Content-Type	text/plain; charset=UTF-8
Content-Transfer-Encoding	8bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	64
Organization	linux.* mail to news gateway
X-Original-Cc	Daniel Vetter <daniel.vetter@intel.com>, Jani Nikula <jani.nikula@linux.intel.com>, David Airlie <airlied@linux.ie>, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
X-Original-Date	Mon, 21 Dec 2015 19:53:59 +0100
X-Original-Message-ID	<1450724039-23264-1-git-send-email-bp@alien8.de>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1296150

Show key headers only | View raw

From: Borislav Petkov <bp@suse.de>

gcc complains on 32-bit like this:

  drivers/gpu/drm/i915/intel_display.c: In function ‘intel_plane_obj_offset’:
  drivers/gpu/drm/i915/intel_display.c:2954:11: warning: cast to pointer from \
	  integer of different size [-Wint-to-pointer-cast]
    offset = (unsigned char *)vma->node.start;
             ^

because vma->node.start is u64 but a pointer on 32-bit is 4 bytes.

Do the calculations with an unsigned long directly and save us the
casts.

Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Borislav Petkov <bp@suse.de>
---
 drivers/gpu/drm/i915/intel_display.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 62211abe4922..640cb7c9b7f3 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2941,7 +2941,7 @@ unsigned long intel_plane_obj_offset(struct intel_plane *intel_plane,
 {
 	const struct i915_ggtt_view *view = &i915_ggtt_view_normal;
 	struct i915_vma *vma;
-	unsigned char *offset;
+	unsigned long offset;
 
 	if (intel_rotation_90_or_270(intel_plane->base.state->rotation))
 		view = &i915_ggtt_view_rotated;
@@ -2951,14 +2951,14 @@ unsigned long intel_plane_obj_offset(struct intel_plane *intel_plane,
 		view->type))
 		return -1;
 
-	offset = (unsigned char *)vma->node.start;
+	offset = vma->node.start;
 
 	if (plane == 1) {
 		offset += vma->ggtt_view.rotation_info.uv_start_page *
 			  PAGE_SIZE;
 	}
 
-	return (unsigned long)offset;
+	return offset;
 }
 
 static void skl_detach_scaler(struct intel_crtc *intel_crtc, int id)
-- 
2.3.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] drm, i915: Fix pointer size cast Borislav Petkov <bp@alien8.de> - 2015-12-21 20:00 +0100
  Re: [Intel-gfx] [PATCH] drm, i915: Fix pointer size cast Daniel Vetter <daniel@ffwll.ch> - 2015-12-21 20:30 +0100

csiph-web