From patchwork Mon Apr 19 09:53:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12211327 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=-18.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 1C56CC433B4 for ; Mon, 19 Apr 2021 09:53:23 +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 C9A516108B for ; Mon, 19 Apr 2021 09:53:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9A516108B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0A31189D60; Mon, 19 Apr 2021 09:53:22 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 33CE389D60; Mon, 19 Apr 2021 09:53:21 +0000 (UTC) IronPort-SDR: FESaKx8ss5QEbEa8sQJi1RWqsxQLVL1ILoYv9EHiJO9koTIV6CCgggeVXYbkw9DiPPOwdi4rAi w/pC4wfkB2Ig== X-IronPort-AV: E=McAfee;i="6200,9189,9958"; a="195328143" X-IronPort-AV: E=Sophos;i="5.82,233,1613462400"; d="scan'208";a="195328143" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2021 02:53:20 -0700 IronPort-SDR: 1Tls3LbWqRXpLGpE52EFcOSEw3Z97tIR6WDzH/Woaqwqfzuiy7Jq4BzmtUB14FDkvEFbzOecbB B0WOYuancBbw== X-IronPort-AV: E=Sophos;i="5.82,233,1613462400"; d="scan'208";a="426448067" Received: from ahenriks-mobl1.ger.corp.intel.com (HELO localhost) ([10.249.37.135]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2021 02:53:14 -0700 From: Jani Nikula To: Joonas Lahtinen , Rodrigo Vivi Subject: [PULL] topic/intel-gen-to-ver -> drm-intel-next and drm-intel-gt-next Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Date: Mon, 19 Apr 2021 12:53:11 +0300 Message-ID: <878s5ebny0.fsf@intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tvrtko Ursulin , dim-tools@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Jason Ekstrand , Daniel Vetter , Sean Paul , Lucas De Marchi Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Joonas and Rodrigo - Here's the gen to ver conversion topic branch to be merged to both drm-intel-next and drm-intel-gt-next. Lots of Cc's for heads up. BR, Jani. topic/intel-gen-to-ver-2021-04-19: Gen to ver conversions across the driver The main change is Lucas' series [1], with Ville's GLK fixes [2] and a cherry-pick of Matt's commit [3] from drm-intel-next as a base to avoid conflicts. [1] https://patchwork.freedesktop.org/series/88825/ [2] https://patchwork.freedesktop.org/series/88938/ [3] 70bfb30743d5 ("drm/i915/display: Eliminate IS_GEN9_{BC,LP}") BR, Jani. The following changes since commit 9c0fed84d5750e1eea6c664e073ffa2534a17743: Merge tag 'drm-intel-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2021-04-08 14:02:21 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/topic/intel-gen-to-ver-2021-04-19 for you to fetch changes up to 425390c5dce6da76578389629d19517fcd79c959: drm/i915: split dgfx features from gen 12 (2021-04-14 13:05:06 +0300) ---------------------------------------------------------------- Gen to ver conversions across the driver The main change is Lucas' series [1], with Ville's GLK fixes [2] and a cherry-pick of Matt's commit [3] from drm-intel-next as a base to avoid conflicts. [1] https://patchwork.freedesktop.org/series/88825/ [2] https://patchwork.freedesktop.org/series/88938/ [3] 70bfb30743d5 ("drm/i915/display: Eliminate IS_GEN9_{BC,LP}") ---------------------------------------------------------------- Lucas De Marchi (12): drm/i915/display: use DISPLAY_VER() on remaining users drm/i915: rename display.version to display.ver drm/i915/display: rename display version macros drm/i915: add macros for graphics and media versions drm/i915/gt: replace gen use in intel_engine_cs drm/i915/selftests: replace unused mask with simple version drm/i915/selftests: eliminate use of gen_mask drm/i915: finish removal of gen_mask drm/i915: eliminate remaining uses of intel_device_info->gen drm/i915: finish removal of gen from intel_device_info drm/i915: add media and display versions to device_info print drm/i915: split dgfx features from gen 12 Matt Roper (1): drm/i915/display: Eliminate IS_GEN9_{BC,LP} 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/i9xx_plane.c | 2 +- drivers/gpu/drm/i915/display/icl_dsi.c | 4 +- drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- drivers/gpu/drm/i915/display/intel_audio.c | 4 +- drivers/gpu/drm/i915/display/intel_bios.c | 9 +-- drivers/gpu/drm/i915/display/intel_bw.c | 8 +-- drivers/gpu/drm/i915/display/intel_cdclk.c | 42 +++++++------- drivers/gpu/drm/i915/display/intel_color.c | 6 +- drivers/gpu/drm/i915/display/intel_crt.c | 6 +- drivers/gpu/drm/i915/display/intel_crtc.c | 4 +- drivers/gpu/drm/i915/display/intel_csr.c | 4 +- drivers/gpu/drm/i915/display/intel_ddi.c | 53 +++++++++--------- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 10 ++-- drivers/gpu/drm/i915/display/intel_display.c | 64 +++++++++++----------- .../gpu/drm/i915/display/intel_display_debugfs.c | 2 +- drivers/gpu/drm/i915/display/intel_display_power.c | 57 ++++++++++--------- drivers/gpu/drm/i915/display/intel_dp.c | 10 ++-- .../gpu/drm/i915/display/intel_dp_link_training.c | 2 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll.c | 8 +-- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 6 +- drivers/gpu/drm/i915/display/intel_fb.c | 2 +- drivers/gpu/drm/i915/display/intel_fbc.c | 21 +++---- drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 4 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 12 ++-- drivers/gpu/drm/i915/display/intel_hdcp.c | 9 +-- drivers/gpu/drm/i915/display/intel_hdmi.c | 9 +-- drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- drivers/gpu/drm/i915/display/intel_overlay.c | 10 ++-- drivers/gpu/drm/i915/display/intel_panel.c | 10 ++-- drivers/gpu/drm/i915/display/intel_pipe_crc.c | 4 +- drivers/gpu/drm/i915/display/intel_pps.c | 14 ++--- drivers/gpu/drm/i915/display/intel_psr.c | 4 +- drivers/gpu/drm/i915/display/intel_tc.c | 6 +- drivers/gpu/drm/i915/display/intel_tv.c | 6 +- drivers/gpu/drm/i915/display/skl_universal_plane.c | 10 ++-- drivers/gpu/drm/i915/display/vlv_dsi.c | 46 ++++++++-------- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 22 ++++---- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 40 +++++++------- drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 18 +++--- drivers/gpu/drm/i915/gt/selftest_workarounds.c | 10 ++-- drivers/gpu/drm/i915/i915_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 42 ++++++++------ drivers/gpu/drm/i915/i915_irq.c | 23 ++++---- drivers/gpu/drm/i915/i915_pci.c | 13 +++-- drivers/gpu/drm/i915/intel_device_info.c | 4 +- drivers/gpu/drm/i915/intel_device_info.h | 6 +- drivers/gpu/drm/i915/intel_pm.c | 50 ++++++++--------- drivers/gpu/drm/i915/intel_uncore.c | 8 ++- drivers/gpu/drm/i915/selftests/intel_uncore.c | 8 ++- drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- 51 files changed, 376 insertions(+), 348 deletions(-)