From patchwork Sun Jul 14 10:53:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 3274 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 9452940F59 for ; Sun, 14 Jul 2024 12:53:55 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-58bd84067fdsf3352634a12.0 for ; Sun, 14 Jul 2024 03:53:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720954435; cv=pass; d=google.com; s=arc-20160816; b=eMC0P8YlAloaSZ+eLHveupuTqw/no9s0aftfK1fy00Do9Mh36MJCP3FxUCxb5PThYR rVTZ00UR43qaA8RcLSYJgEQXNIt1M+zuHZD1q95ntS3Xy/tDKTuDDzB3mRGflvhcAcb9 ZLlTz9l5+Nb1MWCHBvi5YrwAj6heB1ObyikmFtGXmNGOSdPWsUyDICXQnyZU4HV4wrUT t8UyBuUPi+3PPYl9HzHCoa5PAMcqQHmtjxOSuHi8if00ucaeuCjCmaTEruaJ3VOOaJBH EauhjdaaC/HzCp4vQZumGfZMqShe7VPs6r4S/e6W1ohBVkVITuxv5SG/f7UXYKGeNQYW wX7g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=krP4NUGSkeUMNK8SEII3obvO7Ty4Vj7hFPOtuUS94Cs=; fh=cpdMlGn9W9yrKeAUnXFvKwEeph2+Tnx5bta4SFtoiv0=; b=aGFjCfKrajzAAZ9eK1OuRGrkzDka4vv9B2vF4FCHzLSWZfhkURgXfSGLoo7Sti6qIm 6w9uFlt9qf7DnJmGEoId160juM/TnwqdcovGYtJbe8rM4dIE9Dw6YTQDvV+fNaI8iRLv 1km5YkTYnjpuwKoXxpab+vDuSVxAgwn1qqDUVa5v8/7e8eDvt3q663reAm/N6n7vAQ9c 6yCHgOA5ehg/GPNCwjhBnVAcOHdAJJLw28ez3gXP6wmhiA8fhppOZTavPuYEZXIb9Rfk L4UlMmwfqbNEGOKeYkz9chQEIv4A+/xD+FbrjMdaaKR0ijQYVslXiDgqsu3w1SGvhBAq w/UQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=OEiyXPMC; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1720954435; x=1721559235; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=krP4NUGSkeUMNK8SEII3obvO7Ty4Vj7hFPOtuUS94Cs=; b=fFv/izKMqpduKLSRhJ4/H6tQjK3MU8JdiUAs6z0lBbNidxdq15ipjdSJypC8p36PUU RIhDRqhtQSvdg9gKDue6Bieg2xpKJCDjt0vVpykRPbeOhmDDAv/lfEbvJ+SkRYZAWKS3 Lwsv4dbdUOWc0P1aVJcOx/bw4wJ5B0/p0zxdg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720954435; x=1721559235; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=krP4NUGSkeUMNK8SEII3obvO7Ty4Vj7hFPOtuUS94Cs=; b=A/f+KVtuY0OAhV+31vqwqqwP8Oggvrk70ysDuoCHZ2AspObpUFuwfqyBRODhjcrcAc vNuZLPbV2NIjWxC1GIHhIAUYi0W4D7qzQsJOb+G49iggSM76ctt/VYD9egboDZTIboVp o9kn4s8KnroJY48pQ+/C3EvD9SiignzjPhBDAUJRUGRb15f302aW2lrKPcaOJ9NCokc1 HjkcJh1zjJnRU+sCilQnd596qLoAH0ihqnKVgm3lePao2nzINNTTpoGkwa24SzPDw19Y vV2tXiXtlqFyG6Cc81mwA0jp2NRiHZM8tK3EpxqYROfkmRDyJUUmUWM+SkeZd4mUySB/ TAtQ== X-Forwarded-Encrypted: i=2; AJvYcCWOCF86H6R5WkRX+sq2e/VsFg9LGJSIBvyTgyf+nYbTb51Shnr1amsEF8fQG5yhSFULqear32h30tNE8HojVJSr/xkAPdz6Pku/LCLJdyI1r5vTbOaWo9WC/5X/Gg== X-Gm-Message-State: AOJu0YwO+7jMtIy7jVLQ3Icpc8SBVbU/h2uFw8g2WInPpt8J7uzF2Jhs cYQLagfecWUmTeHnjLZSeB56g7gJnU7rPeLMKSv1zmvifcVsVxiYx7JwCtfdIdCO+g== X-Google-Smtp-Source: AGHT+IFVQUGS5eUeeoCJQklzKmdSGxcd6N00Ya8mUcSZTxnBfmj6F9dgCAGYm51cmGrtUqkQ4CWNKA== X-Received: by 2002:a05:6402:5208:b0:58c:909f:3d52 with SMTP id 4fb4d7f45d1cf-594b9a10437mr12580357a12.6.1720954435313; Sun, 14 Jul 2024 03:53:55 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:28af:b0:584:b54c:52ad with SMTP id 4fb4d7f45d1cf-59826225ad3ls1670254a12.1.-pod-prod-07-eu; Sun, 14 Jul 2024 03:53:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVgRbjgY7NGhmkolCZvj+zGpEvZxHUUo5SRQLQyMBvXPPtUGJMYmHmdg2JnjerayBWY0X7wGAa5apFePobGyEUL3yeFrvEtdANRDak3A+05aTDj X-Received: by 2002:a17:906:6810:b0:a77:e337:b1c with SMTP id a640c23a62f3a-a780b68a26cmr927312766b.15.1720954433469; Sun, 14 Jul 2024 03:53:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720954433; cv=none; d=google.com; s=arc-20160816; b=kTbb5iPtlAkajvL9JKFLbVTPJDirJIOz05RqSysDYqCssvG082ZLRotrSu4yGE5+U+ /PJ5kVtp/HfgBB+d/EAjJqEKxDURLQTXNAkeQzeWgxG1AMGMyCxuSNBu9s9GP/lwMt5P yTcRwserOOqpcOB2rp2HLmyybVOSbCNB5KDNRvIcMPzJMWRBawf9JJoj6NUPQfen21gK XT3bJFe+GVzdNc1bJ4zUttE/quB2ksHOWE1Pe+01Yt2/NygR7339noFLHDSxRvLX9DyC /2tyNDytatQhctZKvA/AmYiqFQMql6vKipaObH4aox4TMMVHBHRv8n4gD3tplKzFsWb1 FSUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Hmbbxb1F+DyFqKbkxqGn2PPIwpqkWAvkpsklF4VY2yo=; fh=NBeUaNtv255oB6sGXk6o88aWqYF7Tg7Sq4BlKlR3IcQ=; b=fqgeYSkTtIMjVUqCWgf1FcSkknsHG/g3SUPeVFfVhAFz6wPc46q3XYVwL5sZmEtm4s uOwc3PQ9AERuxrAgg56cWIL//xE3ERw7r7Hm6HkC3ZREyTE/4eYKeRJSNhRObuVtCqOl /fuX7eAwSK8uEaPWOMzbkSW6Z3cJuxzYDEvSMB+qj4t4sUQh7U/+gPzDmRP2HCONmPD9 q/I2Qbr4TDew/HnhO5adJXG1v0a6aiYBoxIC0R5Cmjsm2ZC89ltKqUk2kSoc352bY16E 4qilwRd1HS4pXFt4TSSQ1XZT4KOUETkAaEJXMYi6yZSRsG2mvT+R8tiMgGzTMoSFuOk2 kOyA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=OEiyXPMC; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-a79bc7d0048sor49925466b.17.2024.07.14.03.53.53 for (Google Transport Security); Sun, 14 Jul 2024 03:53:53 -0700 (PDT) Received-SPF: pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCUeq5q6T7uwpF0s20PcUjlo0YPdhX3K6W7Th9DULpewj0oBMoba0UqcBxNe06UodhgIOllg58Fwg7wCd6aL69cE2D228P/uyn+vrze4yFI/dkW5 X-Received: by 2002:a17:907:7284:b0:a77:d1ea:ab36 with SMTP id a640c23a62f3a-a780b68a2d7mr1342650366b.6.1720954433061; Sun, 14 Jul 2024 03:53:53 -0700 (PDT) Received: from panicking.. (mob-5-91-58-211.net.vodafone.it. [5.91.58.211]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a79bc5a36c7sm119966166b.7.2024.07.14.03.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jul 2024 03:53:52 -0700 (PDT) From: Michael Trimarchi To: Michael Trimarchi Cc: Dario Binacchi , Patrick Barsanti , linux-amarula@amarulasolutions.com Subject: [PATCH 17/25] video: Update mxsfb video drivers for iMX8MM/iMX8MN display Date: Sun, 14 Jul 2024 12:53:20 +0200 Message-ID: <20240714105328.35825-17-michael@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240714105328.35825-1-michael@amarulasolutions.com> References: <20240714105328.35825-1-michael@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: michael@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=OEiyXPMC; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Update mxsfb for LCD video driver Signed-off-by: Ye Li Signed-off-by: Michael Trimarchi --- drivers/video/mxsfb.c | 141 ++++++++++++++++++++++++++++-------------- 1 file changed, 95 insertions(+), 46 deletions(-) diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index 792d6314d1..4186ccd002 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -21,8 +21,13 @@ #include #include #include +#include +#include +#include +#include #include "videomodes.h" +#include #define PS2KHZ(ps) (1000000000UL / (ps)) #define HZ2PS(hz) (1000000000UL / ((hz) / 1000)) @@ -30,6 +35,11 @@ #define BITS_PP 18 #define BYTES_PP 4 +struct mxsfb_priv { + fdt_addr_t reg_base; + struct udevice *disp_dev; +}; + struct mxs_dma_desc desc; /** @@ -56,9 +66,10 @@ __weak void mxsfb_system_setup(void) */ static void mxs_lcd_init(struct udevice *dev, u32 fb_addr, - struct display_timing *timings, int bpp) + struct display_timing *timings, int bpp, bool bridge) { - struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)MXS_LCDIF_BASE; + struct mxsfb_priv *priv = dev_get_priv(dev); + struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)priv->reg_base; const enum display_flags flags = timings->flags; uint32_t word_len = 0, bus_width = 0; uint8_t valid_data = 0; @@ -109,7 +120,7 @@ static void mxs_lcd_init(struct udevice *dev, u32 fb_addr, } #else /* Kick in the LCDIF clock */ - mxs_set_lcdclk(MXS_LCDIF_BASE, timings->pixelclock.typ / 1000); + mxs_set_lcdclk(priv->reg_base, timings->pixelclock.typ / 1000); #endif /* Restart the LCDIF block */ @@ -142,26 +153,30 @@ static void mxs_lcd_init(struct udevice *dev, u32 fb_addr, LCDIF_CTRL_BYPASS_COUNT | LCDIF_CTRL_LCDIF_MASTER, ®s->hw_lcdif_ctrl); - writel(valid_data << LCDIF_CTRL1_BYTE_PACKING_FORMAT_OFFSET, + writel((valid_data << LCDIF_CTRL1_BYTE_PACKING_FORMAT_OFFSET) | + LCDIF_CTRL1_RECOVER_ON_UNDERFLOW, ®s->hw_lcdif_ctrl1); + if (bridge) + writel(LCDIF_CTRL2_OUTSTANDING_REQS_REQ_16, ®s->hw_lcdif_ctrl2); + mxsfb_system_setup(); writel((timings->vactive.typ << LCDIF_TRANSFER_COUNT_V_COUNT_OFFSET) | timings->hactive.typ, ®s->hw_lcdif_transfer_count); - vdctrl0 = LCDIF_VDCTRL0_ENABLE_PRESENT | LCDIF_VDCTRL0_ENABLE_POL | + vdctrl0 = LCDIF_VDCTRL0_ENABLE_PRESENT | LCDIF_VDCTRL0_VSYNC_PERIOD_UNIT | LCDIF_VDCTRL0_VSYNC_PULSE_WIDTH_UNIT | timings->vsync_len.typ; - if(flags & DISPLAY_FLAGS_HSYNC_HIGH) + if (flags & DISPLAY_FLAGS_HSYNC_HIGH) vdctrl0 |= LCDIF_VDCTRL0_HSYNC_POL; - if(flags & DISPLAY_FLAGS_VSYNC_HIGH) + if (flags & DISPLAY_FLAGS_VSYNC_HIGH) vdctrl0 |= LCDIF_VDCTRL0_VSYNC_POL; - if(flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE) + if (flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE) vdctrl0 |= LCDIF_VDCTRL0_DOTCLK_POL; - if(flags & DISPLAY_FLAGS_DE_HIGH) + if (flags & DISPLAY_FLAGS_DE_HIGH) vdctrl0 |= LCDIF_VDCTRL0_ENABLE_POL; writel(vdctrl0, ®s->hw_lcdif_vdctrl0); @@ -198,10 +213,10 @@ static void mxs_lcd_init(struct udevice *dev, u32 fb_addr, } static int mxs_probe_common(struct udevice *dev, struct display_timing *timings, - int bpp, u32 fb) + int bpp, u32 fb, bool bridge) { /* Start framebuffer */ - mxs_lcd_init(dev, fb, timings, bpp); + mxs_lcd_init(dev, fb, timings, bpp, bridge); #ifdef CONFIG_VIDEO_MXS_MODE_SYSTEM /* @@ -212,7 +227,8 @@ static int mxs_probe_common(struct udevice *dev, struct display_timing *timings, * sets the RUN bit, then waits until it gets cleared and repeats this * infinitelly. This way, we get smooth continuous updates of the LCD. */ - struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)MXS_LCDIF_BASE; + struct mxsfb_priv *priv = dev_get_priv(dev); + struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)priv->reg_base; memset(&desc, 0, sizeof(struct mxs_dma_desc)); desc.address = (dma_addr_t)&desc; @@ -229,9 +245,9 @@ static int mxs_probe_common(struct udevice *dev, struct display_timing *timings, return 0; } -static int mxs_remove_common(u32 fb) +static int mxs_remove_common(phys_addr_t reg_base, u32 fb) { - struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)MXS_LCDIF_BASE; + struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)(reg_base); int timeout = 1000000; if (!fb) @@ -258,6 +274,7 @@ static int mxs_of_get_timings(struct udevice *dev, int ret = 0; u32 display_phandle; ofnode display_node; + struct mxsfb_priv *priv = dev_get_priv(dev); ret = ofnode_read_u32(dev_ofnode(dev), "display", &display_phandle); if (ret) { @@ -278,10 +295,19 @@ static int mxs_of_get_timings(struct udevice *dev, return -EINVAL; } - ret = ofnode_decode_display_timing(display_node, 0, timings); - if (ret) { - dev_err(dev, "failed to get any display timings\n"); - return -EINVAL; + priv->disp_dev = video_link_get_next_device(dev); + if (priv->disp_dev) { + ret = video_link_get_display_timings(timings); + if (ret) { + dev_err(dev, "failed to get any video link display timings\n"); + return -EINVAL; + } + } else { + ret = ofnode_decode_display_timing(display_node, 0, timings); + if (ret) { + dev_err(dev, "failed to get any display timings\n"); + return -EINVAL; + } } return ret; @@ -291,20 +317,58 @@ static int mxs_video_probe(struct udevice *dev) { struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); + struct mxsfb_priv *priv = dev_get_priv(dev); struct display_timing timings; u32 bpp = 0; u32 fb_start, fb_end; int ret; + bool enable_bridge = false; debug("%s() plat: base 0x%lx, size 0x%x\n", __func__, plat->base, plat->size); + priv->reg_base = dev_read_addr(dev); + if (priv->reg_base == FDT_ADDR_T_NONE) { + dev_err(dev, "lcdif base address is not found\n"); + return -EINVAL; + } + ret = mxs_of_get_timings(dev, &timings, &bpp); if (ret) return ret; - ret = mxs_probe_common(dev, &timings, bpp, plat->base); + if (priv->disp_dev) { +#if IS_ENABLED(CONFIG_VIDEO_BRIDGE) + if (device_get_uclass_id(priv->disp_dev) == UCLASS_VIDEO_BRIDGE) { + ret = video_bridge_attach(priv->disp_dev); + if (ret) { + dev_err(dev, "fail to attach bridge\n"); + return ret; + } + + ret = video_bridge_set_backlight(priv->disp_dev, 80); + if (ret) { + dev_err(dev, "fail to set backlight\n"); + return ret; + } + + enable_bridge = true; + video_bridge_check_timing(priv->disp_dev, &timings); + } +#endif + + if (device_get_uclass_id(priv->disp_dev) == UCLASS_PANEL) { + ret = panel_enable_backlight(priv->disp_dev); + if (ret) { + dev_err(dev, "panel %s enable backlight error %d\n", + priv->disp_dev->name, ret); + return ret; + } + } + } + + ret = mxs_probe_common(dev, &timings, bpp, plat->base, enable_bridge); if (ret) return ret; @@ -343,33 +407,9 @@ static int mxs_video_probe(struct udevice *dev) static int mxs_video_bind(struct udevice *dev) { struct video_uc_plat *plat = dev_get_uclass_plat(dev); - struct display_timing timings; - u32 bpp = 0; - u32 bytes_pp = 0; - int ret; - ret = mxs_of_get_timings(dev, &timings, &bpp); - if (ret) - return ret; - - switch (bpp) { - case 32: - case 24: - case 18: - bytes_pp = 4; - break; - case 16: - bytes_pp = 2; - break; - case 8: - bytes_pp = 1; - break; - default: - dev_err(dev, "invalid bpp specified (bpp = %i)\n", bpp); - return -EINVAL; - } - - plat->size = timings.hactive.typ * timings.vactive.typ * bytes_pp; + /* Max size supported by LCDIF, because in bind, we can't probe panel */ + plat->size = 1920 * 1080 *4 * 2; return 0; } @@ -377,8 +417,14 @@ static int mxs_video_bind(struct udevice *dev) static int mxs_video_remove(struct udevice *dev) { struct video_uc_plat *plat = dev_get_uclass_plat(dev); + struct mxsfb_priv *priv = dev_get_priv(dev); + + debug("%s\n", __func__); + + if (priv->disp_dev) + device_remove(priv->disp_dev, DM_REMOVE_NORMAL); - mxs_remove_common(plat->base); + mxs_remove_common(priv->reg_base, plat->base); return 0; } @@ -389,6 +435,8 @@ static const struct udevice_id mxs_video_ids[] = { { .compatible = "fsl,imx6sx-lcdif" }, { .compatible = "fsl,imx7ulp-lcdif" }, { .compatible = "fsl,imxrt-lcdif" }, + { .compatible = "fsl,imx8mm-lcdif" }, + { .compatible = "fsl,imx8mn-lcdif" }, { /* sentinel */ } }; @@ -400,4 +448,5 @@ U_BOOT_DRIVER(mxs_video) = { .probe = mxs_video_probe, .remove = mxs_video_remove, .flags = DM_FLAG_PRE_RELOC | DM_FLAG_OS_PREPARE, + .priv_auto = sizeof(struct mxsfb_priv), };