From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06AA9C433E0 for ; Mon, 8 Jun 2020 18:26:59 +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 D6A3B206D5 for ; Mon, 8 Jun 2020 18:26:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6A3B206D5 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 76A2889DE3; Mon, 8 Jun 2020 18:26:58 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id D0DA989DE3 for ; Mon, 8 Jun 2020 18:26:57 +0000 (UTC) IronPort-SDR: Wg6SiGVFz1UkZ/MIRnZSEF0nivii3s5C6GCVPQKMPMp0bDU0zgE38FknoTsGLniCw8+g7H4B2I rWTsqCbgEjOQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2020 11:26:56 -0700 IronPort-SDR: hrrzG5md3KKI8MLPli8+jF0bGZmtjxWwME/06sE0y6ReQIkAKZdjIMUFtSgyHZpq8D4c5eP8vA SVqS1d5tdO5g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,487,1583222400"; d="scan'208";a="270612774" Received: from ideak-desk.fi.intel.com ([10.237.72.183]) by orsmga003.jf.intel.com with ESMTP; 08 Jun 2020 11:26:55 -0700 From: Imre Deak To: intel-gfx@lists.freedesktop.org Date: Mon, 8 Jun 2020 21:26:50 +0300 Message-Id: <20200608182650.13642-1-imre.deak@intel.com> X-Mailer: git-send-email 2.23.1 In-Reply-To: <20200608181023.11503-1-imre.deak@intel.com> References: <20200608181023.11503-1-imre.deak@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2] drm/i915: Fix the i915_dsc_fec_support debugfs file for DP MST connectors 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" DSC is not supported on DP MST streams so just return -EINVAL when reading/writing the i915_dsc_fec_support debugfs file for such connectors. This also fixes an OOPS, caused by the encoder->digport cast, which is not valid for MST encoders. v2: - Check encoder, which is unset for an MST connector, before it gets enabled. Signed-off-by: Imre Deak --- .../drm/i915/display/intel_display_debugfs.c | 36 +++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c index 2b640d8ab9d2..9db6f7e0ccaa 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c @@ -2094,6 +2094,8 @@ static int i915_dsc_fec_support_show(struct seq_file *m, void *data) drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE); do { + struct intel_encoder *encoder; + try_again = false; ret = drm_modeset_lock(&dev->mode_config.connection_mutex, &ctx); @@ -2120,8 +2122,17 @@ static int i915_dsc_fec_support_show(struct seq_file *m, void *data) } else if (ret) { break; } - intel_dp = intel_attached_dp(to_intel_connector(connector)); + + encoder = intel_attached_encoder(to_intel_connector(connector)); + /* TODO: Add DSC support for MST streams */ + if (encoder->type == INTEL_OUTPUT_DP_MST) { + ret = -EINVAL; + break; + } + + intel_dp = &enc_to_dig_port(encoder)->dp; crtc_state = to_intel_crtc_state(crtc->state); + seq_printf(m, "DSC_Enabled: %s\n", yesno(crtc_state->dsc.compression_enable)); seq_printf(m, "DSC_Sink_Support: %s\n", @@ -2147,9 +2158,8 @@ static ssize_t i915_dsc_fec_support_write(struct file *file, int ret; struct drm_connector *connector = ((struct seq_file *)file->private_data)->private; - struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector)); - struct drm_i915_private *i915 = to_i915(encoder->base.dev); - struct intel_dp *intel_dp = enc_to_intel_dp(encoder); + struct drm_i915_private *i915 = to_i915(connector->dev); + struct intel_encoder *encoder; if (len == 0) return 0; @@ -2163,10 +2173,22 @@ static ssize_t i915_dsc_fec_support_write(struct file *file, drm_dbg(&i915->drm, "Got %s for DSC Enable\n", (dsc_enable) ? "true" : "false"); - intel_dp->force_dsc_en = dsc_enable; - *offp += len; - return len; + drm_modeset_lock(&i915->drm.mode_config.connection_mutex, NULL); + + encoder = intel_attached_encoder(to_intel_connector(connector)); + /* TODO: Add DSC support for MST streams */ + if (!encoder || encoder->type == INTEL_OUTPUT_DP_MST) { + ret = -EINVAL; + } else { + enc_to_intel_dp(encoder)->force_dsc_en = dsc_enable; + *offp += len; + ret = len; + } + + drm_modeset_unlock(&i915->drm.mode_config.connection_mutex); + + return ret; } static int i915_dsc_fec_support_open(struct inode *inode, -- 2.23.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx