From patchwork Fri Jun 14 00:02:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13697670 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 348EBC27C75 for ; Fri, 14 Jun 2024 00:02:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=w01zbfaciTchkejLDIgDHPk6t8Bjwp5r/EBOUpZCNTI=; b=PTvrdqIt5q3V1+ agLLfGpjkxKw/dpr6B7+6+11jAL8sGrp+xGAxuD8QQLCUgd2jyLLdOfmkpFT/NdhEtW2m0VksJiDp VQVSJPL2VyuUiCMoFWpfLIgzYaPY9BcPNU4LSBh4gmhWoEm8TOi9uygD15pQp0afXY/IUMBUV0mK/ lM0i6q1zjXs+i+Kcy8VzttNfZAFiRY6yriwma4vN+WaXiceaBOVdRTD4MhoTJF0buvdDaVxHIyGaV 91LeS3CUcQAyTeKtfZoScpE0p5WLWFL3lT0xi63nfnAaU4jYwKW3AkfY4PkJHLq606NFx8hQMqvsk tXqud27+D7LytTlULZ1A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHuOs-00000000qdS-2RO7; Fri, 14 Jun 2024 00:02:38 +0000 Received: from mail-lf1-x12d.google.com ([2a00:1450:4864:20::12d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHuOn-00000000qbL-3ZTW for linux-rockchip@lists.infradead.org; Fri, 14 Jun 2024 00:02:35 +0000 Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-52bc121fb1eso2152608e87.1 for ; Thu, 13 Jun 2024 17:02:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718323352; x=1718928152; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=5zfrPUlUPVILrHliAQdW9ExhLGgEKHG4S87IgBlFScQ=; b=eMKutB3tosqMSTApDLtj2j7l6b0yJy5Ap3o7OJgKI/TaoB4T7uirW3G0MFOIOPLa5T mYjO8m3RwK/nzNZYmTk71RKZ/lYuCxNxcsioNnj4tEVyWYHaDU8uM9f0wRtbIiTwp8y+ hvvPNUUAstXdoGjURvh0D71+XhH3otB7jj1+JfwiqJ01sJdlx973ADum/LGt8cRYGgRB Vvw98ML0sRG3k6lL/DVQBd7kD/go/wTNIHjpZXjjwq8fje+9n2hmLlS5bCjmySAJ+TGd np0n1kJ65tofcdMGSMMe/KF4M9J20q+iV10ISmce1PTs3I86qVYFnD/87jTWOtioIF5k qdig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718323352; x=1718928152; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5zfrPUlUPVILrHliAQdW9ExhLGgEKHG4S87IgBlFScQ=; b=CQrYQvT6NMLDtwox2gxTmY+i6NBYxabjwL1uDGoMuQADuIZgVJVm14iZPgSYkBUNCC 7SjdW9FLoXJjdE3qYKjS4DJQZPW380Jk0n8ybt5b/UBBxUUdxpG+P7xtrIkxyNmlEEYx rn9jAQL7eYigAFouy7yaMESb7ZkCCuBlWU1pXqz+R6iwY4rU+dHubYAxuAl2LMIr6wt0 m9oIr4vQVz87Rz/ppakfJoy7trQo9aJAMF6EYEELfyJxrr87NxJrdGvsdKEyhzaT8VNN TeStgXy8cQIZ2tAuaGxgdZ6WyGJBovMtez7EQCANoO5fuuFapClklgJRJJj6mH1FcZlk 0jLw== X-Forwarded-Encrypted: i=1; AJvYcCWIyxHB1Xz6xBwJQnJZIxO9cFCSTBZZ1is948MhIVVCaZDRp6RTzHQDlOWSTn84+Go/Cw58kQlXBRBrs8USRnr4upFxh74BbkItTwiKwtXLXuev X-Gm-Message-State: AOJu0Yw3w3+f6yU+FqM86stlnAt6ktW5R3JXN6bHWAtcvPn+ibvBlvNV GqO2EYufJX3CGillOQOLJBMgMHw55e7Gpz2a+qiqxs2Vu/CM5Dj9NbalC8B0bKc= X-Google-Smtp-Source: AGHT+IF8OZ+6PpwFsBXyTwunpB/Bk1x8X+p90EOhm2amALpsFfnel6zQFwhZv7CB04URvvlELTWQCg== X-Received: by 2002:a19:f707:0:b0:52c:84a2:6e0f with SMTP id 2adb3069b0e04-52ca6e6535dmr677515e87.15.1718323352001; Thu, 13 Jun 2024 17:02:32 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52ca288804dsm374797e87.262.2024.06.13.17.02.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 17:02:30 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 14 Jun 2024 03:02:22 +0300 Subject: [PATCH v4 3/3] drm/panel-edp: drop several legacy panels MIME-Version: 1.0 Message-Id: <20240614-edp-panel-drop-v4-3-4e0a112eec46@linaro.org> References: <20240614-edp-panel-drop-v4-0-4e0a112eec46@linaro.org> In-Reply-To: <20240614-edp-panel-drop-v4-0-4e0a112eec46@linaro.org> To: Douglas Anderson , Neil Armstrong , Jessica Zhang , Sam Ravnborg , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-rockchip@lists.infradead.org, Jeffrey Hugo , devicetree@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=7171; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=hx52QihZ5EuJ5AiqKyFQ2KKiCjZKNAgTrsIHJEVKJeY=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBma4iSOvT8Y3rVOEvJW6Aw/Idxzce019n+w4iht 3YVrIas0fCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZmuIkgAKCRCLPIo+Aiko 1Rb9B/9nlEHpAdJ1BhZfisEfvgPJ6mnUA0K9AZ+3Ay6sL5EcWQX0WGMUfqFOw9iB7qA+NmwVZuF tiK2LsF9F6ynUvr7ds5TXCi8uf4Im4jKERarcx7iisMADgkI+B5/ZvRlTW8YWKbxqcwaVXt7tl7 EB3VKoNtd1tn0p0fCmr0rKafb+ODKfxqUurxrkqlregPXC9J9qypGlTnIpl6IAeKI5BCbfpgzLe 8Oinn3CNt7A6Xjq3W/JM/Br3DFr2Bp4OsSWRwFXh9V1JXvJzu7H09zKXaOpPSKoFpMrTJKFea2q VbrPVr6in5OKkglUuoofXI8olFVdC8+fr72PhR37NTfEEJxI X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240613_170233_935447_D2AA5CBA X-CRM114-Status: GOOD ( 12.31 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org The panel-edp driver supports legacy compatible strings for several eDP panels which were never used in DT files present in Linux tree and most likely have never been used with the upstream kernel. Drop compatibles for these panels in favour of using a generic "edp-panel" device on the AUX bus. Reviewed-by: Douglas Anderson Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/panel/panel-edp.c | 173 ++------------------------------------ 1 file changed, 7 insertions(+), 166 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index 85edfd3d59f3..3a574a9b46e7 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -1045,33 +1045,6 @@ static const struct panel_desc auo_b116xak01 = { }, }; -static const struct drm_display_mode auo_b133han05_mode = { - .clock = 142600, - .hdisplay = 1920, - .hsync_start = 1920 + 58, - .hsync_end = 1920 + 58 + 42, - .htotal = 1920 + 58 + 42 + 60, - .vdisplay = 1080, - .vsync_start = 1080 + 3, - .vsync_end = 1080 + 3 + 5, - .vtotal = 1080 + 3 + 5 + 54, -}; - -static const struct panel_desc auo_b133han05 = { - .modes = &auo_b133han05_mode, - .num_modes = 1, - .bpc = 8, - .size = { - .width = 293, - .height = 165, - }, - .delay = { - .hpd_reliable = 100, - .enable = 20, - .unprepare = 50, - }, -}; - static const struct drm_display_mode auo_b133htn01_mode = { .clock = 150660, .hdisplay = 1920, @@ -1121,33 +1094,6 @@ static const struct panel_desc auo_b133xtn01 = { }, }; -static const struct drm_display_mode auo_b140han06_mode = { - .clock = 141000, - .hdisplay = 1920, - .hsync_start = 1920 + 16, - .hsync_end = 1920 + 16 + 16, - .htotal = 1920 + 16 + 16 + 152, - .vdisplay = 1080, - .vsync_start = 1080 + 3, - .vsync_end = 1080 + 3 + 14, - .vtotal = 1080 + 3 + 14 + 19, -}; - -static const struct panel_desc auo_b140han06 = { - .modes = &auo_b140han06_mode, - .num_modes = 1, - .bpc = 8, - .size = { - .width = 309, - .height = 174, - }, - .delay = { - .hpd_reliable = 100, - .enable = 20, - .unprepare = 50, - }, -}; - static const struct drm_display_mode boe_nv101wxmn51_modes[] = { { .clock = 71900, @@ -1414,33 +1360,6 @@ static const struct panel_desc innolux_p120zdg_bf1 = { }, }; -static const struct drm_display_mode ivo_m133nwf4_r0_mode = { - .clock = 138778, - .hdisplay = 1920, - .hsync_start = 1920 + 24, - .hsync_end = 1920 + 24 + 48, - .htotal = 1920 + 24 + 48 + 88, - .vdisplay = 1080, - .vsync_start = 1080 + 3, - .vsync_end = 1080 + 3 + 12, - .vtotal = 1080 + 3 + 12 + 17, - .flags = DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC, -}; - -static const struct panel_desc ivo_m133nwf4_r0 = { - .modes = &ivo_m133nwf4_r0_mode, - .num_modes = 1, - .bpc = 8, - .size = { - .width = 294, - .height = 165, - }, - .delay = { - .hpd_absent = 200, - .unprepare = 500, - }, -}; - static const struct drm_display_mode kingdisplay_kd116n21_30nv_a010_mode = { .clock = 81000, .hdisplay = 1366, @@ -1689,75 +1608,6 @@ static const struct panel_desc sharp_lq123p1jx31 = { }, }; -static const struct drm_display_mode sharp_lq140m1jw46_mode[] = { - { - .clock = 346500, - .hdisplay = 1920, - .hsync_start = 1920 + 48, - .hsync_end = 1920 + 48 + 32, - .htotal = 1920 + 48 + 32 + 80, - .vdisplay = 1080, - .vsync_start = 1080 + 3, - .vsync_end = 1080 + 3 + 5, - .vtotal = 1080 + 3 + 5 + 69, - .flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC, - }, { - .clock = 144370, - .hdisplay = 1920, - .hsync_start = 1920 + 48, - .hsync_end = 1920 + 48 + 32, - .htotal = 1920 + 48 + 32 + 80, - .vdisplay = 1080, - .vsync_start = 1080 + 3, - .vsync_end = 1080 + 3 + 5, - .vtotal = 1080 + 3 + 5 + 69, - .flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC, - }, -}; - -static const struct panel_desc sharp_lq140m1jw46 = { - .modes = sharp_lq140m1jw46_mode, - .num_modes = ARRAY_SIZE(sharp_lq140m1jw46_mode), - .bpc = 8, - .size = { - .width = 309, - .height = 174, - }, - .delay = { - .hpd_absent = 80, - .enable = 50, - .unprepare = 500, - }, -}; - -static const struct drm_display_mode starry_kr122ea0sra_mode = { - .clock = 147000, - .hdisplay = 1920, - .hsync_start = 1920 + 16, - .hsync_end = 1920 + 16 + 16, - .htotal = 1920 + 16 + 16 + 32, - .vdisplay = 1200, - .vsync_start = 1200 + 15, - .vsync_end = 1200 + 15 + 2, - .vtotal = 1200 + 15 + 2 + 18, - .flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC, -}; - -static const struct panel_desc starry_kr122ea0sra = { - .modes = &starry_kr122ea0sra_mode, - .num_modes = 1, - .size = { - .width = 263, - .height = 164, - }, - .delay = { - /* TODO: should be hpd-absent and no-hpd should be set? */ - .hpd_reliable = 10 + 200, - .enable = 50, - .unprepare = 10 + 500, - }, -}; - static const struct of_device_id platform_of_match[] = { { /* Must be first */ @@ -1785,18 +1635,12 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "auo,b116xa01", .data = &auo_b116xak01, - }, { - .compatible = "auo,b133han05", - .data = &auo_b133han05, }, { .compatible = "auo,b133htn01", .data = &auo_b133htn01, }, { .compatible = "auo,b133xtn01", .data = &auo_b133xtn01, - }, { - .compatible = "auo,b140han06", - .data = &auo_b140han06, }, { .compatible = "boe,nv101wxmn51", .data = &boe_nv101wxmn51, @@ -1824,9 +1668,6 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "innolux,p120zdg-bf1", .data = &innolux_p120zdg_bf1, - }, { - .compatible = "ivo,m133nwf4-r0", - .data = &ivo_m133nwf4_r0, }, { .compatible = "kingdisplay,kd116n21-30nv-a010", .data = &kingdisplay_kd116n21_30nv_a010, @@ -1857,12 +1698,6 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "sharp,lq123p1jx31", .data = &sharp_lq123p1jx31, - }, { - .compatible = "sharp,lq140m1jw46", - .data = &sharp_lq140m1jw46, - }, { - .compatible = "starry,kr122ea0sra", - .data = &starry_kr122ea0sra, }, { /* sentinel */ } @@ -1914,6 +1749,12 @@ static const struct panel_delay delay_200_500_e80_d50 = { .disable = 50, }; +static const struct panel_delay delay_80_500_e50 = { + .hpd_absent = 80, + .unprepare = 500, + .enable = 50, +}; + static const struct panel_delay delay_100_500_e200 = { .hpd_absent = 100, .unprepare = 500, @@ -2122,7 +1963,7 @@ static const struct edp_panel_entry edp_panels[] = { EDP_PANEL_ENTRY('S', 'D', 'C', 0x416d, &delay_100_500_e200, "ATNA45AF01"), EDP_PANEL_ENTRY('S', 'H', 'P', 0x1511, &delay_200_500_e50, "LQ140M1JW48"), - EDP_PANEL_ENTRY('S', 'H', 'P', 0x1523, &sharp_lq140m1jw46.delay, "LQ140M1JW46"), + EDP_PANEL_ENTRY('S', 'H', 'P', 0x1523, &delay_80_500_e50, "LQ140M1JW46"), EDP_PANEL_ENTRY('S', 'H', 'P', 0x153a, &delay_200_500_e50, "LQ140T1JH01"), EDP_PANEL_ENTRY('S', 'H', 'P', 0x154c, &delay_200_500_p2e100, "LQ116M1JW10"),