From patchwork Mon Apr 12 05:46:02 2021 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: 12196873 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=-11.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,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 934D7C433ED for ; Mon, 12 Apr 2021 05:46:15 +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 2085B60241 for ; Mon, 12 Apr 2021 05:46:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2085B60241 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 7892789E32; Mon, 12 Apr 2021 05:46:14 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CE4989E32 for ; Mon, 12 Apr 2021 05:46:13 +0000 (UTC) IronPort-SDR: PK/Y570FytVhEkqpVpjJ1zQjmXiQbjqzT131vVAbAJ5BGPFHczh+Ym0lBp5o21gNSilewMWqsl ETrrHBSqi9dg== X-IronPort-AV: E=McAfee;i="6000,8403,9951"; a="194146705" X-IronPort-AV: E=Sophos;i="5.82,214,1613462400"; d="scan'208";a="194146705" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2021 22:46:10 -0700 IronPort-SDR: 6TT1U48OhgexkWXxbD2nNtRQ7bfR8tXoOlFYuME7aJmrIBNEorZ1jRfUWWieAdlArTRGrN0CJF dNehUQoC5gZg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,214,1613462400"; d="scan'208";a="423645798" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by orsmga008.jf.intel.com with SMTP; 11 Apr 2021 22:46:08 -0700 Received: by stinkbox (sSMTP sendmail emulation); Mon, 12 Apr 2021 08:46:07 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Mon, 12 Apr 2021 08:46:02 +0300 Message-Id: <20210412054607.18133-1-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 0/5] drm/i915: Fix glk display version regressions 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" From: Ville Syrjälä Fix a couple of regressions due to the glk display version 9->10 change. I *think* all the ones that slipped through involved either DISPLAY_VER==9 or DISPLAY_VER<10 checks. These three regressions are the ones I found through a quick scan, but someone should probably go through the whole tree with a fine toothcomb in case we missed more cases. Also tossed in a couple of cleanups. Cc: Matt Roper Ville Syrjälä (5): drm/i915: Restore lost glk FBC 16bpp w/a drm/i915: Restore lost glk ccs w/a drm/i915: Disable LTTPR detection on GLK once again drm/i915: Don't use {skl,cnl}_hpd_pin() for bxt/glk drm/i915: Remove a few redundant glk checks drivers/gpu/drm/i915/display/intel_ddi.c | 6 +++--- drivers/gpu/drm/i915/display/intel_display.c | 3 ++- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 +- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-)