From patchwork Fri Sep 7 08:14:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1420931 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 08E1ADF283 for ; Fri, 7 Sep 2012 09:22:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C854E9ED97 for ; Fri, 7 Sep 2012 02:22:29 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-bk0-f49.google.com (mail-bk0-f49.google.com [209.85.214.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 5CB6B9E86E for ; Fri, 7 Sep 2012 02:22:18 -0700 (PDT) Received: by bkcji2 with SMTP id ji2so1255373bkc.36 for ; Fri, 07 Sep 2012 02:22:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer; bh=lqu+maj6zOTUvC2dXccQfeIOCetW26rVp+rvjkk9TZc=; b=Y8dURjA1hJvVYdtAd60gQry6ZCmurrUMFw6lfQaWGLLrygKDHi+ZMEapF9HCrXBPw2 F7vd/ZzMp4aNL9pysKV8xDqWGZTfdN6F4h65itaST2F2ajn5uyu0DyS0g0u2UG7gWRm+ 1KsIGiq/pkIFsl9lj3GjwtOO3B9rZ99ZSqhDU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=lqu+maj6zOTUvC2dXccQfeIOCetW26rVp+rvjkk9TZc=; b=FTqocjoiZB8b5B3dZFBBueS0g9WeHf9A9npbjAhSc01QckF5cIGQkgfLft8wB9XPtB WBuWa2jV5tejUFm2HWBLqpEkZETmkkLjVCXpMN0prPjiNWRpGNeQIuF1bW7r1hTj/DZV b/D3hPJPQHbjOV78Z3FK5LtlmeGEfL9xIhDVLBcBV9L6xxStbqu9G0IefBePADxnrlLh nNE4ELYJH9qOZeKtQRMBgqEUwl0W1zgpET0W2a3dbLx9OAo+F0C1NPBamsLaEKcVblkQ k2eYCjj1gS6YLv7HDuVJ1UMkxS0ytMpmH2tmCQXs+Tkr80ck4LVF+3xLdpDs57b0zz49 8REA== Received: by 10.204.145.76 with SMTP id c12mr2303664bkv.70.1347009736862; Fri, 07 Sep 2012 02:22:16 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id n5sm2869137bkv.14.2012.09.07.02.22.14 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 07 Sep 2012 02:22:15 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Subject: [PATCH] drm/fb helper: don't call drm_helper_connector_dpms directly Date: Fri, 7 Sep 2012 10:14:52 +0200 Message-Id: <1347005692-1459-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 X-Gm-Message-State: ALoCoQnFzKy8AiVOzSya/Lek554SIZypboAuEFEnqy/V+RHlllutFL1o/Ti8fW9mbW++ud2J4kh7 Cc: Daniel Vetter , DRI Development X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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 Yet again a case where the fb helper is too intimate with the crtc helper and calls a crtc helepr function directly instead of going through the interface vtable. This fixes console blanking in drm/i915 with the new i915-specific modeset code. Reported-by: Jesse Barnes Signed-off-by: Daniel Vetter Tested-by: Jesse Barnes --- drivers/gpu/drm/drm_fb_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index eb79515..b5d05f5 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -330,7 +330,7 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) /* Walk the connectors & encoders on this fb turning them on/off */ for (j = 0; j < fb_helper->connector_count; j++) { connector = fb_helper->connector_info[j]->connector; - drm_helper_connector_dpms(connector, dpms_mode); + connector->funcs->dpms(connector, dpms_mode); drm_connector_property_set_value(connector, dev->mode_config.dpms_property, dpms_mode); }