From nobody Fri Dec 27 05:14:11 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF1E519D064 for ; Fri, 29 Nov 2024 16:23:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732897391; cv=none; b=fa2hz5jn721R0NEJoY5Lq7ZXGJrx74cP794I2af96yrTKMTRsOyfWaUijcrBmz9rPOmgeBXCUR07xQAW4rHzTtlfeFb/sbF68tl6simzBaDwuKZ2gKgk7ihPdy2xlDKJVQssD0SSjqioyA7HW8oRTfq1O/NFIczbG1UC4ITvj1s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732897391; c=relaxed/simple; bh=SeiQyDe/jJuhOMdQHANfSJioNwM0AtYDuJwWcAxbCbw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ayIc+2R0w1MRStr0APJyc2hZ6wYRHJObrC+QhCzVMrXz8cNLba1BkPv5GKhd3KMe9w+KhLFzxaCCVLXdNKjnd9j58mbGaIsE/v9FARTnPMar0CMfwVlsQjHjOFK1i5ZZyFeBm+tA0L8MSh5qKDhUCJU5K5eJX21wyxi2pX6NL8Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Du736/O3; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Du736/O3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732897387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KWWWnqasTbqKMLprgReT8R1/CwGPVZJm0QHzlo5A2tk=; b=Du736/O3a+KoYHepmlHMrzwGBtkdTS2GAlAJAX3PJ4RsVGMDwhFsm+1T9oqK7sCLmxhx8L nuBuSK5bGxJcRYpuX2Rl1NFCSbWsDH0oUsNVnxSKoWs8eKpCvFQP0kSVqMgjfU16oH2tom oZ/XUyLMZe5tR+c+ZtdW7Tq06NVbu0g= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-356-h9iEf79KOkuu9zgenCnh5A-1; Fri, 29 Nov 2024 11:23:03 -0500 X-MC-Unique: h9iEf79KOkuu9zgenCnh5A-1 X-Mimecast-MFC-AGG-ID: h9iEf79KOkuu9zgenCnh5A Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 96D191955D47; Fri, 29 Nov 2024 16:22:58 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.39.192.13]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DEAB91955F3A; Fri, 29 Nov 2024 16:22:54 +0000 (UTC) From: Jocelyn Falempe To: Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , David Airlie , Simona Vetter , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jocelyn Falempe Subject: [PATCH 2/5] drm/i915/display/i9xx: Add a disable_tiling() for i9xx planes Date: Fri, 29 Nov 2024 17:20:27 +0100 Message-ID: <20241129162232.7594-3-jfalempe@redhat.com> In-Reply-To: <20241129162232.7594-1-jfalempe@redhat.com> References: <20241129162232.7594-1-jfalempe@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" drm_panic draws in linear framebuffer, so it's easier to re-use the current framebuffer, and disable tiling in the panic handler, to show the panic screen. Signed-off-by: Jocelyn Falempe --- drivers/gpu/drm/i915/display/i9xx_plane.c | 24 +++++++++++++++++++ .../drm/i915/display/intel_display_types.h | 2 ++ 2 files changed, 26 insertions(+) diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i9= 15/display/i9xx_plane.c index 17a1e3801a85c..95a97b91d5cdc 100644 --- a/drivers/gpu/drm/i915/display/i9xx_plane.c +++ b/drivers/gpu/drm/i915/display/i9xx_plane.c @@ -848,6 +848,28 @@ static const struct drm_plane_funcs i8xx_plane_funcs = =3D { .format_mod_supported =3D i8xx_plane_format_mod_supported, }; =20 +static void i9xx_disable_tiling(struct intel_plane *plane) +{ + struct drm_i915_private *dev_priv =3D to_i915(plane->base.dev); + enum i9xx_plane_id i9xx_plane =3D plane->i9xx_plane; + struct intel_plane_state *plane_state =3D to_intel_plane_state(plane->bas= e.state); + u32 dspcntr; + + dspcntr =3D intel_de_read_fw(dev_priv, DSPCNTR(dev_priv, i9xx_plane)); + dspcntr &=3D ~DISP_TILED; + intel_de_write_fw(dev_priv, DSPCNTR(dev_priv, i9xx_plane), dspcntr); + + if (DISPLAY_VER(dev_priv) >=3D 4) { + u32 reg; + + reg =3D intel_de_read_fw(dev_priv, DSPSURF(dev_priv, i9xx_plane)); + intel_de_write_fw(dev_priv, DSPSURF(dev_priv, i9xx_plane), reg); + + } else + intel_de_write_fw(dev_priv, DSPADDR(dev_priv, i9xx_plane), + intel_plane_ggtt_offset(plane_state)); +} + struct intel_plane * intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pi= pe) { @@ -973,6 +995,8 @@ intel_primary_plane_create(struct drm_i915_private *dev= _priv, enum pipe pipe) plane->disable_flip_done =3D ilk_primary_disable_flip_done; } =20 + plane->disable_tiling =3D i9xx_disable_tiling; + modifiers =3D intel_fb_plane_get_modifiers(dev_priv, INTEL_PLANE_CAP_TILI= NG_X); =20 if (DISPLAY_VER(dev_priv) >=3D 5 || IS_G4X(dev_priv)) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/g= pu/drm/i915/display/intel_display_types.h index 2bb1fa64da2f1..0559b02569e49 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1482,6 +1482,8 @@ struct intel_plane { bool async_flip); void (*enable_flip_done)(struct intel_plane *plane); void (*disable_flip_done)(struct intel_plane *plane); + /* For drm_panic */ + void (*disable_tiling)(struct intel_plane *plane); }; =20 #define to_intel_atomic_state(x) container_of(x, struct intel_atomic_state= , base) --=20 2.47.0