Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751451AbbLUSyS (ORCPT ); Mon, 21 Dec 2015 13:54:18 -0500 Received: from mail.skyhub.de ([78.46.96.112]:46955 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750914AbbLUSyP (ORCPT ); Mon, 21 Dec 2015 13:54:15 -0500 From: Borislav Petkov To: LKML Cc: Daniel Vetter , Jani Nikula , David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH] drm, i915: Fix pointer size cast Date: Mon, 21 Dec 2015 19:53:59 +0100 Message-Id: <1450724039-23264-1-git-send-email-bp@alien8.de> X-Mailer: git-send-email 2.3.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2102 Lines: 64 From: Borislav Petkov 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 Cc: Jani Nikula Cc: David Airlie Cc: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Borislav Petkov --- 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/