From patchwork Wed May 25 09:41:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 815492 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4P9fFT1015131 for ; Wed, 25 May 2011 09:41:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754687Ab1EYJlN (ORCPT ); Wed, 25 May 2011 05:41:13 -0400 Received: from perceval.ideasonboard.com ([95.142.166.194]:54748 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753116Ab1EYJlM (ORCPT ); Wed, 25 May 2011 05:41:12 -0400 Received: from localhost.localdomain (unknown [91.178.221.65]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 45F603599C; Wed, 25 May 2011 09:41:11 +0000 (UTC) From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: Andy Walls Subject: [PATCH] ivtv: use display information in info not in var for panning Date: Wed, 25 May 2011 11:41:23 +0200 Message-Id: <1306316483-12899-1-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 1.7.3.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 25 May 2011 09:41:16 +0000 (UTC) We must not use any information in the passed var besides xoffset, yoffset and vmode as otherwise applications might abuse it. Also use the aligned fix.line_length and not the (possible) unaligned xres_virtual. Signed-off-by: Laurent Pinchart Cc: Andy Walls --- drivers/media/video/ivtv/ivtvfb.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Andy, This patch hasn't been tested as I don't have access to ivtv hardware. Can you push it through your tree if it works for you ? You could CC stable@kernel.org as well. diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index 1724745..2d5a974 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c @@ -836,7 +836,8 @@ static int ivtvfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *inf u32 osd_pan_index; struct ivtv *itv = (struct ivtv *) info->par; - osd_pan_index = (var->xoffset + (var->yoffset * var->xres_virtual))*var->bits_per_pixel/8; + osd_pan_index = var->yoffset * info->fix.line_length + + var->xoffset * info->var.bits_per_pixel / 8; write_reg(osd_pan_index, 0x02A0C); /* Pass this info back the yuv handler */