From patchwork Thu Apr 4 08:06:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kulkarni, Vandita" X-Patchwork-Id: 10885257 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0AAC817E1 for ; Thu, 4 Apr 2019 08:26:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAE7B24603 for ; Thu, 4 Apr 2019 08:26:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF0C5285DD; Thu, 4 Apr 2019 08:26:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9B10724603 for ; Thu, 4 Apr 2019 08:26:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F31F6E9DF; Thu, 4 Apr 2019 08:26:38 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4FAE76E9DD for ; Thu, 4 Apr 2019 08:26:36 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Apr 2019 01:26:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,306,1549958400"; d="scan'208";a="220454020" Received: from vandita-desktop.iind.intel.com ([10.223.74.201]) by orsmga001.jf.intel.com with ESMTP; 04 Apr 2019 01:26:34 -0700 From: Vandita Kulkarni To: intel-gfx@lists.freedesktop.org Date: Thu, 4 Apr 2019 13:36:26 +0530 Message-Id: <1554365187-30575-3-git-send-email-vandita.kulkarni@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1554365187-30575-1-git-send-email-vandita.kulkarni@intel.com> References: <1554365187-30575-1-git-send-email-vandita.kulkarni@intel.com> Subject: [Intel-gfx] [PATCH 2/3] drm/i915: Fix pipe config mismatch for bpp, output format X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Read back the pixel fomrat register and get the bpp. Signed-off-by: Vandita Kulkarni --- drivers/gpu/drm/i915/icl_dsi.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/gpu/drm/i915/icl_dsi.c b/drivers/gpu/drm/i915/icl_dsi.c index db6bc3d..69cd6b2 100644 --- a/drivers/gpu/drm/i915/icl_dsi.c +++ b/drivers/gpu/drm/i915/icl_dsi.c @@ -1226,6 +1226,30 @@ static void gen11_dsi_get_timings(struct intel_encoder *encoder, adjusted_mode->crtc_vsync_end = ((tmp >> 16) & 0xffff) + 1; } +enum mipi_dsi_pixel_format +gen11_dsi_get_pixel_fmt(struct drm_i915_private *dev_priv, + struct intel_crtc_state *pipe_config) +{ + u32 tmp; + /* get config for dsi0 transcoder only */ + enum transcoder cpu_transcoder = pipe_config->cpu_transcoder; + + tmp = I915_READ(DSI_TRANS_FUNC_CONF(cpu_transcoder)); + tmp &= PIX_FMT_MASK; + + switch (tmp) { + default: + case PIX_FMT_RGB565: + return MIPI_DSI_FMT_RGB565; + case PIX_FMT_RGB666_PACKED: + return MIPI_DSI_FMT_RGB666_PACKED; + case PIX_FMT_RGB666_LOOSE: + return MIPI_DSI_FMT_RGB666; + case PIX_FMT_RGB888: + return MIPI_DSI_FMT_RGB888; + } +} + static void gen11_dsi_get_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config) { @@ -1238,6 +1262,9 @@ static void gen11_dsi_get_config(struct intel_encoder *encoder, pipe_config->base.adjusted_mode.crtc_clock = intel_dsi->pclk; gen11_dsi_get_timings(encoder, pipe_config); pipe_config->output_types |= BIT(INTEL_OUTPUT_DSI); + pipe_config->pipe_bpp = mipi_dsi_pixel_format_to_bpp + (gen11_dsi_get_pixel_fmt(dev_priv, + pipe_config)); } static int gen11_dsi_compute_config(struct intel_encoder *encoder, @@ -1253,6 +1280,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; + pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB; intel_fixed_panel_mode(fixed_mode, adjusted_mode); intel_pch_panel_fitting(crtc, pipe_config, conn_state->scaling_mode);