From patchwork Fri Jan 5 10:37:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nazzareno Trimarchi X-Patchwork-Id: 10146271 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 397486034B for ; Fri, 5 Jan 2018 10:37:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 263D6285FF for ; Fri, 5 Jan 2018 10:37:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B0EF2873D; Fri, 5 Jan 2018 10:37:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DBAA285FF for ; Fri, 5 Jan 2018 10:37:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751027AbeAEKhV (ORCPT ); Fri, 5 Jan 2018 05:37:21 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:44598 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750992AbeAEKhU (ORCPT ); Fri, 5 Jan 2018 05:37:20 -0500 Received: by mail-wm0-f68.google.com with SMTP id t8so1598535wmc.3 for ; Fri, 05 Jan 2018 02:37:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=gX/AWglCmWZL5tgsGFDBxwXqkXOW0IbXQ3+bn9wT3HY=; b=EUE6uG/Yb9E30Xmo17OFruqDApzohxm+2k8OEIJ6+XozN/HWxFOzGPKcYxSDf8yzbG U1pPMubLGOX2HmEh95qCvFtenSYGrsJ/CA/c0HZUeLTerR8v7DPDqU5JqJyJJ5t7aOjW eWQC6jOjZWUtrpWBJzTzS4wHakxmy0XkEQ60tiamwkTW7r0Rcp1uOP5emRMWFPxbH5HL csS/MEWbnhj6sg5+YdgMbuZx+Y5ZaA5LrnoqwBUC5rlQwRII6AAFa819uG7Ykg7+4WG+ bapxrqruaZnWyQoEae4NRdqnlkMcCAfML50Z+bSzdROizufIFPCusl73HdQr08LupeSS VTCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=gX/AWglCmWZL5tgsGFDBxwXqkXOW0IbXQ3+bn9wT3HY=; b=LkAsvFJ3Q09F1znKHyHFCe1nmQN2nGkUrfXSJFKTkIyRNjZCSA+GE5Ua3GFxk4/S6V UyS/eO/iu5k+ocugpamoOgvocMcySnExm+gOnbFXKnfsWlDK6DZKXEEVvQm/n2c5NQ4n kpDj9Z38u0qQYZb3jinzwTbMSV4iQ7AZhEgtCv4GFsGRBuZ8JzMi/eGzluilYNr1C0v9 ONvgUhVY20MgYjAdLlhwSsX6kIIc4A/3/niDZEjUad9JY0gEX/BOlhz6qZp+wwyfJu8S GFzE9PSjP/FGeN+mgq0RFMST8TX6zKMT4AFvn3W+oPEZpKwY2OizKQ6voUJcJpVW9Q8L V0Cg== X-Gm-Message-State: AKGB3mLrtjr06zipbgKtmAdQcgPOutrH0Bp4T7wyc5SPMm1K16T9EwKj L+l4Z/15mkCjUTtauCFzovKCXw== X-Google-Smtp-Source: ACJfBoujqqVHTaqSPsyroGAI643w0yNQpsfS7ZGfBQanb77KKUYaytUALry4XOYLA32Tjotocar3ww== X-Received: by 10.28.230.13 with SMTP id d13mr1950870wmh.125.1515148639246; Fri, 05 Jan 2018 02:37:19 -0800 (PST) Received: from panicking ([5.170.79.102]) by smtp.gmail.com with ESMTPSA id g78sm7261013wmc.30.2018.01.05.02.37.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 02:37:18 -0800 (PST) Date: Fri, 5 Jan 2018 11:37:15 +0100 From: Michael Trimarchi To: Stefan Agner Cc: artlomiej Zolnierkiewicz , Shawn Guo , linux-fbdev@vger.kernel.org Subject: [RFC PATCH V2] fbdev: mxsfb: use framebuffer_alloc in the correct way Message-ID: <20180105103713.GA4196@panicking> References: <1515100498-23066-1-git-send-email-michael@amarulasolutions.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP framebuffer_alloc allocated the fb_info struct plus the extra par and set fb_info->par pointer equal to this extra par. We can refer the mxcfb_info from fb_info->par Signed-off-by: Michael Trimarchi Reviewed-by: Stefan Agner Tested-by: Stefan Agner --- Changes V1->V2: - drop to_imxfb_host. Use instead fb_info->par --- drivers/video/fbdev/mxsfb.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/drivers/video/fbdev/mxsfb.c b/drivers/video/fbdev/mxsfb.c index 79b1dc7..246bea3 100644 --- a/drivers/video/fbdev/mxsfb.c +++ b/drivers/video/fbdev/mxsfb.c @@ -169,7 +169,6 @@ struct mxsfb_devdata { }; struct mxsfb_info { - struct fb_info fb_info; struct platform_device *pdev; struct clk *clk; struct clk *clk_axi; @@ -208,8 +207,6 @@ static const struct mxsfb_devdata mxsfb_devdata[] = { }, }; -#define to_imxfb_host(x) (container_of(x, struct mxsfb_info, fb_info)) - /* mask and shift depends on architecture */ static inline u32 set_hsync_pulse_width(struct mxsfb_info *host, unsigned val) { @@ -269,7 +266,7 @@ static inline unsigned chan_to_field(unsigned chan, struct fb_bitfield *bf) static int mxsfb_check_var(struct fb_var_screeninfo *var, struct fb_info *fb_info) { - struct mxsfb_info *host = to_imxfb_host(fb_info); + struct mxsfb_info *host = fb_info->par; const struct fb_bitfield *rgb = NULL; if (var->xres < MIN_XRES) @@ -330,7 +327,7 @@ static inline void mxsfb_disable_axi_clk(struct mxsfb_info *host) static void mxsfb_enable_controller(struct fb_info *fb_info) { - struct mxsfb_info *host = to_imxfb_host(fb_info); + struct mxsfb_info *host = fb_info->par; u32 reg; int ret; @@ -367,7 +364,7 @@ static void mxsfb_enable_controller(struct fb_info *fb_info) static void mxsfb_disable_controller(struct fb_info *fb_info) { - struct mxsfb_info *host = to_imxfb_host(fb_info); + struct mxsfb_info *host = fb_info->par; unsigned loop; u32 reg; int ret; @@ -409,7 +406,7 @@ static void mxsfb_disable_controller(struct fb_info *fb_info) static int mxsfb_set_par(struct fb_info *fb_info) { - struct mxsfb_info *host = to_imxfb_host(fb_info); + struct mxsfb_info *host = fb_info->par; u32 ctrl, vdctrl0, vdctrl4; int line_size, fb_size; int reenable = 0; @@ -569,7 +566,7 @@ static int mxsfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, static int mxsfb_blank(int blank, struct fb_info *fb_info) { - struct mxsfb_info *host = to_imxfb_host(fb_info); + struct mxsfb_info *host = fb_info->par; switch (blank) { case FB_BLANK_POWERDOWN: @@ -591,7 +588,7 @@ static int mxsfb_blank(int blank, struct fb_info *fb_info) static int mxsfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *fb_info) { - struct mxsfb_info *host = to_imxfb_host(fb_info); + struct mxsfb_info *host = fb_info->par; unsigned offset; if (var->xoffset != 0) @@ -622,10 +619,10 @@ static struct fb_ops mxsfb_ops = { .fb_imageblit = cfb_imageblit, }; -static int mxsfb_restore_mode(struct mxsfb_info *host, +static int mxsfb_restore_mode(struct fb_info *fb_info, struct fb_videomode *vmode) { - struct fb_info *fb_info = &host->fb_info; + struct mxsfb_info *host = fb_info->par; unsigned line_count; unsigned period; unsigned long pa, fbsize; @@ -726,10 +723,10 @@ static int mxsfb_restore_mode(struct mxsfb_info *host, return ret; } -static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host, +static int mxsfb_init_fbinfo_dt(struct fb_info *fb_info, struct fb_videomode *vmode) { - struct fb_info *fb_info = &host->fb_info; + struct mxsfb_info *host = fb_info->par; struct fb_var_screeninfo *var = &fb_info->var; struct device *dev = &host->pdev->dev; struct device_node *np = host->pdev->dev.of_node; @@ -805,12 +802,12 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host, return ret; } -static int mxsfb_init_fbinfo(struct mxsfb_info *host, +static int mxsfb_init_fbinfo(struct fb_info *fb_info, struct fb_videomode *vmode) { int ret; + struct mxsfb_info *host = fb_info->par; struct device *dev = &host->pdev->dev; - struct fb_info *fb_info = &host->fb_info; struct fb_var_screeninfo *var = &fb_info->var; dma_addr_t fb_phys; void *fb_virt; @@ -824,7 +821,7 @@ static int mxsfb_init_fbinfo(struct mxsfb_info *host, fb_info->fix.visual = FB_VISUAL_TRUECOLOR, fb_info->fix.accel = FB_ACCEL_NONE; - ret = mxsfb_init_fbinfo_dt(host, vmode); + ret = mxsfb_init_fbinfo_dt(fb_info, vmode); if (ret) return ret; @@ -843,16 +840,16 @@ static int mxsfb_init_fbinfo(struct mxsfb_info *host, fb_info->screen_base = fb_virt; fb_info->screen_size = fb_info->fix.smem_len = fb_size; - if (mxsfb_restore_mode(host, vmode)) + if (mxsfb_restore_mode(fb_info, vmode)) memset(fb_virt, 0, fb_size); return 0; } -static void mxsfb_free_videomem(struct mxsfb_info *host) +static void mxsfb_free_videomem(struct fb_info *fb_info) { + struct mxsfb_info *host = fb_info->par; struct device *dev = &host->pdev->dev; - struct fb_info *fb_info = &host->fb_info; dma_free_wc(dev, fb_info->screen_size, fb_info->screen_base, fb_info->fix.smem_start); @@ -902,7 +899,7 @@ static int mxsfb_probe(struct platform_device *pdev) if (mode == NULL) return -ENOMEM; - host = to_imxfb_host(fb_info); + host = fb_info->par; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); host->base = devm_ioremap_resource(&pdev->dev, res); @@ -941,7 +938,7 @@ static int mxsfb_probe(struct platform_device *pdev) goto fb_release; } - ret = mxsfb_init_fbinfo(host, mode); + ret = mxsfb_init_fbinfo(fb_info, mode); if (ret != 0) goto fb_release; @@ -982,13 +979,13 @@ static int mxsfb_probe(struct platform_device *pdev) static int mxsfb_remove(struct platform_device *pdev) { struct fb_info *fb_info = platform_get_drvdata(pdev); - struct mxsfb_info *host = to_imxfb_host(fb_info); + struct mxsfb_info *host = fb_info->par; if (host->enabled) mxsfb_disable_controller(fb_info); unregister_framebuffer(fb_info); - mxsfb_free_videomem(host); + mxsfb_free_videomem(fb_info); framebuffer_release(fb_info); @@ -998,7 +995,7 @@ static int mxsfb_remove(struct platform_device *pdev) static void mxsfb_shutdown(struct platform_device *pdev) { struct fb_info *fb_info = platform_get_drvdata(pdev); - struct mxsfb_info *host = to_imxfb_host(fb_info); + struct mxsfb_info *host = fb_info->par; mxsfb_enable_axi_clk(host);