From patchwork Tue Nov 6 21:51:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 10671495 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 7854D15A6 for ; Tue, 6 Nov 2018 21:51:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A38B2AD4F for ; Tue, 6 Nov 2018 21:51:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5EC1B2AE35; Tue, 6 Nov 2018 21:51:44 +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 E777C2AD4F for ; Tue, 6 Nov 2018 21:51:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 465B36E43D; Tue, 6 Nov 2018 21:51:43 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id BDE286E43C for ; Tue, 6 Nov 2018 21:51:41 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Nov 2018 13:51:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,473,1534834800"; d="scan'208";a="278870253" Received: from ldmartin-desk.jf.intel.com ([10.24.10.115]) by fmsmga006.fm.intel.com with ESMTP; 06 Nov 2018 13:51:41 -0800 From: Lucas De Marchi To: intel-gfx@lists.freedesktop.org Date: Tue, 6 Nov 2018 13:51:16 -0800 Message-Id: <20181106215123.27568-1-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.19.1.1.g56c4683e68 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2 0/7] Make GEN macros more similar 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: Rodrigo Vivi Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This is the second version of the series trying to make GEN checks more similar. These or roughly the changes from v1: - We don't have a single macro receiving 2 or 3 parameters. Now there is GT_GEN_RANGE(), and GT_GEN(). The firs is the conversion from IS_GEN() while the second is the conversion from IS_GEN() - Bring GEN_FOREVER back to be used with above macros - Patch converting <, <=, ==, >, >= checks using INTEL_GEN() to use the macros above was added - INTEL_GEN() is removed to avoid it being used when we should prefer the new macros The idea of the names is to pave the way for checks of the display version, which would be named DISPLAY_GEN(), DISPLAY_GEN_RANGE(). In the commit messages we have the scripts to regenerate the patch to make it easier to apply after the discussions and also to be able to convert inflight patches. Sorry in advance for the noise this causes in the codebase, but hopefully it is for the greater good. Lucas De Marchi (6): Revert "drm/i915: Kill GEN_FOREVER" drm/i915: replace IS_GEN with GT_GEN(..., N) drm/i915: rename IS_GEN9_* to GT_GEN9_* drm/i915: replace gen checks using operators by GT_GEN/GT_GEN_RANGE drm/i915: merge gen checks to use range drm/i915: remove INTEL_GEN macro Rodrigo Vivi (1): drm/i915: Rename IS_GEN to GT_RANGE drivers/gpu/drm/i915/gvt/gtt.c | 4 +- drivers/gpu/drm/i915/gvt/handlers.c | 2 +- drivers/gpu/drm/i915/gvt/vgpu.c | 4 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 145 +++++---- drivers/gpu/drm/i915/i915_drv.c | 50 +-- drivers/gpu/drm/i915/i915_drv.h | 67 ++-- drivers/gpu/drm/i915/i915_gem.c | 30 +- drivers/gpu/drm/i915/i915_gem_context.c | 4 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 10 +- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 16 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 36 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 15 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 12 +- drivers/gpu/drm/i915/i915_gpu_error.c | 62 ++-- drivers/gpu/drm/i915/i915_irq.c | 120 +++---- drivers/gpu/drm/i915/i915_perf.c | 14 +- drivers/gpu/drm/i915/i915_pmu.c | 6 +- drivers/gpu/drm/i915/i915_reg.h | 8 +- drivers/gpu/drm/i915/i915_suspend.c | 24 +- drivers/gpu/drm/i915/i915_sysfs.c | 2 +- drivers/gpu/drm/i915/intel_atomic.c | 4 +- drivers/gpu/drm/i915/intel_audio.c | 4 +- drivers/gpu/drm/i915/intel_bios.c | 12 +- drivers/gpu/drm/i915/intel_cdclk.c | 28 +- drivers/gpu/drm/i915/intel_color.c | 6 +- drivers/gpu/drm/i915/intel_crt.c | 12 +- drivers/gpu/drm/i915/intel_csr.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 58 ++-- drivers/gpu/drm/i915/intel_device_info.c | 46 +-- drivers/gpu/drm/i915/intel_display.c | 308 +++++++++--------- drivers/gpu/drm/i915/intel_dp.c | 82 ++--- drivers/gpu/drm/i915/intel_dp_mst.c | 2 +- drivers/gpu/drm/i915/intel_dpll_mgr.c | 10 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 44 +-- drivers/gpu/drm/i915/intel_fbc.c | 52 +-- drivers/gpu/drm/i915/intel_fifo_underrun.c | 8 +- drivers/gpu/drm/i915/intel_guc_fw.c | 4 +- drivers/gpu/drm/i915/intel_hangcheck.c | 6 +- drivers/gpu/drm/i915/intel_hdcp.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 18 +- drivers/gpu/drm/i915/intel_i2c.c | 14 +- drivers/gpu/drm/i915/intel_lrc.c | 32 +- drivers/gpu/drm/i915/intel_lvds.c | 14 +- drivers/gpu/drm/i915/intel_mocs.c | 8 +- drivers/gpu/drm/i915/intel_overlay.c | 12 +- drivers/gpu/drm/i915/intel_panel.c | 20 +- drivers/gpu/drm/i915/intel_pipe_crc.c | 12 +- drivers/gpu/drm/i915/intel_pm.c | 196 +++++------ drivers/gpu/drm/i915/intel_psr.c | 26 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 68 ++-- drivers/gpu/drm/i915/intel_ringbuffer.h | 4 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 32 +- drivers/gpu/drm/i915/intel_sdvo.c | 14 +- drivers/gpu/drm/i915/intel_sprite.c | 34 +- drivers/gpu/drm/i915/intel_tv.c | 2 +- drivers/gpu/drm/i915/intel_uc.c | 4 +- drivers/gpu/drm/i915/intel_uncore.c | 60 ++-- drivers/gpu/drm/i915/intel_wopcm.c | 8 +- drivers/gpu/drm/i915/intel_workarounds.c | 20 +- drivers/gpu/drm/i915/selftests/huge_pages.c | 2 +- .../drm/i915/selftests/i915_gem_coherency.c | 4 +- .../gpu/drm/i915/selftests/i915_gem_context.c | 10 +- .../gpu/drm/i915/selftests/i915_gem_object.c | 12 +- drivers/gpu/drm/i915/selftests/i915_request.c | 2 +- .../gpu/drm/i915/selftests/intel_hangcheck.c | 8 +- drivers/gpu/drm/i915/selftests/intel_lrc.c | 2 +- drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 +- .../drm/i915/selftests/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/vlv_dsi.c | 40 +-- 72 files changed, 1003 insertions(+), 1006 deletions(-)