From patchwork Fri Jan 14 19:02:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anca Emanuel X-Patchwork-Id: 480081 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0EJ2VKi032007 for ; Fri, 14 Jan 2011 19:02:53 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C62759F64E for ; Fri, 14 Jan 2011 11:02:31 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ww0-f43.google.com (mail-ww0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id F14819E79E for ; Fri, 14 Jan 2011 11:02:18 -0800 (PST) Received: by wwi17 with SMTP id 17so3052929wwi.12 for ; Fri, 14 Jan 2011 11:02:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=vqUMsoZLNQd3hwdXKBRyUPSdYPT4koUsKy9Rcb0BJkU=; b=sWuumd+wTnCLHA47qqQailoXM1SBKM1QbBcPdovC2hckwy1cZsBi+/sw0WS9a3YTQU hFF8Mt0naHExHr73jFZHr8YNFSb23no5b7xCH2nQ4O/gt4zHu7pmdAoXrW7RceEPPZi3 b7GKEiRtUJj0hJQqYcEpD/KhT4a1NKrG8NP3s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=AsGRFfAu/UwIBvZ4hHehAdfas2X9U9HxX565JI556SHn0kuKO+gJSfrsp+N7Jsr/jF QfG+OTdtuQ6CRlG4xd3sW40dUdvwgjG5lVpden5wqNrETOSK0KW3xU/cyWC1h/+UBcrT yAWaz9Tp2kVgaD4yKMR+MzE/QUzaXaDg60RUw= MIME-Version: 1.0 Received: by 10.227.156.9 with SMTP id u9mr1061929wbw.142.1295031738092; Fri, 14 Jan 2011 11:02:18 -0800 (PST) Received: by 10.227.128.199 with HTTP; Fri, 14 Jan 2011 11:02:17 -0800 (PST) In-Reply-To: References: <4D2CE5C8.60601@de.ibm.com> <4D2D8ED0.6080807@de.ibm.com> Date: Fri, 14 Jan 2011 21:02:17 +0200 Message-ID: Subject: Re: [git pull] drm for rc1 From: Anca Emanuel To: James Simmons Cc: Christian Borntraeger , Linux Kernel Mailing List , DRI mailing list X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 14 Jan 2011 19:03:09 +0000 (UTC) X-MIME-Autoconverted: from quoted-printable to 8bit by demeter1.kernel.org id p0EJ2VKi032007 diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 0307d60..beded14 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -609,6 +609,7 @@ EXPORT_SYMBOL(drm_fb_helper_fini); void drm_fb_helper_fill_fix(struct fb_info *info, struct drm_framebuffer *fb) { + DRM_INFO("pitch %d, depth %d\n", fb->pitch, fb->depth); info->fix.type = FB_TYPE_PACKED_PIXELS; info->fix.visual = fb->depth == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR; @@ -973,7 +974,6 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_h if (new_fb) { info->var.pixclock = 0; - drm_fb_helper_fill_fix(info, fb_helper->fb); if (register_framebuffer(info) < 0) { return -EINVAL; } diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/n index a26d047..3896771 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 0307d60..beded14 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -609,6 +609,7 @@ EXPORT_SYMBOL(drm_fb_helper_fini); void drm_fb_helper_fill_fix(struct fb_info *info, struct drm_framebuffer *fb) { + DRM_INFO("pitch %d, depth %d\n", fb->pitch, fb->depth); info->fix.type = FB_TYPE_PACKED_PIXELS; info->fix.visual = fb->depth == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR; @@ -973,7 +974,6 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_h if (new_fb) { info->var.pixclock = 0; - drm_fb_helper_fill_fix(info, fb_helper->fb); if (register_framebuffer(info) < 0) { return -EINVAL; }