From patchwork Wed Dec 12 16:16:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 1869621 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 F36F0DF266 for ; Wed, 12 Dec 2012 18:14:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 09BA6E660D for ; Wed, 12 Dec 2012 10:14:26 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A5DAE5FD7; Wed, 12 Dec 2012 08:21:33 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 12 Dec 2012 08:21:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,267,1355126400"; d="scan'208";a="261178282" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.168]) by fmsmga001.fm.intel.com with SMTP; 12 Dec 2012 08:21:14 -0800 Received: by stinkbox (sSMTP sendmail emulation); Wed, 12 Dec 2012 18:21:13 +0200 From: ville.syrjala@linux.intel.com To: dri-devel@lists.freedesktop.org Subject: [PATCH 73/81] drm/i915: Use new_crtc when checking if CRTC is in use Date: Wed, 12 Dec 2012 18:16:40 +0200 Message-Id: <1355329008-31459-74-git-send-email-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1355329008-31459-1-git-send-email-ville.syrjala@linux.intel.com> References: <1355329008-31459-1-git-send-email-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Cc: intel-gfx@lists.freedesktop.org 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: , 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 From: Ville Syrjälä The atomic check() hook is interested in the staged new configuration, so it must use the intel_encoder::new_crtc pointer when checking if a CRTC is in use or not. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/intel_atomic.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index 3f093d6..ec79354 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -150,6 +150,18 @@ static void update_encoders_bitmask(struct intel_crtc *intel_crtc, } } +static bool intel_crtc_in_use(struct intel_crtc *intel_crtc) +{ + struct drm_device *dev = intel_crtc->base.dev; + struct intel_encoder *intel_encoder; + + list_for_each_entry(intel_encoder, &dev->mode_config.encoder_list, base.head) + if (intel_encoder->new_crtc == intel_crtc) + return true; + + return false; +} + static bool intel_encoder_in_use(struct intel_encoder *intel_encoder) { struct drm_device *dev = intel_encoder->base.dev; @@ -1246,12 +1258,12 @@ static int check_crtc(struct intel_crtc_state *s) if (crtc->enabled) { if (!fb) return -EINVAL; - if (!drm_helper_crtc_in_use(crtc)) + if (!intel_crtc_in_use(intel_crtc)) return -EINVAL; } else { if (fb) return -EINVAL; - if (drm_helper_crtc_in_use(crtc)) + if (intel_crtc_in_use(intel_crtc)) return -EINVAL; }