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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 848B4ECE589 for ; Mon, 9 Sep 2024 21:01:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 011F110E6B9; Mon, 9 Sep 2024 21:01:47 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="dK3C2W76"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id E0D8C10E6B9; Mon, 9 Sep 2024 21:01:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725915707; x=1757451707; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=0Am2i+iBwRsGlahuJGNPAOWkK+aZQljp3bxAL3bgah4=; b=dK3C2W76tKlGIcNGgi/QnxDU2rfXkR7bIsEodQo9rCrtBd5yT50sxHZt UFDdvOwN6DsNJ6VHeU/jYAatM/TSB7mQdmf38dSX3JmhVPY2FRO3hJwCE Mi4MogFS9nqK7yTo3PZAD48WKhiI7ijXJ5/H4Pwnt7mtO65RrHXYjaAYP 496h5YLkvtuha5EBnAbIwtjFww/75eDHcF3dtTLUp0GvQr+IVCyh/4bim OUSSQUTA84iicykdj1ILnXSKbdlw2dlJAmGEVegq3A+nuxHjyIBsGZ28E POCiY1kzYApQayaqplSTT+/oKPXvVDRE0oyI7nO2yQb7waJOw45dd98rZ g==; X-CSE-ConnectionGUID: NOX+hZIIQAGF8Zx3wSt2Xg== X-CSE-MsgGUID: MoT5Eeb1QqeSaJI8/E6eKA== X-IronPort-AV: E=McAfee;i="6700,10204,11190"; a="28377798" X-IronPort-AV: E=Sophos;i="6.10,215,1719903600"; d="scan'208";a="28377798" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2024 14:01:46 -0700 X-CSE-ConnectionGUID: WtlOyg5pQ4GTqRrfuoUKQw== X-CSE-MsgGUID: HQearJz7RTuqjx/gf0gHyQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,215,1719903600"; d="scan'208";a="66844201" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by fmviesa008.fm.intel.com with SMTP; 09 Sep 2024 14:01:43 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 10 Sep 2024 00:01:42 +0300 Date: Tue, 10 Sep 2024 00:01:42 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Subject: Re: [PATCH 06/11] drm/i915/reg: fix PCH transcoder timing and data/link m/n style Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Patchwork-Hint: comment 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" On Mon, Sep 09, 2024 at 09:58:57PM +0300, Jani Nikula wrote: > Adhere to the style described at the top of i915_reg.h. > > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/i915_reg.h | 77 ++++++++++++++++++--------------- > 1 file changed, 43 insertions(+), 34 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 2f09145b9791..e439a67fde61 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -3160,33 +3160,76 @@ > /* transcoder */ > > #define _PCH_TRANS_HTOTAL_A 0xe0000 > +#define _PCH_TRANS_HTOTAL_B 0xe1000 There's some tab vs. space damage in this patch. > +#define PCH_TRANS_HTOTAL(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_HTOTAL_A, _PCH_TRANS_HTOTAL_B) > #define TRANS_HTOTAL_SHIFT 16 > #define TRANS_HACTIVE_SHIFT 0 > + > #define _PCH_TRANS_HBLANK_A 0xe0004 > +#define _PCH_TRANS_HBLANK_B 0xe1004 > +#define PCH_TRANS_HBLANK(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_HBLANK_A, _PCH_TRANS_HBLANK_B) > #define TRANS_HBLANK_END_SHIFT 16 > #define TRANS_HBLANK_START_SHIFT 0 > + > #define _PCH_TRANS_HSYNC_A 0xe0008 > +#define _PCH_TRANS_HSYNC_B 0xe1008 > +#define PCH_TRANS_HSYNC(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_HSYNC_A, _PCH_TRANS_HSYNC_B) > #define TRANS_HSYNC_END_SHIFT 16 > #define TRANS_HSYNC_START_SHIFT 0 > + > #define _PCH_TRANS_VTOTAL_A 0xe000c > +#define _PCH_TRANS_VTOTAL_B 0xe100c > +#define PCH_TRANS_VTOTAL(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_VTOTAL_A, _PCH_TRANS_VTOTAL_B) > #define TRANS_VTOTAL_SHIFT 16 > #define TRANS_VACTIVE_SHIFT 0 > + > #define _PCH_TRANS_VBLANK_A 0xe0010 > +#define _PCH_TRANS_VBLANK_B 0xe1010 > +#define PCH_TRANS_VBLANK(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_VBLANK_A, _PCH_TRANS_VBLANK_B) > #define TRANS_VBLANK_END_SHIFT 16 > #define TRANS_VBLANK_START_SHIFT 0 > + > #define _PCH_TRANS_VSYNC_A 0xe0014 > +#define _PCH_TRANS_VSYNC_B 0xe1014 > +#define PCH_TRANS_VSYNC(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_VSYNC_A, _PCH_TRANS_VSYNC_B) > #define TRANS_VSYNC_END_SHIFT 16 > #define TRANS_VSYNC_START_SHIFT 0 > + > #define _PCH_TRANS_VSYNCSHIFT_A 0xe0028 > +#define _PCH_TRANS_VSYNCSHIFT_B 0xe1028 > +#define PCH_TRANS_VSYNCSHIFT(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_VSYNCSHIFT_A, _PCH_TRANS_VSYNCSHIFT_B) > > #define _PCH_TRANSA_DATA_M1 0xe0030 > +#define _PCH_TRANSB_DATA_M1 0xe1030 > +#define PCH_TRANS_DATA_M1(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_DATA_M1, _PCH_TRANSB_DATA_M1) > + > #define _PCH_TRANSA_DATA_N1 0xe0034 > +#define _PCH_TRANSB_DATA_N1 0xe1034 > +#define PCH_TRANS_DATA_N1(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_DATA_N1, _PCH_TRANSB_DATA_N1) > + > #define _PCH_TRANSA_DATA_M2 0xe0038 > +#define _PCH_TRANSB_DATA_M2 0xe1038 > +#define PCH_TRANS_DATA_M2(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_DATA_M2, _PCH_TRANSB_DATA_M2) > + > #define _PCH_TRANSA_DATA_N2 0xe003c > +#define _PCH_TRANSB_DATA_N2 0xe103c > +#define PCH_TRANS_DATA_N2(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_DATA_N2, _PCH_TRANSB_DATA_N2) > + > #define _PCH_TRANSA_LINK_M1 0xe0040 > +#define _PCH_TRANSB_LINK_M1 0xe1040 > +#define PCH_TRANS_LINK_M1(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_LINK_M1, _PCH_TRANSB_LINK_M1) > + > #define _PCH_TRANSA_LINK_N1 0xe0044 > +#define _PCH_TRANSB_LINK_N1 0xe1044 > +#define PCH_TRANS_LINK_N1(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_LINK_N1, _PCH_TRANSB_LINK_N1) > + > #define _PCH_TRANSA_LINK_M2 0xe0048 > +#define _PCH_TRANSB_LINK_M2 0xe1048 > +#define PCH_TRANS_LINK_M2(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_LINK_M2, _PCH_TRANSB_LINK_M2) > + > #define _PCH_TRANSA_LINK_N2 0xe004c > +#define _PCH_TRANSB_LINK_N2 0xe104c > +#define PCH_TRANS_LINK_N2(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_LINK_N2, _PCH_TRANSB_LINK_N2) > > /* Per-transcoder DIP controls (PCH) */ > #define _VIDEO_DIP_CTL_A 0xe0200 > @@ -3292,40 +3335,6 @@ > > #define HSW_STEREO_3D_CTL(dev_priv, trans) _MMIO_PIPE2(dev_priv, trans, _HSW_STEREO_3D_CTL_A) > > -#define _PCH_TRANS_HTOTAL_B 0xe1000 > -#define _PCH_TRANS_HBLANK_B 0xe1004 > -#define _PCH_TRANS_HSYNC_B 0xe1008 > -#define _PCH_TRANS_VTOTAL_B 0xe100c > -#define _PCH_TRANS_VBLANK_B 0xe1010 > -#define _PCH_TRANS_VSYNC_B 0xe1014 > -#define _PCH_TRANS_VSYNCSHIFT_B 0xe1028 > - > -#define PCH_TRANS_HTOTAL(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_HTOTAL_A, _PCH_TRANS_HTOTAL_B) > -#define PCH_TRANS_HBLANK(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_HBLANK_A, _PCH_TRANS_HBLANK_B) > -#define PCH_TRANS_HSYNC(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_HSYNC_A, _PCH_TRANS_HSYNC_B) > -#define PCH_TRANS_VTOTAL(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_VTOTAL_A, _PCH_TRANS_VTOTAL_B) > -#define PCH_TRANS_VBLANK(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_VBLANK_A, _PCH_TRANS_VBLANK_B) > -#define PCH_TRANS_VSYNC(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_VSYNC_A, _PCH_TRANS_VSYNC_B) > -#define PCH_TRANS_VSYNCSHIFT(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_VSYNCSHIFT_A, _PCH_TRANS_VSYNCSHIFT_B) > - > -#define _PCH_TRANSB_DATA_M1 0xe1030 > -#define _PCH_TRANSB_DATA_N1 0xe1034 > -#define _PCH_TRANSB_DATA_M2 0xe1038 > -#define _PCH_TRANSB_DATA_N2 0xe103c > -#define _PCH_TRANSB_LINK_M1 0xe1040 > -#define _PCH_TRANSB_LINK_N1 0xe1044 > -#define _PCH_TRANSB_LINK_M2 0xe1048 > -#define _PCH_TRANSB_LINK_N2 0xe104c > - > -#define PCH_TRANS_DATA_M1(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_DATA_M1, _PCH_TRANSB_DATA_M1) > -#define PCH_TRANS_DATA_N1(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_DATA_N1, _PCH_TRANSB_DATA_N1) > -#define PCH_TRANS_DATA_M2(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_DATA_M2, _PCH_TRANSB_DATA_M2) > -#define PCH_TRANS_DATA_N2(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_DATA_N2, _PCH_TRANSB_DATA_N2) > -#define PCH_TRANS_LINK_M1(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_LINK_M1, _PCH_TRANSB_LINK_M1) > -#define PCH_TRANS_LINK_N1(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_LINK_N1, _PCH_TRANSB_LINK_N1) > -#define PCH_TRANS_LINK_M2(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_LINK_M2, _PCH_TRANSB_LINK_M2) > -#define PCH_TRANS_LINK_N2(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_LINK_N2, _PCH_TRANSB_LINK_N2) > - > #define _PCH_TRANSACONF 0xf0008 > #define _PCH_TRANSBCONF 0xf1008 > #define PCH_TRANSCONF(pipe) _MMIO_PIPE(pipe, _PCH_TRANSACONF, _PCH_TRANSBCONF) > -- > 2.39.2 -- Ville Syrjälä Intel