From patchwork Fri Jan 24 23:54:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Navare, Manasi" X-Patchwork-Id: 11351325 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8722C109A for ; Fri, 24 Jan 2020 23:53:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6F35520727 for ; Fri, 24 Jan 2020 23:53:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6F35520727 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5BCF172BE8; Fri, 24 Jan 2020 23:53:41 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id D116E72BE8 for ; Fri, 24 Jan 2020 23:53:39 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jan 2020 15:53:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,359,1574150400"; d="scan'208";a="400807383" Received: from labuser-z97x-ud5h.jf.intel.com ([10.165.21.211]) by orsmga005.jf.intel.com with ESMTP; 24 Jan 2020 15:53:39 -0800 From: Manasi Navare To: intel-gfx@lists.freedesktop.org Date: Fri, 24 Jan 2020 15:54:40 -0800 Message-Id: <20200124235440.15974-1-manasi.d.navare@intel.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [Intel-gfx] [CI] drm/i915/dp: Modeset only the tiled connectors with CRTC X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" In case of tiled connectors if one of the tiled connectors in state needs a full modeset we add other tiled connectors to the state. Make sure that the connector has a CRTC before forcing a modeset on that else it fails committing the state. Cc: Ville Syrjälä Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get added to the state with full modeset") Closes: https://gitlab.freedesktop.org/drm/intel/issues/516 Signed-off-by: Manasi Navare Acked-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_display.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 32c6940c9077..81addaea616b 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -13155,11 +13155,12 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config) } /* Get total number of tiled connectors in state that belong to - * this tile group. + * this tile group and that have a CRTC */ for_each_new_connector_in_state(state, connector, connector_state, i) { if (connector->has_tile && - connector->tile_group->id == tile_group_id) + connector->tile_group->id == tile_group_id && + connector_state->crtc) num_tiled_conns++; } @@ -14506,13 +14507,14 @@ intel_modeset_all_tiles(struct intel_atomic_state *state, int tile_grp_id) continue; conn_state = drm_atomic_get_connector_state(&state->base, connector); + if (IS_ERR(conn_state)) { ret = PTR_ERR(conn_state); break; } if (!conn_state->crtc) - continue; + break; crtc_state = drm_atomic_get_crtc_state(&state->base, conn_state->crtc); @@ -14549,6 +14551,8 @@ intel_atomic_check_tiled_conns(struct intel_atomic_state *state) continue; if (!intel_connector_needs_modeset(state, connector)) continue; + if (!new_conn_state->crtc) + continue; ret = intel_modeset_all_tiles(state, connector->tile_group->id); if (ret)