From patchwork Mon Nov 18 08:00:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3195591 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 468D8C045B for ; Mon, 18 Nov 2013 08:01:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13D0B206F5 for ; Mon, 18 Nov 2013 08:01:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D8CB2206E8 for ; Mon, 18 Nov 2013 08:01:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C99EB105A1E; Mon, 18 Nov 2013 00:01:11 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f173.google.com (mail-ea0-f173.google.com [209.85.215.173]) by gabe.freedesktop.org (Postfix) with ESMTP id F3340105A1F for ; Mon, 18 Nov 2013 00:01:09 -0800 (PST) Received: by mail-ea0-f173.google.com with SMTP id g15so1436127eak.4 for ; Mon, 18 Nov 2013 00:01:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=1op5brIq2yw4etymScTGVFqaTUCyWbhMOVqVvCoAm74=; b=EVHE6mG1Eo8/J4tb+euuN7aof28B7um2si5kObCbZ/KjDBJA/tU2W9X+53Xk633sgN TWx7pyH5nvxDv2GDsop4KD/ManyJntnVaExnoCUrsPoazxgAcGwFkcXmba6frb1+iPOs /aN3waFjUbnyJQtcyFBlPyRWfBxjGVrBrTNmw= 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:mime-version :content-type:content-transfer-encoding; bh=1op5brIq2yw4etymScTGVFqaTUCyWbhMOVqVvCoAm74=; b=dbGzIkseNJN06UWImWodgV+VQg38SPqbSvZ5k7cr31QSzsYiygzRpXQpuF2DxfqmOZ j2F3lQ46tLsUEBiRhan7iBkbOioJk42IT756CN+Ugh7tnHWU5CUnQs5nhikZ/esQj/ok NQejhOy0rIIO6str17pEmnLhDe/2BKoahgaej8klc9KjTLoMCbwbQ6Ug86seuPGxxjK7 RVZfig5fR4AMJEfW8LNjZIybcyCmZCqZiB6cXlY6e/vmpgJEn1MzUM/A+/gDjJkZuK9L VQuoEyQWK92rYvv0zlvKDh5JYPgGR6ZoDERIjPMaTPvqts6pR9f86y8fxddrEQR5ibS1 s4uA== X-Gm-Message-State: ALoCoQlUWFWsBI3TJYkGTMgxJjmcUioXvP+VDoDaBC8PwWjL2u5y7DHT5s3YvkGhTNNzVKSmUu5P X-Received: by 10.14.219.198 with SMTP id m46mr10933995eep.41.1384761668885; Mon, 18 Nov 2013 00:01:08 -0800 (PST) Received: from gina.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id 8sm35128692eem.15.2013.11.18.00.01.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Nov 2013 00:01:08 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Mon, 18 Nov 2013 09:00:58 +0100 Message-Id: <1384761659-4915-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.rc3 MIME-Version: 1.0 Cc: Jani Nikula , Daniel Vetter Subject: [Intel-gfx] [PATCH 1/2] drm/i915/tv: add ->get_config callback X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.6 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 We need this to properly fill in adjusted_mode.crtc_clock, otherwise the state checker gets unhappy. This seems to have been forgotten in the big clock rework in commit 18442d08786472c63a0a80c27f92b033dffc26de Author: Ville Syrjälä Date: Fri Sep 13 16:00:08 2013 +0300 drm/i915: Fix port_clock and adjusted_mode.clock readout all over Cc: Ville Syrjälä Cc: Jani Nikula Signed-off-by: Daniel Vetter Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/i915/intel_tv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 18c406246a2d..22cf0f4ba248 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -902,6 +902,13 @@ intel_tv_mode_valid(struct drm_connector *connector, } +static void +intel_tv_get_config(struct intel_encoder *encoder, + struct intel_crtc_config *pipe_config) +{ + pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; +} + static bool intel_tv_compute_config(struct intel_encoder *encoder, struct intel_crtc_config *pipe_config) @@ -1621,6 +1628,7 @@ intel_tv_init(struct drm_device *dev) DRM_MODE_ENCODER_TVDAC); intel_encoder->compute_config = intel_tv_compute_config; + intel_encoder->get_config = intel_tv_get_config; intel_encoder->mode_set = intel_tv_mode_set; intel_encoder->enable = intel_enable_tv; intel_encoder->disable = intel_disable_tv;