From patchwork Tue Sep 24 07:36:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1988798 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XCWsF505Cz1xsx for ; Tue, 24 Sep 2024 17:37:05 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1st06T-0003gq-NI; Tue, 24 Sep 2024 07:36:57 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1st06R-0003fl-4R for kernel-team@lists.ubuntu.com; Tue, 24 Sep 2024 07:36:55 +0000 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id E9A393F129 for ; Tue, 24 Sep 2024 07:36:54 +0000 (UTC) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2052d07ff07so52634045ad.2 for ; Tue, 24 Sep 2024 00:36:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727163413; x=1727768213; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r1eZuJfashoJ1WFpYXdSEH85L+z4rlRzMtHdIL/1D7Y=; b=M+/dtPS7R3kM3lMSrNw/biZ+cpCZn3KAc/R+JvvArejI4x11/t4VYoWdJfj3xwMonZ G6piFhPGn6vsAf9lKAMdAkU6iMt70oZxVi5454sxGuSpC1PAErsDEtn74gJuIR3JAJzd jv4MR2cTBst1czRgZpWVNf0MUtalheYh5Tj1mMN+mnqyVlpcWVbMCKh+6GEh6grmoOBb PBenIAMm+5z/ywrw14UA/J5BYHFl4RYpLoHe+DS+vDtKPZ3kWtIZrhzauXCPu5gBaTpL lIc+XkA+gHBU9Rt6mgG3jaz9OsmbnGxMoNZ8zFBbSk4TArWoy8KoH3oX7Lg5Zz6CbcTu mDFA== X-Gm-Message-State: AOJu0YwmdWyOqUlNd0t3ODrDfR4fRShhDtBPoGh7XspCyr2vxH5HW8+p 1MDnV2TVq5Xfomq2HQg9tIfdUpcWPFNj+shZYaa9NW/4Zm6EE+RZ0Kd9D4dFpxds9fhiMilrs1L 2aomU5kQ4Rh/p5kib17qlDDv5vUgAvcHfu9Uwy8FPsRRA82hEuplyQ/xP7N+bCVl51094Pnpxt0 y3N5aAYM9Mxg== X-Received: by 2002:a17:902:ce0b:b0:206:96bf:b0cf with SMTP id d9443c01a7336-208d80e3845mr244489945ad.0.1727163413367; Tue, 24 Sep 2024 00:36:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEMZ4VUNpH7b7IuKyd+Ou6kj/QilVaWtR4ck4dEqGwcMj2S2PdtLsS6crdHAiTS2IKBFILTJg== X-Received: by 2002:a17:902:ce0b:b0:206:96bf:b0cf with SMTP id d9443c01a7336-208d80e3845mr244489785ad.0.1727163412964; Tue, 24 Sep 2024 00:36:52 -0700 (PDT) Received: from localhost.localdomain (114-36-223-64.dynamic-ip.hinet.net. [114.36.223.64]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20af1863562sm5581595ad.298.2024.09.24.00.36.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2024 00:36:52 -0700 (PDT) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [SRU][N][PATCH 2/3] drm/i915/display: add intel_display -> drm_device backpointer Date: Tue, 24 Sep 2024 15:36:45 +0800 Message-Id: <20240924073646.1036150-3-chris.chiu@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240924073646.1036150-1-chris.chiu@canonical.com> References: <20240924073646.1036150-1-chris.chiu@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Jani Nikula BugLink: https://bugs.launchpad.net/bugs/2081786 As a baby step towards making struct intel_display the main data structure for display, add a backpointer to struct drm_device that can be used instead of &i915->drm. Reviewed-by: Rodrigo Vivi Signed-off-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/47dd7bc4aae3c10b18097824e37617c072c66c0b.1713358679.git.jani.nikula@intel.com (cherry picked from commit f02fedd882f8e619016f9089f72483b5a6c59c7f) Signed-off-by: Chris Chiu --- drivers/gpu/drm/i915/display/intel_display_core.h | 3 +++ drivers/gpu/drm/i915/display/intel_display_device.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h index 47297ed85822..0a25f21f7922 100644 --- a/drivers/gpu/drm/i915/display/intel_display_core.h +++ b/drivers/gpu/drm/i915/display/intel_display_core.h @@ -271,6 +271,9 @@ struct intel_wm { }; struct intel_display { + /* drm device backpointer */ + struct drm_device *drm; + /* Display functions */ struct { /* Top level crtc-ish functions */ diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c index 0b522c6a8d6f..bbb6fb581003 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.c +++ b/drivers/gpu/drm/i915/display/intel_display_device.c @@ -922,6 +922,9 @@ void intel_display_device_probe(struct drm_i915_private *i915) const struct intel_display_device_info *info; u16 ver, rel, step; + /* Add drm device backpointer as early as possible. */ + i915->display.drm = &i915->drm; + if (HAS_GMD_ID(i915)) info = probe_gmdid_display(i915, &ver, &rel, &step); else