From patchwork Mon Jan 15 06:18:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dave Airlie X-Patchwork-Id: 188032 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp1527270dyc; Sun, 14 Jan 2024 22:18:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IEKSX5PNXgFX+iarbfccvsxMqFknrc7kA2E6mFZAMHlUnruLbwkgLgWqZU8oGUXo87EPZnY X-Received: by 2002:ac8:7c52:0:b0:429:bd96:b4e0 with SMTP id o18-20020ac87c52000000b00429bd96b4e0mr7190426qtv.92.1705299510444; Sun, 14 Jan 2024 22:18:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705299510; cv=none; d=google.com; s=arc-20160816; b=plULK89+4LHRLjSrcnixsSn45cfWetBb83Ij779YL3fnKruK7d6+q4/2pqC9Ov2qwE mo6GtM9ceRdBnqAONFpBcLSjxtTVm8rYC2OTZHz/soBavAZ135E7IsX/pIR7j+ZIXzZw B6UWED0xtuS3mAmhVmTuznMaaUuteQQJU7CsNneWXbrXCnCw+bIEHG3k8cAjICiLse6N 1YPPjC2+Hc+i5tLTJD7sxQIpOu2vv89AS7brNKqvtZ9WvI3+1uda1ZuSGaTX9xkwgewF LSuu1S19R9bgGSfZ572rX3a6uw7charYO3tEQ47OZbaV1N+O4YJebAH0LlZDqtwYvQ7K Vd6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:cc:to:subject:message-id:date:from :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :dkim-signature; bh=Yu24RwbVV6OfhGrTeYHWgy4heI3tkvvA8kiJdl0p1xo=; fh=vkDv7EUSPCkuZpo4m5Hjgf+3wnv0DMsfRBmsN0DPoPY=; b=xQ0REzX1/H/z79s4LNF9HsmjrS9kcu5qG51Bx+dLavbgPSPOyy9n4t7oyzjCEcqB0e RaG6GQuuXltDiBEEam29N55Ulq1HkgVLZWqFCG/t/EtT9p/jcgCgk3+VpZeNs/Rnz9Cb F3ddPJ3Ww1+WM/TQRks0dCD8sBy3aH5jRZe+RYZYq0rB91/5LHPvrImfxGFkSvv9SJcn tObY80YBjBPc22sZt3IdtVTXkBysed89WhlhDfMlqo3/q4rB+9FlcSzHpNs1rr2oxUVj keynthb3ZWWi0g/KhqGw43ooYm4nOqq47G5akcU01HUYux4A8f3qRciurhMKbbr3EbMz /yVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=dM246mO+; spf=pass (google.com: domain of linux-kernel+bounces-25653-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25653-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id d11-20020ac85d8b000000b00429e6eae0e9si2127205qtx.593.2024.01.14.22.18.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jan 2024 22:18:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-25653-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=dM246mO+; spf=pass (google.com: domain of linux-kernel+bounces-25653-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25653-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 3F2E81C21089 for ; Mon, 15 Jan 2024 06:18:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 266D24409; Mon, 15 Jan 2024 06:18:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dM246mO+" Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB33323C5 for ; Mon, 15 Jan 2024 06:18:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-2cd0f4797aaso89657281fa.0 for ; Sun, 14 Jan 2024 22:18:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705299494; x=1705904294; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Yu24RwbVV6OfhGrTeYHWgy4heI3tkvvA8kiJdl0p1xo=; b=dM246mO+lJLON2pSUY4FGKrvbdc3elhZ96CqSjEVMgbBcsPUSf9WzB9malLZRMGOEX jWfHF8NQ/bw8cWQiJoOzxTm6CbI47P1PZIgFqq53mKAw/Px9LTcUyNmPr6feJARPSCu8 hv6y23f6LV79qy8Aq1wHZsWPQV5HKMOBh29aMrLVeDgs8VajyOeMjFX6X+Qrk9QEBs4l 2DspDwX9xQA4YtFAgeC41D3GcAVGE2veXXlx5IgbwRmhIM+dp0a5bqvTC88li5Nv8qLq LOIQkqDVCZ0ByYhpXFpwfYfJ8KvxLQ7RVp7w3HB2XlO9XfO1lEsqEpx4atJOeFvz0lSu Ffzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705299494; x=1705904294; h=content-transfer-encoding:cc:to:subject:message-id:date:from :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Yu24RwbVV6OfhGrTeYHWgy4heI3tkvvA8kiJdl0p1xo=; b=rTwAChY037gZTb83Lax1dcnOXzCYani+2TcoUlxmTYaAFzo8jLMJfDnIvxHV21SI2T tGSfLY8HKs0vKg1OKL47EQWn6/zn6U2LDOiY8oeucpIYCFTRPlKXV3BEIKpriEFTto8i jWhJijzeOM21Gw5/N1fLarV7+HHnHOWdTly/snZQ0cysHI8PhB5jd3LQBFvGVvI0wFQu GXdKhFgMO8tNpfR3eazBZQ//H8AByOoX/3HAYg+HUveLamIQ2OaTYVVjC3ErenudAgaW cCDtngJ3NjK/jp7CxevKvN4JgDTRW/j7cXFPEhQVMs8XIvB+QAHtCp3U8hokZa1D5dkl mJQQ== X-Gm-Message-State: AOJu0Yype5oI8SLGerTHqUSMIZm6Pg/RnBn1vFHgsxp9aw7MmNyFQpzA ASMfEG6CW73GGxWTljopeqRPJz9ZabfIr8FEciM= X-Received: by 2002:a05:6512:3d29:b0:50e:771a:9ff9 with SMTP id d41-20020a0565123d2900b0050e771a9ff9mr2738736lfv.78.1705299493488; Sun, 14 Jan 2024 22:18:13 -0800 (PST) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Dave Airlie Date: Mon, 15 Jan 2024 16:18:01 +1000 Message-ID: Subject: [git pull] drm fixes for 6.8-rc1 To: Linus Torvalds , Daniel Vetter Cc: dri-devel , LKML X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788136139561387165 X-GMAIL-MSGID: 1788136139561387165 Hi Linus, Hopefully you get your power back at some point, this is just a wrap up of fixes from the last few days. It has the proper fix to the i915/xe collision, we can clean up what you did later once rc1 lands. Otherwise it's a few other i915, a v3d, rockchip and a nouveau fix to make GSP load on some original Turing GPUs. I have some amdgpu fixes lined up, but they broke clang build here, so I'll wait to send those until AMD can fix it. Dave. drm-next-2024-01-15-1: drm fixes for 6.8-rc1 i915: - Fixes for kernel-doc warnings enforced in linux-next - Another build warning fix for string formatting of intel_wakeref_t - Display fixes for DP DSC BPC and C20 PLL state verification v3d: - register readout fix rockchip: - two build warning fixes nouveau: - fix GSP loading on Turing with different nvdec configuration The following changes since commit b76c01f1d950425924ee1c1377760de3c024ef78: Merge tag 'drm-intel-gt-next-2023-12-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2024-01-10 11:36:47 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-next-2024-01-15-1 for you to fetch changes up to 205e18c13545ab43cc4fe4930732b4feef551198: nouveau/gsp: handle engines in runl without nonstall interrupts. (2024-01-15 16:04:48 +1000) ---------------------------------------------------------------- drm fixes for 6.8-rc1 i915: - Fixes for kernel-doc warnings enforced in linux-next - Another build warning fix for string formatting of intel_wakeref_t - Display fixes for DP DSC BPC and C20 PLL state verification v3d: - register readout fix rockchip: - two build warning fixes nouveau: - fix GSP loading on Turing with different nvdec configuration ---------------------------------------------------------------- Ankit Nautiyal (1): drm/i915/dp: Fix the max DSC bpc supported by source Cristian Ciocaltea (2): drm/rockchip: vop2: Drop superfluous include drm/rockchip: vop2: Drop unused if_dclk_rate variable Dave Airlie (3): Merge tag 'drm-intel-next-fixes-2024-01-11' of git://anongit.freedesktop.org/drm/drm-intel into drm-next Merge tag 'drm-misc-next-fixes-2024-01-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next nouveau/gsp: handle engines in runl without nonstall interrupts. Imre Deak (1): drm/i915/dp: Fix the PSR debugfs entries wrt. MST connectors Jani Nikula (1): drm/i915: don't make assumptions about intel_wakeref_t type Maíra Canal (1): drm/v3d: Fix support for register debugging on the RPi 4 Mika Kahola (1): drm/i915/display: Fix C20 pll selection for state verification Randy Dunlap (4): drm/i915/gem: reconcile Excess struct member kernel-doc warnings drm/i915/gt: reconcile Excess struct member kernel-doc warnings drm/i915/guc: reconcile Excess struct member kernel-doc warnings drm/i915/perf: reconcile Excess struct member kernel-doc warnings drivers/gpu/drm/i915/display/intel_cx0_phy.c | 25 +++++--- drivers/gpu/drm/i915/display/intel_display_power.c | 4 +- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 10 +-- drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 4 +- drivers/gpu/drm/i915/gt/intel_gsc.h | 7 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 75 ++++++++++++---------- drivers/gpu/drm/i915/i915_perf_types.h | 9 ++- drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga100.c | 4 ++ drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c | 8 +-- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 +- drivers/gpu/drm/v3d/v3d_debugfs.c | 20 +++--- 13 files changed, 96 insertions(+), 78 deletions(-)