From patchwork Thu Apr 24 21:54:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 4054601 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 17FBFBFF02 for ; Thu, 24 Apr 2014 21:55:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E3F220364 for ; Thu, 24 Apr 2014 21:55:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7010720373 for ; Thu, 24 Apr 2014 21:55:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CB5C46ED42; Thu, 24 Apr 2014 14:55:54 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 71B9B6ED41 for ; Thu, 24 Apr 2014 14:55:53 -0700 (PDT) Received: by mail-ee0-f43.google.com with SMTP id e53so2282005eek.2 for ; Thu, 24 Apr 2014 14:55:52 -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:in-reply-to:references; bh=BcB20pNgnpZq7iGB4hJo5EAeXNVFZqCBurT0xkbvDBI=; b=SVnNnhBgVboTYg2Ne0c/12HHHI94Ho2938xfbWdF+QYA6ipSpcLqStosMECLpcZvQD GmAuQ4cfeodbVOokx1EtR5dZhuwUcE5f/pj7zVUtk9evdnXYqkTC4osBCLa7twQRtVQe oCJ13iuliVKpbPpoT4ho+YbU9tE7xSiTpyJys= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BcB20pNgnpZq7iGB4hJo5EAeXNVFZqCBurT0xkbvDBI=; b=KhpJRGlTZBcp0JVLkzI1rsSbVx6j3dURiJV3RSYlHiD91g+gMipIJFigog/CBw0imk xTEt2xxCwIMMcjM+BX5ZFe98tQBm7sJ73iPD/XAgnoNQthDBASNDGckR1pPfxpZDBeB/ TwTXha/2b8ZTClEjdv6jmSzr/vBTYM4FdgN9w4Q2bNKZu7m79b9OX8+pahPNFdkz2x4f kEJ3RgHO/NEW8KhqeZOdLbG6E0F8I352hgd34qdYM8Zy4T23gdE76VbZWmdBWC8vtTUx quDoOIP3bRgXzR4FtDUZCUnxQ8MEXv+xJ4e2uTpSg5OGbTHDS5uYDaj3Fqal/czKylXM oH8g== X-Gm-Message-State: ALoCoQnqI4OGBAO6S4ilXsNhzM774Fj04BgGMmH4+TneP604wppVRyCM8e30eWUtEw9gZRKbRUdT X-Received: by 10.14.4.201 with SMTP id 49mr4978148eej.13.1398376552474; Thu, 24 Apr 2014 14:55:52 -0700 (PDT) Received: from natalie.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id y51sm19407244eeu.0.2014.04.24.14.55.51 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Thu, 24 Apr 2014 14:55:51 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 24 Apr 2014 23:54:37 +0200 Message-Id: <1398376542-27825-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1398376542-27825-1-git-send-email-daniel.vetter@ffwll.ch> References: <1398376542-27825-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 01/66] drm/i915: Make encoder->mode_set callbacks optional X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For a bunch of reasons we want to move away from the ->mode_set callbacks: All hw state setup needs to move into ->enable hooks (so that DOMS can do runtime pm) and all the configuration setup needs to move into the compute_config functions. To start with this make the enocer->mode_set callback optional. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b57210c52f00..5fed7aaf879d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7219,7 +7219,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, encoder->base.base.id, drm_get_encoder_name(&encoder->base), mode->base.id, mode->name); - encoder->mode_set(encoder); + + if (encoder->mode_set) + encoder->mode_set(encoder); } return 0;