Received: by 2002:a05:7412:a9a2:b0:e2:908c:2ebd with SMTP id o34csp2368329rdh; Sun, 29 Oct 2023 12:47:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSeHzTlHjHg05QfbG2bZvbNkpAE33MxDee4m8HZLbAYF+iw1oFacckHcDjn3sZ4k6DeP8C X-Received: by 2002:a05:6808:2105:b0:3b2:db61:ff8e with SMTP id r5-20020a056808210500b003b2db61ff8emr11072853oiw.33.1698608835919; Sun, 29 Oct 2023 12:47:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698608835; cv=none; d=google.com; s=arc-20160816; b=xkxBqlld4K6fUbyGgXsj/5uiioxUNBMjE0ZhSL0dAC0tJnpwfGtW7lxiOtK8UC70Gi ZpNJuXR7m/oOa4kpQ+m2Wm8OsuAi6snCHxB+2K35jo7MjqCuyExTk/p6NmnY7NUn0Qk2 dW1yC2vSBwe3KC5p2ITIR6ko7o9Y3ll+5TA3CeXqPpdCG3f6qfP64mhA/Yk7qMEy2K/Z xa27yX7cPY5ZjrEcgMnYSVVN0KOnOUKpxG49XHA+9MV0Bia51cHAZ5t9ToRbOl6YhV+H CErGnUjD3I4DGqi45w6bmKqWo7CT1gRbJOz6+YLfURuOwuqJ9INYjhT8t3EypOxSCQuq t7ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=SPO8dPGeLbOTUQ56wG489JEruBwAK9ierDYB7/aN/Z0=; fh=E4IHGZ2HGRuNU3iuhglIJe36ussdVU4dBtmdj2I6SyA=; b=ezCukr/Emq38vhBYAQQNpchu1S4Wr2wDr94mBcIaf9O8PIbpkCzMzN0avmgtnadjxn q6gtVbqiEFBZVCgzhWL0m2XLhWr2chcwgdNLlS/BxMoCarxtE6yeyHM3BGprUjbQPv8B x2R6HbnlMPewm9picB9/hJmAJIaMaTED0plqs2PJhRXKK8vOWxsfbs/ihbrUcQ3jLguh C89fzjzQu5qQAm9YR2MIiU48RZg/kaRhJOAHMXKOjHoTEUXcMCzz5vKqxeWxE0D6Wx0c E5k+P+O9+I9h1PYDPCK2RfnWlwlLi43IPsp0l2kYJj98YB7kb456xNGs3o5W4dxygCsw fnIg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id l65-20020a632544000000b005b9377ee20csi4046379pgl.701.2023.10.29.12.47.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 12:47:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 0283F80A73DD; Sun, 29 Oct 2023 12:47:02 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230480AbjJ2Tqm (ORCPT + 99 others); Sun, 29 Oct 2023 15:46:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230402AbjJ2TqU (ORCPT ); Sun, 29 Oct 2023 15:46:20 -0400 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 767ABC4 for ; Sun, 29 Oct 2023 12:46:17 -0700 (PDT) Received: from loongson.cn (unknown [10.20.42.43]) by gateway (Coremail) with SMTP id _____8CxNvGHtj5l0Js1AA--.38906S3; Mon, 30 Oct 2023 03:46:15 +0800 (CST) Received: from openarena.loongson.cn (unknown [10.20.42.43]) by localhost.localdomain (Coremail) with SMTP id AQAAf8AxXNx+tj5lKq02AA--.51878S10; Mon, 30 Oct 2023 03:46:13 +0800 (CST) From: Sui Jingfeng To: Maxime Ripard , Thomas Zimmermann Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 8/8] drm/loongson: Add support for the display subsystem in LS2K2000 Date: Mon, 30 Oct 2023 03:46:07 +0800 Message-Id: <20231029194607.379459-9-suijingfeng@loongson.cn> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231029194607.379459-1-suijingfeng@loongson.cn> References: <20231029194607.379459-1-suijingfeng@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: AQAAf8AxXNx+tj5lKq02AA--.51878S10 X-CM-SenderInfo: xvxlyxpqjiv03j6o00pqjv00gofq/ X-Coremail-Antispam: 1Uk129KBj93XoW3KF47KF4xtFy5XFyfWFy5WrX_yoWDWFWxpa 13A3ySgr48tFnI939xtr1UXw1YkFyayFZayFWfGw1rW3srAr18tFnYyF4FqFW7XFy5Jr12 qrn7G3yIk3WUGabCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU90b4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6r4j6r4UJwAaw2AFwI0_Jrv_JF1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqjxCEc2xF0c Ia020Ex4CE44I27wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Wrv_ ZF1lYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwI xGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwCFI7km07C267AKxVWU XVWUAwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67 kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW5JVW7JwCI42IY 6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0x vEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVj vjDU0xZFpf9x07j6sjUUUUUU= X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 29 Oct 2023 12:47:02 -0700 (PDT) Before apply this patch, drm/loongson is basically works on LS2K2000. Because majority of hardware features of the DC are same with LS7A2000's counterpart. Despite LS2K2000 is a SoC, it don't has a dedicated VRAM. But the firmware will carve out part of system RAM as VRAM, and write the base address and size of this reserved RAM to the PCI Bar 2 of the GPU. So this kind of reserved RAM is nearly same with the dedicated video RAM. In short, the display subsystem in LS2K2000 are nearly compatible with the display subsystem in LS7A2000. But LS2K2000 has only one built-in HDMI encoder, which is connected with the CRTC-0 (display pipe 0). Display pipe 1 exports a generic DVO interface. So there still need a trivial fix. Before apply this patch: $ dmesg | grep 0000:00:06.1 pci 0000:00:06.1: [0014:7a36] type 00 class 0x030000 pci 0000:00:06.1: reg 0x10: [mem 0x51250000-0x5125ffff 64bit] pci 0000:00:06.1: reg 0x18: [mem 0x512b6000-0x512b60ff] pci 0000:00:06.1: BAR 0: assigned [mem 0x51250000-0x5125ffff 64bit] pci 0000:00:06.1: BAR 2: assigned [mem 0x512b7f00-0x512b7fff] pci 0000:00:06.1: vgaarb: setting as boot VGA device loongson 0000:00:06.1: Found LS7A2000 bridge chipset, revision: 16 loongson 0000:00:06.1: [drm] dc: 400MHz, gmc: 800MHz, gpu: 533MHz loongson 0000:00:06.1: [drm] Dedicated vram start: 0x40000000, size: 256MiB loongson 0000:00:06.1: [drm] Loongson VBIOS version: 2.1 loongson 0000:00:06.1: [drm] Loongson VBIOS: has 8 DCBs loongson 0000:00:06.1: [drm] VRAM: 16384 pages ready loongson 0000:00:06.1: [drm] GTT: 32768 pages ready loongson 0000:00:06.1: [drm] lsdc-i2c0(sda pin mask=1, scl pin mask=2) created loongson 0000:00:06.1: [drm] lsdc-i2c1(sda pin mask=4, scl pin mask=8) created loongson 0000:00:06.1: [drm] DisplayPipe-0 has HDMI-0 loongson 0000:00:06.1: [drm] DisplayPipe-1 has HDMI-1 loongson 0000:00:06.1: [drm] Total 2 outputs loongson 0000:00:06.1: [drm] registered irq: 42 [drm] Initialized loongson 1.0.0 20220701 for 0000:00:06.1 on minor 0 loongson 0000:00:06.1: [drm] *ERROR* Setting HDMI-1 PLL failed loongson 0000:00:06.1: [drm] fb0: loongsondrmfb frame buffer device After apply this patch, the error "*ERROR* Setting HDMI-1 PLL failed" got fixed. $ dmesg | grep 0000:00:06.1 pci 0000:00:06.1: [0014:7a36] type 00 class 0x030000 pci 0000:00:06.1: reg 0x10: [mem 0x51250000-0x5125ffff 64bit] pci 0000:00:06.1: reg 0x18: [mem 0x512b6000-0x512b60ff] pci 0000:00:06.1: BAR 0: assigned [mem 0x51250000-0x5125ffff 64bit] pci 0000:00:06.1: BAR 2: assigned [mem 0x512b7f00-0x512b7fff] pci 0000:00:06.1: vgaarb: setting as boot VGA device loongson 0000:00:06.1: Found LS2K2000 SoC, revision: 16 loongson 0000:00:06.1: [drm] dc: 400MHz, gmc: 800MHz, gpu: 533MHz loongson 0000:00:06.1: [drm] Dedicated vram start: 0x40000000, size: 256MiB loongson 0000:00:06.1: [drm] Loongson VBIOS version: 2.1 loongson 0000:00:06.1: [drm] Loongson VBIOS: has 8 DCBs loongson 0000:00:06.1: [drm] VRAM: 16384 pages ready loongson 0000:00:06.1: [drm] GTT: 32768 pages ready loongson 0000:00:06.1: [drm] lsdc-i2c0(sda pin mask=1, scl pin mask=2) created loongson 0000:00:06.1: [drm] lsdc-i2c1(sda pin mask=4, scl pin mask=8) created loongson 0000:00:06.1: [drm] DisplayPipe-0 has HDMI-0 loongson 0000:00:06.1: [drm] DisplayPipe-1 has DVO-1 loongson 0000:00:06.1: [drm] Total 2 outputs loongson 0000:00:06.1: [drm] registered irq: 42 [drm] Initialized loongson 1.0.0 20220701 for 0000:00:06.1 on minor 0 loongson 0000:00:06.1: [drm] fb0: loongsondrmfb frame buffer device Signed-off-by: Sui Jingfeng --- drivers/gpu/drm/loongson/Makefile | 1 + drivers/gpu/drm/loongson/loongson_device.c | 46 ++++++++++ drivers/gpu/drm/loongson/lsdc_output.h | 5 ++ drivers/gpu/drm/loongson/lsdc_output_2k2000.c | 84 +++++++++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 drivers/gpu/drm/loongson/lsdc_output_2k2000.c diff --git a/drivers/gpu/drm/loongson/Makefile b/drivers/gpu/drm/loongson/Makefile index 393709e686aa..7d3d82ddd5ff 100644 --- a/drivers/gpu/drm/loongson/Makefile +++ b/drivers/gpu/drm/loongson/Makefile @@ -10,6 +10,7 @@ loongson-y := \ lsdc_i2c.o \ lsdc_irq.o \ lsdc_output.o \ + lsdc_output_2k2000.o \ lsdc_output_7a1000.o \ lsdc_output_7a2000.o \ lsdc_plane.o \ diff --git a/drivers/gpu/drm/loongson/loongson_device.c b/drivers/gpu/drm/loongson/loongson_device.c index 64096ad5466e..33aae403f0b0 100644 --- a/drivers/gpu/drm/loongson/loongson_device.c +++ b/drivers/gpu/drm/loongson/loongson_device.c @@ -6,6 +6,7 @@ #include #include "lsdc_drv.h" +#include "lsdc_probe.h" extern struct loongson_vbios __loongson_vbios; @@ -27,6 +28,15 @@ static const struct lsdc_kms_funcs ls7a2000_kms_funcs = { .crtc_init = ls7a2000_crtc_init, }; +static const struct lsdc_kms_funcs ls2k2000_kms_funcs = { + .create_i2c = lsdc_create_i2c_chan, + .irq_handler = ls7a2000_dc_irq_handler, + .output_init = ls2k2000_output_init, + .cursor_plane_init = ls7a2000_cursor_plane_init, + .primary_plane_init = lsdc_primary_plane_init, + .crtc_init = ls7a2000_crtc_init, +}; + static const struct loongson_gfx_desc ls7a1000_gfx = { .dc = { .num_of_crtc = 2, @@ -93,14 +103,50 @@ static const struct loongson_gfx_desc ls7a2000_gfx = { .model = "LS7A2000 bridge chipset", }; +static const struct loongson_gfx_desc ls2k2000_gfx = { + .dc = { + .num_of_crtc = 2, + .max_pixel_clk = 350000, + .max_width = 4096, + .max_height = 4096, + .num_of_hw_cursor = 2, + .hw_cursor_w = 64, + .hw_cursor_h = 64, + .pitch_align = 64, + .has_vblank_counter = true, + .funcs = &ls2k2000_kms_funcs, + }, + .conf_reg_base = LS7A2000_CONF_REG_BASE, + .gfxpll = { + .reg_offset = LS7A2000_PLL_GFX_REG, + .reg_size = 8, + }, + .pixpll = { + [0] = { + .reg_offset = LS7A2000_PIXPLL0_REG, + .reg_size = 8, + }, + [1] = { + .reg_offset = LS7A2000_PIXPLL1_REG, + .reg_size = 8, + }, + }, + .vbios = &__loongson_vbios, + .chip_id = CHIP_LS2K2000, + .model = "LS2K2000 SoC", +}; + static const struct lsdc_desc *__chip_id_desc_table[] = { [CHIP_LS7A1000] = &ls7a1000_gfx.dc, [CHIP_LS7A2000] = &ls7a2000_gfx.dc, + [CHIP_LS2K2000] = &ls2k2000_gfx.dc, [CHIP_LS_LAST] = NULL, }; const struct lsdc_desc * lsdc_device_probe(struct pci_dev *pdev, enum loongson_chip_id chip_id) { + chip_id = loongson_chip_id_fixup(chip_id); + return __chip_id_desc_table[chip_id]; } diff --git a/drivers/gpu/drm/loongson/lsdc_output.h b/drivers/gpu/drm/loongson/lsdc_output.h index a37a72687bdf..463d59d680c2 100644 --- a/drivers/gpu/drm/loongson/lsdc_output.h +++ b/drivers/gpu/drm/loongson/lsdc_output.h @@ -61,6 +61,11 @@ int ls7a2000_output_init(struct drm_device *ddev, struct i2c_adapter *ddc, unsigned int index); +int ls2k2000_output_init(struct drm_device *ddev, + struct lsdc_display_pipe *dispipe, + struct i2c_adapter *ddc, + unsigned int pipe); + int lsdc_output_init(struct drm_device *ddev, struct lsdc_display_pipe *dispipe, struct i2c_adapter *ddc, diff --git a/drivers/gpu/drm/loongson/lsdc_output_2k2000.c b/drivers/gpu/drm/loongson/lsdc_output_2k2000.c new file mode 100644 index 000000000000..350af51da541 --- /dev/null +++ b/drivers/gpu/drm/loongson/lsdc_output_2k2000.c @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2023 Loongson Technology Corporation Limited + */ + +#include "lsdc_drv.h" +#include "lsdc_output.h" + +/* + * The DC in LS2K2000 is nearly same with the DC in LS7A2000, except that + * LS2K2000 has only one built-in HDMI encoder which is connected with the + * display pipe 0. Display pipe 1 is a DVO output interface. + * ________________________ + * | | ______________ + * | +----------| | | + * | CRTC-0 ---> | HDMI phy ---> HDMI Connector --> | HDMI Monitor |<--+ + * | +----------| |______________| | + * | +-------+ | | + * | | i2c-x | <------------------------------------------+ + * | +-------+ | + * | | + * | DC in LS2K2000 | + * | | + * | +-------+ | + * | | i2c-y | <------------------------------------+ + * | +-------+ | | + * | | ____|____ + * | +-------| | | + * | CRTC-1 ------> | DVO --> Encoder1 --> Connector1 --> | Display | + * | +-------| |_________| + * |________________________| + */ + +static void ls2k2000_pipe1_dvo_encoder_reset(struct drm_encoder *encoder) +{ + struct drm_device *ddev = encoder->dev; + struct lsdc_device *ldev = to_lsdc(ddev); + u32 val; + + val = PHY_CLOCK_POL | PHY_CLOCK_EN | PHY_DATA_EN; + lsdc_wreg32(ldev, LSDC_CRTC1_DVO_CONF_REG, val); +} + +const struct drm_encoder_funcs ls2k2000_pipe1_dvo_encoder_funcs = { + .reset = ls2k2000_pipe1_dvo_encoder_reset, + .destroy = drm_encoder_cleanup, +}; + +static const struct lsdc_output_desc ls2k2000_output_desc[2] = { + { + .pipe = 0, + .encoder_type = DRM_MODE_ENCODER_TMDS, + .connector_type = DRM_MODE_CONNECTOR_HDMIA, + .encoder_funcs = &lsdc_pipe0_hdmi_encoder_funcs, + .encoder_helper_funcs = &lsdc_pipe0_hdmi_encoder_helper_funcs, + .connector_funcs = &lsdc_pipe0_hdmi_connector_funcs, + .connector_helper_funcs = &lsdc_connector_helper_funcs, + .name = "HDMI-0", + }, + { + .pipe = 1, + .encoder_type = DRM_MODE_ENCODER_DPI, + .connector_type = DRM_MODE_CONNECTOR_DPI, + .encoder_funcs = &ls2k2000_pipe1_dvo_encoder_funcs, + .encoder_helper_funcs = &lsdc_encoder_helper_funcs, + .connector_funcs = &lsdc_connector_funcs, + .connector_helper_funcs = &lsdc_connector_helper_funcs, + .name = "DVO-1", + }, +}; + +int ls2k2000_output_init(struct drm_device *ddev, + struct lsdc_display_pipe *dispipe, + struct i2c_adapter *ddc, + unsigned int pipe) +{ + struct lsdc_output *output = &dispipe->output; + + output->descp = &ls2k2000_output_desc[pipe]; + + lsdc_output_init(ddev, dispipe, ddc, pipe); + + return 0; +} -- 2.34.1