From patchwork Tue Mar 26 13:19:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871039 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5F7E449E6 for ; Tue, 26 Mar 2019 13:20:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 474A02915A for ; Tue, 26 Mar 2019 13:20:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 403F929140; Tue, 26 Mar 2019 13:20:35 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 68F7A28C6B for ; Tue, 26 Mar 2019 13:20:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A20D46E045; Tue, 26 Mar 2019 13:20:17 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id B60E46E041 for ; Tue, 26 Mar 2019 13:20:15 +0000 (UTC) Received: by mail-ed1-x543.google.com with SMTP id x10so10671994edh.11 for ; Tue, 26 Mar 2019 06:20:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XbQEara1/oKAvGCmK3TwlFj44GrDr5e0qht7fMyMnfE=; b=BzPWADNP5eSWzRX6/s3rrWRZNBZFzJ/yy7+JTto8jH0MnmCk+Q0nza2SEvwuzhQ0Of vNqkEojzGhSLvu4exwhGiXHZ4e2jpvebFEI755tarcDBYDPW6xAJS0mlfgzQBV4IEdi3 8W7R5vtGKAb7+++KVA9O/g3Jr5edqYmtKgHf4IrYO5IsWkXwubyCtrh2xCuYhPLmqNOT +D8Dzs+hlKXe+qyH7xY20EsOoak0VIL5k/HJdzSDC73JZwbUpW2Kllrf+OMcNPkpeRbG wOHIYkVcPNTM4QEWvRVezcvcm7szK4GcfJvSfadFVo8elAczn8+aXA/HTt8RXCFmt5jn nFUQ== X-Gm-Message-State: APjAAAUf4tVhHN+gx0lmKsW9vkrkIm5G9f+9M7m/rmCb1EyzmI9mo4kq 4OaMXFPo8y6Cv/S+d0pJE2vPqqDrsCQ= X-Google-Smtp-Source: APXvYqwuXE8+kB4lB19PzJuQ+UaOEfTBTI9glP4ojSgTirf0UdnAa0V6DruOybb0B/iIaeEPTH7Qtw== X-Received: by 2002:a17:906:a18:: with SMTP id w24mr17491395ejf.94.1553606414409; Tue, 26 Mar 2019 06:20:14 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:13 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:19:48 +0100 Message-Id: <20190326132008.11781-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XbQEara1/oKAvGCmK3TwlFj44GrDr5e0qht7fMyMnfE=; b=U/v1sSriLKxuO4288NwyDIccaxlHMBQaY7rpUTdp3bcDbq//ijl0N2rPkC2iysSMg+ Tytlub1wn20+IHLB3pLQSgoy8IHE13/NM2snCJ4wynMZvFfnJjno5SbLofi1AnBANX2y 7mXCuUHZNIHSqttdGHdbLDxcyos3nKuu/ryAg= Subject: [Intel-gfx] [PATCH 01/21] drm/fb-helper: Add fill_info() functions X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , =?utf-8?q?Nor?= =?utf-8?q?alf_Tr=C3=B8nnes?= , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP The fbdev split between fix and var information is kinda pointless for drm drivers since everything is fixed: The fbdev emulation doesn't support changing modes at all. Create a new simplified helper and use it in the generic fbdev helper code. Follow-up patches will beef it up more and roll it out to all drivers. v2: We need to keep sizes, since they might not match the fb dimesions (Noralf) Cc: Noralf Trønnes Signed-off-by: Daniel Vetter Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/drm_fb_helper.c | 30 ++++++++++++++++++++++++++++-- include/drm/drm_fb_helper.h | 3 +++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index c3d6a8c78a51..b89d177228e2 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -2105,6 +2105,33 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe } EXPORT_SYMBOL(drm_fb_helper_fill_var); +/** + * drm_fb_helper_fill_info - initializes fbdev information + * @info: fbdev instance to set up + * @fb_helper: fb helper instance to use as template + * @sizes: describes fbdev size and scanout surface size + * + * + * Sets up the variable and fixed fbdev metainformation from the given fb helper + * instance and the drm framebuffer allocated in &drm_fb_helper.fb. + * + * Drivers should call this (or their equivalent setup code) from their + * &drm_fb_helper_funcs.fb_probe callback after having allocated the fbdev + * backing storage framebuffer. + */ +void drm_fb_helper_fill_info(struct fb_info *info, + struct drm_fb_helper *fb_helper, + struct drm_fb_helper_surface_size *sizes) +{ + struct drm_framebuffer *fb = fb_helper->fb; + + drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); + drm_fb_helper_fill_var(info, fb_helper, + sizes->fb_width, sizes->fb_height); + +} +EXPORT_SYMBOL(drm_fb_helper_fill_info); + static int drm_fb_helper_probe_connector_modes(struct drm_fb_helper *fb_helper, uint32_t maxX, uint32_t maxY) @@ -3165,8 +3192,7 @@ int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper, #endif strcpy(fbi->fix.id, "DRM emulated"); - drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(fbi, fb_helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(fbi, fb_helper, sizes); if (fb->funcs->dirty) { struct fb_ops *fbops; diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 286d58efed5d..9ef72f20662d 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -293,6 +293,9 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe uint32_t fb_width, uint32_t fb_height); void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch, uint32_t depth); +void drm_fb_helper_fill_info(struct fb_info *info, + struct drm_fb_helper *fb_helper, + struct drm_fb_helper_surface_size *sizes); void drm_fb_helper_unlink_fbi(struct drm_fb_helper *fb_helper); From patchwork Tue Mar 26 13:19:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871033 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E46FA18A6 for ; Tue, 26 Mar 2019 13:20:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF4C828FC5 for ; Tue, 26 Mar 2019 13:20:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B224C28FB5; Tue, 26 Mar 2019 13:20:34 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9667C28FB6 for ; Tue, 26 Mar 2019 13:20:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6C6EF6E04D; Tue, 26 Mar 2019 13:20:21 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id 758E76E046 for ; Tue, 26 Mar 2019 13:20:19 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id d1so10702930edd.13 for ; Tue, 26 Mar 2019 06:20:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=81wpVqWucfpK7AWAt6oV4PRNPx7nXh4v+PeCVgIINMA=; b=ZSaCWsge7per800aysF0cjO4nhNOYlbfaups1HpQ2Yw/CymQPFgIlWqp7VlIlGTbW2 1IGDJY3TOGW/W3MNmB+ADmpNMc/9idSrJJqpOT0koyHBRxmmkLK38yx5FHz1g3a915qq yd32DZLkEjbTxI+Z1JsN5AX5i/z+DsbLXx0LXSfnEg7RnhzyZEvoptnjfkH74HqcupxD Hd4C+hEc6GLTWmbCV85QQlqR8O/4d9mF6AtZY6WZ61aCEJV0+Ohr8mygZ+KK53w8PPPv L1EkAPCSgD0RPev0FF+xwBz7U9XU938cc3ZyNmJd62graKoNsi1tM3Q5m6YnHy3JFMQ8 ZMaw== X-Gm-Message-State: APjAAAXpSNhlr5wbNkBF0cOCLyuCrFfFxl0qGwmDLvs/sbknKsz77DCp 4A5OPDjfaB7upseY4AOOSWgdvA== X-Google-Smtp-Source: APXvYqzVhapsVUUZEQOIeMKg770qrkWrR6fWOOc2P8lEav/B48GsdXLP/T3/XZ/oMYS+9Ir/f6yq8w== X-Received: by 2002:a17:906:f0f:: with SMTP id z15mr17825526eji.125.1553606415740; Tue, 26 Mar 2019 06:20:15 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:14 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:19:49 +0100 Message-Id: <20190326132008.11781-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=81wpVqWucfpK7AWAt6oV4PRNPx7nXh4v+PeCVgIINMA=; b=RRHF8+htafrQmyKi68NbpZ4ZY9ganGpqQoICVKXnqP3JHCYsNwXTFRIigDhWp0boER WbpQ5QFZgIjOoMKDkvEOn5WKVWa1BOvwYAhvDU+Z1AysCt6R3cYm112fsdVu5k6l55ZX fmgeWzE4BevbIm9mzJ+w4CgRzCYdZQK2sxiR8= Subject: [Intel-gfx] [PATCH 02/21] drm/fb-helper: set fbi->fix.id in fill_info() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Ilia Mirkin , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Looking at the oldest/most popular drivers ${driver}drmfb seems to be the standard, except i915.ko went with "inteldrmfb". I guess renaming that for consistency won't hurt, it definitely confused me when I started with kms 10 years ago. I hope this never became uapi ... worst case drivers can overwrite it after having called fill_info(). Since subsequent patches change this for some drivers later on in the series, here's the exhaustive list of where all fix.id is used: - /proc/fb which prints the minor number and fix.id name. - per-fb sysfs name file - getfix ioctl, which is used by fbset only to print out the name when dumping information - lots and lots of places in dmesg, anytime anything happens with an fbdev really I think minimal to 0 chances that changing this will screw up a config script or something, since outside of informational message it's not used by anything to identify which fbdev maps to which minor. After all the last fbset release is from 1999, and that predates even devfs I think. v2: Rebase and amend commit message, thanks to Ilia for pointing out that this needs to be spelled out. Cc: Ilia Mirkin igned-off-by: Daniel Vetter Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/drm_fb_helper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index b89d177228e2..e3538c851c58 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -2129,6 +2129,9 @@ void drm_fb_helper_fill_info(struct fb_info *info, drm_fb_helper_fill_var(info, fb_helper, sizes->fb_width, sizes->fb_height); + snprintf(info->fix.id, sizeof(info->fix.id), "%sdrmfb", + fb_helper->dev->driver->name); + } EXPORT_SYMBOL(drm_fb_helper_fill_info); @@ -3190,8 +3193,6 @@ int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper, fbi->fix.smem_start = page_to_phys(virt_to_page(fbi->screen_buffer)); #endif - strcpy(fbi->fix.id, "DRM emulated"); - drm_fb_helper_fill_info(fbi, fb_helper, sizes); if (fb->funcs->dirty) { From patchwork Tue Mar 26 13:19:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871031 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 945BB186E for ; Tue, 26 Mar 2019 13:20:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8163D28FC9 for ; Tue, 26 Mar 2019 13:20:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 769BB29074; Tue, 26 Mar 2019 13:20:34 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BB46328FA0 for ; Tue, 26 Mar 2019 13:20:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C30D6E046; Tue, 26 Mar 2019 13:20:21 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id B82A86E04C for ; Tue, 26 Mar 2019 13:20:19 +0000 (UTC) Received: by mail-ed1-x543.google.com with SMTP id m16so10695925edd.12 for ; Tue, 26 Mar 2019 06:20:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XLuJWbcYd6zdnjnx1SUxd5SBMcbKxbAWKXjN6jWvXz0=; b=JURmqnj1bVAbgA4CokJdO3ufSy+HzkFenRb+UY+TGLfVxM0ms2+YRwcMqdZVuc/C7g X6+SC8R+erVPC7hHLHIpYbiECmndXTFKFTgrjEPKC5/OKN7lemoTmn0NIu2quoHS44oQ MZ7VLBjblXAV9JiLww8FQQ5veJSraqhyZAf1w4HGYnM2E/PKbNsf/EDp1TjJijK+l+AS TcQ83Bs1IQwfGUvN3xYHSNU+v/j9BukMaJ4lXK3DQ3XDecdwJaAIE+ixMh1rdkegSxfm Z+ioCsosK+MdRUgBilyC2XHob+xBHsnXdfClmh1ooYb/ClOCDgkD/ylcxUlQGb7v92Np VCBg== X-Gm-Message-State: APjAAAV05qxA8+Tatb4s2RN7fjmSdL7pO8mH5Vl8QvNc3Z9qvui5S0xl mlXFSMVtCCGtW+jqN+kbesltMmQzfD0= X-Google-Smtp-Source: APXvYqwG1ySxzJyYQssyfoQrgz8e4vxcocZ4IcFCl5BEyDcklYjedxCIE0v9+kRieMErlEQ3925k7g== X-Received: by 2002:a17:906:a841:: with SMTP id dx1mr16290893ejb.99.1553606416950; Tue, 26 Mar 2019 06:20:16 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:16 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:19:50 +0100 Message-Id: <20190326132008.11781-3-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XLuJWbcYd6zdnjnx1SUxd5SBMcbKxbAWKXjN6jWvXz0=; b=NZt+BmzHLfE1v1ptXGThekXOH3o0Ov08iBrByugpC5eWs/v+YGmZPd7FGbDN/JBNrk G1JG4OMlS8t2Ktig06KcmHEx3G7TVX/1SBTnHYbOxHevQDmb4D8sK+Za1fVuCm68S7Ad AuouuEARUCwK2z9NnhgDTBcrhKXsmL4G9qHew= Subject: [Intel-gfx] [PATCH 03/21] drm/fb_helper: set info->par in fill_info() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Sam Ravnborg Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP The fbdev emulation helpers pretty much assume that this is set. Let's do it for everyone. Reviewed-by: Sam Ravnborg Cc: Sam Ravnborg Signed-off-by: Daniel Vetter Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/drm_fb_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index e3538c851c58..42423ca28991 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -2129,6 +2129,7 @@ void drm_fb_helper_fill_info(struct fb_info *info, drm_fb_helper_fill_var(info, fb_helper, sizes->fb_width, sizes->fb_height); + info->par = fb_helper; snprintf(info->fix.id, sizeof(info->fix.id), "%sdrmfb", fb_helper->dev->driver->name); @@ -3182,7 +3183,6 @@ int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper, if (IS_ERR(fbi)) return PTR_ERR(fbi); - fbi->par = fb_helper; fbi->fbops = &drm_fbdev_fb_ops; fbi->screen_size = fb->height * fb->pitches[0]; fbi->fix.smem_len = fbi->screen_size; From patchwork Tue Mar 26 13:19:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871043 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3EEF5922 for ; Tue, 26 Mar 2019 13:20:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FF1D28FC5 for ; Tue, 26 Mar 2019 13:20:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D81E28F7A; Tue, 26 Mar 2019 13:20:36 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0890928FC1 for ; Tue, 26 Mar 2019 13:20:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BBB7F6E04C; Tue, 26 Mar 2019 13:20:21 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id D7C026E04D for ; Tue, 26 Mar 2019 13:20:19 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id q3so10746707edg.0 for ; Tue, 26 Mar 2019 06:20:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q/WWj5NbYuMeCLE8kukIFnXNtfiEMpPWX8YXX2Rs5QM=; b=dxPlY7uEUNUnf4IBXBOI79rDjgGTvArHf7S9nqbGgTA3p6WD8JMJBri/vsQ6w4nCAE vkSPQZ//OO1/+Z1y4J6EDTBZYVJObJBNUWvckVq0XyL0A7v6LcayjBi3wTXM+l3CeW7W tPGcNyy+/3CfqcMtGQnFDRjb3dIv6kedrqJyKujnAMv3svYBYJned54tY5PrJA58k4Zl PEqZpEzfcwIcf/XRGMZ6sekrx2wJ7tParcmM5Kh4+xKR4RPYK/pM0b6+NZ0lAkC8d0UB 9Q53qnxnNoonK57MFZSWLj8RIVdvPielZVPRXv9y68iOReGPfkDbqPf9PZKIaNqpq27M O95w== X-Gm-Message-State: APjAAAVVkIpYABrqq2rr7hOysen4DfXKiZl7whfZDUalAZuLbcGBkPun qrYcYldx+MZpDqmK+AJTw6HVaQ== X-Google-Smtp-Source: APXvYqzZ+c9bvFHm1ugzdRVMj7/fVNl7A2qJeswUPcvz7c0XXvvgz2rtKVTV7Re2sCqnI7YcJZWlCg== X-Received: by 2002:aa7:c6cf:: with SMTP id b15mr20160815eds.46.1553606418428; Tue, 26 Mar 2019 06:20:18 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:17 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:19:51 +0100 Message-Id: <20190326132008.11781-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q/WWj5NbYuMeCLE8kukIFnXNtfiEMpPWX8YXX2Rs5QM=; b=ITZqsFHP+sWZj+bvkMk3VibO0JtyL17PusQkTeSdVaIdfJNuCpSy36yP8YwMvKpjAi AlT6/E3alIUGRDIdqhnY8fIjur/hyhxyo5kbNjzjBsYWOe2VyPPBXb681tZ/jLNyxrPN /K5kxW/jyA/ekrivKQxjQDRkxbckLf2VcqGTI= Subject: [Intel-gfx] [PATCH 04/21] drm/amdgpu: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Stone , Daniel Vetter , Intel Graphics Development , =?utf-8?q?Mic?= =?utf-8?q?hel_D=C3=A4nzer?= , Samuel Li , Shirish S , Junwei Zhang , Huang Rui , Alex Deucher , Daniel Vetter , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Should not cause any changes. v2: Rebase Signed-off-by: Daniel Vetter Cc: Alex Deucher Cc: "Christian König" Cc: Samuel Li Cc: "Michel Dänzer" Cc: Huang Rui Cc: Junwei Zhang Cc: Daniel Vetter Cc: Daniel Stone Cc: Shirish S Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c index 24890d8f9ee4..e47609218839 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c @@ -49,12 +49,11 @@ static int amdgpufb_open(struct fb_info *info, int user) { - struct amdgpu_fbdev *rfbdev = info->par; - struct amdgpu_device *adev = rfbdev->adev; - int ret = pm_runtime_get_sync(adev->ddev->dev); + struct drm_fb_helper *fb_helper = info->par; + int ret = pm_runtime_get_sync(fb_helper->dev->dev); if (ret < 0 && ret != -EACCES) { - pm_runtime_mark_last_busy(adev->ddev->dev); - pm_runtime_put_autosuspend(adev->ddev->dev); + pm_runtime_mark_last_busy(fb_helper->dev->dev); + pm_runtime_put_autosuspend(fb_helper->dev->dev); return ret; } return 0; @@ -63,11 +62,10 @@ amdgpufb_open(struct fb_info *info, int user) static int amdgpufb_release(struct fb_info *info, int user) { - struct amdgpu_fbdev *rfbdev = info->par; - struct amdgpu_device *adev = rfbdev->adev; + struct drm_fb_helper *fb_helper = info->par; - pm_runtime_mark_last_busy(adev->ddev->dev); - pm_runtime_put_autosuspend(adev->ddev->dev); + pm_runtime_mark_last_busy(fb_helper->dev->dev); + pm_runtime_put_autosuspend(fb_helper->dev->dev); return 0; } @@ -233,8 +231,6 @@ static int amdgpufb_create(struct drm_fb_helper *helper, goto out; } - info->par = rfbdev; - ret = amdgpu_display_framebuffer_init(adev->ddev, &rfbdev->rfb, &mode_cmd, gobj); if (ret) { @@ -247,10 +243,6 @@ static int amdgpufb_create(struct drm_fb_helper *helper, /* setup helper */ rfbdev->helper.fb = fb; - strcpy(info->fix.id, "amdgpudrmfb"); - - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - info->fbops = &amdgpufb_ops; tmp = amdgpu_bo_gpu_offset(abo) - adev->gmc.vram_start; @@ -259,7 +251,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper, info->screen_base = amdgpu_bo_kptr(abo); info->screen_size = amdgpu_bo_size(abo); - drm_fb_helper_fill_var(info, &rfbdev->helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(info, &rfbdev->helper, sizes); /* setup aperture base/size for vesafb takeover */ info->apertures->ranges[0].base = adev->ddev->mode_config.fb_base; From patchwork Tue Mar 26 13:19:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871037 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4D7C1922 for ; Tue, 26 Mar 2019 13:20:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3403929074 for ; Tue, 26 Mar 2019 13:20:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C023290FC; Tue, 26 Mar 2019 13:20:35 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 20D9728FA2 for ; Tue, 26 Mar 2019 13:20:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AED446E04F; Tue, 26 Mar 2019 13:20:22 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2F9E06E048 for ; Tue, 26 Mar 2019 13:20:21 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id v21so10730698edq.4 for ; Tue, 26 Mar 2019 06:20:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p+UdPB/jujaroXRsD+ckn6Zw3AJvRAfHiN14z9Zrln4=; b=n1eJkEG14hT2ld3vuHLRcYZDMYp3vupcQOb2VpcL3yB6ajQR+OYOGI9TrqAePQ1Fke +IioDyAeaFrRtBEpGjIZoRgIa3SfgfmpjbSf8pmJQeZeLXj4s5qFu5/8mVeo9TiE8Y8I FB2M0JkfB+llN5De8yysR2rK7GyA7VaJb2JYofE84xih72r7fF9UAgCWutOXBpUsmJDl j3tbsu5uQMh7ASPJ9BS6ge5mYk47TYbD6w20f0mZbDbD7+IbKPG3J9J3MVaXCSJkC94b /TDuAu3MlyM9fX4Nhdjrcc6TmmJNq+R1ODYMdY6HKbAcGiZsxNvGIUGyfvY55lNdPvYO c3SQ== X-Gm-Message-State: APjAAAWaZGGpz8OlpFVgyLEMxPQqvpSdFAga4WV3sE/+D5ZSybXDwhss v+vun4dQA8kuhIgKAJL3zv8U/A== X-Google-Smtp-Source: APXvYqwVWYQeMYQKo8GQJVjPdQiXslFHkBtIdBb6ygvmD/qcIlUAydXQbrk27EN6NtGiffarBcyPsg== X-Received: by 2002:a50:aed5:: with SMTP id f21mr20152531edd.114.1553606419892; Tue, 26 Mar 2019 06:20:19 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:19 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:19:52 +0100 Message-Id: <20190326132008.11781-5-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p+UdPB/jujaroXRsD+ckn6Zw3AJvRAfHiN14z9Zrln4=; b=gJepfJar/6WadfbF53FYN6fnJjnkKJHgPV3PJXsPLNPUoVWOqN3wNgELQ1GOfKQnnO 27ubA8BpaRVs/RPCQMnW3OgAJvN0VNgCwVX8vB4qOacMhjXcdizxP2qrMrR94I3Vjt+M u7LJJgD/5r4riFgRnWs2ipoihW5n/ek2cB/Xg= Subject: [Intel-gfx] [PATCH 05/21] drm/armada: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Russell King , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Only changes the name of the fb from "armada-drmfb" to armadafb. v2: Rebase Signed-off-by: Daniel Vetter Cc: Russell King Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/armada/armada_fbdev.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c index 8d23700848df..1e7140f005a5 100644 --- a/drivers/gpu/drm/armada/armada_fbdev.c +++ b/drivers/gpu/drm/armada/armada_fbdev.c @@ -78,8 +78,6 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh, goto err_fballoc; } - strlcpy(info->fix.id, "armada-drmfb", sizeof(info->fix.id)); - info->par = fbh; info->fbops = &armada_fb_ops; info->fix.smem_start = obj->phys_addr; info->fix.smem_len = obj->obj.size; @@ -87,9 +85,7 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh, info->screen_base = ptr; fbh->fb = &dfb->fb; - drm_fb_helper_fill_fix(info, dfb->fb.pitches[0], - dfb->fb.format->depth); - drm_fb_helper_fill_var(info, fbh, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(info, fbh, sizes); DRM_DEBUG_KMS("allocated %dx%d %dbpp fb: 0x%08llx\n", dfb->fb.width, dfb->fb.height, dfb->fb.format->cpp[0] * 8, From patchwork Tue Mar 26 13:19:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871075 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F186F1390 for ; Tue, 26 Mar 2019 13:20:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDD1729018 for ; Tue, 26 Mar 2019 13:20:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBEC3290AB; Tue, 26 Mar 2019 13:20:52 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BA12E29087 for ; Tue, 26 Mar 2019 13:20:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 237B06E066; Tue, 26 Mar 2019 13:20:35 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA9BB6E051 for ; Tue, 26 Mar 2019 13:20:22 +0000 (UTC) Received: by mail-ed1-x543.google.com with SMTP id d1so10703139edd.13 for ; Tue, 26 Mar 2019 06:20:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+yQgS1SVaHNFv1LKtC/3HzX19NpZu2ytWnBcgG746pU=; b=dqwMavmcqdnpxgKQ1476AvXroIY89pWCx5rWVrij+QYIcKVezjuFvKWl4GOilAAb/8 Xul7buIzBbEJYdYBE/SvxhYGP21G6Exbz11m+Dy4Y16Oai7qBvAQUsCP59ku9c23YRSf dWfMLYj8k/WPeJ4FUIFwu7XhkA+WsNxfCiWVlqmevf5r+aCGXOvI/ljIHeoUhOlafmuq cSK6bpUFn+K3Df0gb9cmtfTqVT8pzaWj3gOSVT4ZHHl1zrWjYZdEWUG4Em+aD1R9cKJc /48M6+VfQiElv7sDre8Yq5j9l7kmqsB8NXX7fJlAEgSBj/Vci0eSHIcoINXWY5QbOPsZ CmNw== X-Gm-Message-State: APjAAAUef6zlNa87KJ5doD63I8Ep18dah1VEegDet+7UyLYCKP78zQtC fYs/WxytcVb7wtTVwI33//0+Vw== X-Google-Smtp-Source: APXvYqyDoDSSzH8swFCvlY8+uVx0QhjzQKHUFoT9c84nswsVRV1cXtfQ7AveOStsKHravUSciy7S6g== X-Received: by 2002:a50:ca8d:: with SMTP id x13mr20343653edh.56.1553606421272; Tue, 26 Mar 2019 06:20:21 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:20 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:19:53 +0100 Message-Id: <20190326132008.11781-6-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+yQgS1SVaHNFv1LKtC/3HzX19NpZu2ytWnBcgG746pU=; b=FRYmtum6tFrSpIUIvmSzToIgo+bQu3q3aA+rYHFVu5dZKSp6OZI06Exl/vT7VR8piN CVOHe1BTRYe2Pl992o6B3GYOGzDzQLwac+V8YyAvu4vOkw3cNNFw2sZugJ/vK7bNyBjo Lvr9f9+QtoYJoJWebNkd1OfcHf0yHVZp0HmEg= Subject: [Intel-gfx] [PATCH 06/21] drm/ast: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Bobroff , Daniel Vetter , Intel Graphics Development , YueHaibing , Alex Deucher , Daniel Vetter , Junwei Zhang , Dave Airlie , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Should not result in any changes. v2: Rebase Signed-off-by: Daniel Vetter Cc: Dave Airlie Cc: Junwei Zhang Cc: Alex Deucher Cc: "Christian König" Cc: Daniel Vetter Cc: Sean Paul Cc: YueHaibing Cc: Sam Bobroff Acked-by: Noralf Trønnes --- drivers/gpu/drm/ast/ast_drv.h | 2 +- drivers/gpu/drm/ast/ast_fb.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index bfc65040dfcb..ffce4608e0c5 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -259,7 +259,7 @@ struct ast_framebuffer { }; struct ast_fbdev { - struct drm_fb_helper helper; + struct drm_fb_helper helper; /* must be first */ struct ast_framebuffer afb; void *sysram; int size; diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c index 2c9f8dd9733a..e718d0f60d6b 100644 --- a/drivers/gpu/drm/ast/ast_fb.c +++ b/drivers/gpu/drm/ast/ast_fb.c @@ -217,8 +217,6 @@ static int astfb_create(struct drm_fb_helper *helper, ret = PTR_ERR(info); goto out; } - info->par = afbdev; - ret = ast_framebuffer_init(dev, &afbdev->afb, &mode_cmd, gobj); if (ret) goto out; @@ -229,15 +227,12 @@ static int astfb_create(struct drm_fb_helper *helper, fb = &afbdev->afb.base; afbdev->helper.fb = fb; - strcpy(info->fix.id, "astdrmfb"); - info->fbops = &astfb_ops; info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0); info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0); - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(info, &afbdev->helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(info, &afbdev->helper, sizes); info->screen_base = sysram; info->screen_size = size; From patchwork Tue Mar 26 13:19:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871055 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB1E01390 for ; Tue, 26 Mar 2019 13:20:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8A6928FA2 for ; Tue, 26 Mar 2019 13:20:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD11A28F7A; Tue, 26 Mar 2019 13:20:39 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8906E28FA2 for ; Tue, 26 Mar 2019 13:20:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 23D0E6E04E; Tue, 26 Mar 2019 13:20:27 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id D9FCC6E054 for ; Tue, 26 Mar 2019 13:20:24 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id s16so1477076edr.3 for ; Tue, 26 Mar 2019 06:20:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cExhJenTibsxCDagCVn3I2EQq6KV75KVw0OrxKrFx1Q=; b=mFnxIaULpbdaWYAaysu44uajKw9ibemGufT+1mk4chpftC5sKe2DjzT85xM2EFmvNL BzX6cSXDM5pOXXunkbaihpf8zpA89h988RWe79LAuQ3l3Mp6MxbtN5zRCwGd/l5x3kVO 7d2o+vKpGLJeaKF93CpTAj4FkJbhv19EVJAW/mdzbYqbBcNV6qWVc0NP2W3r3Iq4mlpQ CEYr2YUKN8cRsejFlCGqIkIAlRpHE7+lamnn+OYPOGYOZOHWXGj1sz6RSrBGiUSht2CY +dMwVpyorstA/+YzYmkC7KZKNnOhQgysoC2r8yEzmDLU7Pcj6QVdLq5JXwIwe+4ngHf9 rOBQ== X-Gm-Message-State: APjAAAU2X1Wr1SexKeTZcvUXxYrQ0miPB0J2pDJawacKg6m4joHaxikn 6fXhbw48GaszsgNScRfdD1uMLA== X-Google-Smtp-Source: APXvYqzw22YMM1cjOg4+vbbMGqEtV2G2fcZaZamNxtt25DS9nLxLP4S3C4FQD+kZrSGz6EvaFTSZNw== X-Received: by 2002:aa7:dd0a:: with SMTP id i10mr20018655edv.35.1553606422612; Tue, 26 Mar 2019 06:20:22 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:21 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:19:54 +0100 Message-Id: <20190326132008.11781-7-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cExhJenTibsxCDagCVn3I2EQq6KV75KVw0OrxKrFx1Q=; b=UuVagqcMRVBG8Ylh3NuX1YeSbo8eyZDNQE0I2rFrBsxQBlfGwNQDPFArEwaGOx0TXV Mx2UgdD+JnCnfbokFVJxMK4jpxye5hgyDxU7iB98VfFRfCFTSM8+MEeBopeDBNYVs+eP b3D5Cz3l21UnI1kRR5j+2DznML4kqHE6OnxUY= Subject: [Intel-gfx] [PATCH 07/21] drm/cirrus: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Gerd Hoffmann , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Should not result in any changes. v2: Rebase Signed-off-by: Daniel Vetter Cc: Gerd Hoffmann Acked-by: Noralf Trønnes --- drivers/gpu/drm/cirrus/cirrus_drv.h | 2 +- drivers/gpu/drm/cirrus/cirrus_fbdev.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.h b/drivers/gpu/drm/cirrus/cirrus_drv.h index f2b2e0d169fa..915709739257 100644 --- a/drivers/gpu/drm/cirrus/cirrus_drv.h +++ b/drivers/gpu/drm/cirrus/cirrus_drv.h @@ -143,7 +143,7 @@ struct cirrus_device { struct cirrus_fbdev { - struct drm_fb_helper helper; + struct drm_fb_helper helper; /* must be first */ struct drm_framebuffer *gfb; void *sysram; int size; diff --git a/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/drivers/gpu/drm/cirrus/cirrus_fbdev.c index 39df62acac69..2e6128069fc3 100644 --- a/drivers/gpu/drm/cirrus/cirrus_fbdev.c +++ b/drivers/gpu/drm/cirrus/cirrus_fbdev.c @@ -195,8 +195,6 @@ static int cirrusfb_create(struct drm_fb_helper *helper, goto err_vfree; } - info->par = gfbdev; - fb = kzalloc(sizeof(*fb), GFP_KERNEL); if (!fb) { ret = -ENOMEM; @@ -214,13 +212,9 @@ static int cirrusfb_create(struct drm_fb_helper *helper, /* setup helper */ gfbdev->helper.fb = fb; - strcpy(info->fix.id, "cirrusdrmfb"); - info->fbops = &cirrusfb_ops; - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(info, &gfbdev->helper, sizes->fb_width, - sizes->fb_height); + drm_fb_helper_fill_info(info, &gfbdev->helper, sizes); /* setup aperture base/size for vesafb takeover */ info->apertures->ranges[0].base = cdev->dev->mode_config.fb_base; From patchwork Tue Mar 26 13:19:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871073 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 466D51390 for ; Tue, 26 Mar 2019 13:20:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33D31286D1 for ; Tue, 26 Mar 2019 13:20:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2854A2906C; Tue, 26 Mar 2019 13:20:51 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DAD0529021 for ; Tue, 26 Mar 2019 13:20:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 650706E054; Tue, 26 Mar 2019 13:20:34 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3579C6E057 for ; Tue, 26 Mar 2019 13:20:26 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id q14so10721320edr.5 for ; Tue, 26 Mar 2019 06:20:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ilCJqFN4ggJPlU4f9v6FlF2gf4L81PyPhf7livHmmIo=; b=RNzH3LXkzgzIEiZOABUjIs1jdXgij5Ajv8808oBCPKpirZIpewGmXOUKuRgauy29GU JDEWyiyIaeYmDhroOSXuG+t5JXes/VHFxUpEzRO8Cwz83LA4U90EgAp40jgrRsFojqEY ciZni+vH7yF5XTwwssM6POL/IssVBX1s0JXLPcrt8IatI/xcVpo+BflAQEP47K2Cit99 suvpiZIi3fGWUrAaJ+6XlsnsGa7+clixTQ30TwlJZ5rVZbNuCftzmlfwbI3duFbWOcMQ kV8O/sJWnZlPznDuaKdsGt55HG+mr+yU1hO0AwPta+/grplACJXKcSp+aj7Cqw15pzYu vBeg== X-Gm-Message-State: APjAAAWo0PU035Y2DYJq4YbC+/YFdw1/23ZAjTD0hPG5/96QbCeF4oTQ Xiwqp9kmRCFsg0rI/pJhBSj8Lw== X-Google-Smtp-Source: APXvYqy9Urr6lst4OcBOf1rk6f5IIgZnE3KancxLcn0qD6fnSPelHj/L8GzdMNAQEvQVscSSsGaMPw== X-Received: by 2002:a50:d750:: with SMTP id i16mr20555277edj.202.1553606423973; Tue, 26 Mar 2019 06:20:23 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:23 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:19:55 +0100 Message-Id: <20190326132008.11781-8-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ilCJqFN4ggJPlU4f9v6FlF2gf4L81PyPhf7livHmmIo=; b=MKRvr5X07odWY6mQX6ZKmPhPgkl4hvbxHhqLMEq8AKktAG+KtFKW7lQPoMmLf461Fw 40kJFdqd+05HwJPd2R3ko3cHnKlSrWPxMJaoF6EDI/4drBrId4DByTkYIiV3S+4gKryM aVi4PAEByd8hyeR0yIM2kDrWJtLzxfu9C87DI= Subject: [Intel-gfx] [PATCH 08/21] drm/exynos: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-samsung-soc@vger.kernel.org, Joonyoung Shim , Daniel Vetter , Intel Graphics Development , Seung-Woo Kim , Krzysztof Kozlowski , Inki Dae , Kyungmin Park , Kukjin Kim , Daniel Vetter , linux-arm-kernel@lists.infradead.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This will give the exynos fbdev a name! v2: Rebase Signed-off-by: Daniel Vetter Cc: Inki Dae Cc: Joonyoung Shim Cc: Seung-Woo Kim Cc: Kyungmin Park Cc: Kukjin Kim Cc: Krzysztof Kozlowski Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Reviewed-by: Noralf Trønnes Acked-by: Inki Dae --- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index c30dd88cdb25..581a6a207995 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -87,11 +87,9 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper, return PTR_ERR(fbi); } - fbi->par = helper; fbi->fbops = &exynos_drm_fb_ops; - drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(fbi, helper, sizes); nr_pages = exynos_gem->size >> PAGE_SHIFT; From patchwork Tue Mar 26 13:19:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871071 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 73E5614DE for ; Tue, 26 Mar 2019 13:20:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 601252912B for ; Tue, 26 Mar 2019 13:20:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 52E8E2903A; Tue, 26 Mar 2019 13:20:50 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 078BA28C6B for ; Tue, 26 Mar 2019 13:20:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD8496E065; Tue, 26 Mar 2019 13:20:33 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id C656A6E05C for ; Tue, 26 Mar 2019 13:20:26 +0000 (UTC) Received: by mail-ed1-x543.google.com with SMTP id q3so10747081edg.0 for ; Tue, 26 Mar 2019 06:20:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KhOWaExkRCrZ3M4KGs0sS3Kpfa/m/jgUC/3/JkFzOz8=; b=hpNhdUZFrfMVGHjAEWWsLxuU7UIJAMxlJBEkMJZgdkq+WTV0WK/wYSOxuzDJhIAra5 5aRrV2VbWkb9MhF01rM6F9HUYTn3PTy1VUKRS8D+8EgmtvmK2UmpPic/49Xo1by27CON oSNESGCtB/z8uPrMHZUrE+PAhYd4zerBcmXRrubz/et1t8R9XVUbHgCa/N4gYV46iCVm 81WqGbQhp4AZtI9unQWh3rh4OKXPfdutRl40VZkwmkxK6+KGOKHr3Xmf0VNqf1yPb6QC OkAP8L4GaqQnpUp78dHHq+21j8L8F4ohSqeos3FT/7Ozo3ltWLjwWFklKfAIOVyJcrjO iQFg== X-Gm-Message-State: APjAAAXu2etpCcP3Dh4CXfJAoW3Sp8/8Ls7W9CbyP3TJwa/gVOWEFEXn UicbTAvBpb5YUFp46tJBfdMoLQ== X-Google-Smtp-Source: APXvYqy09JeMNw5KQPzmGleHQQqG5mFYMHgKMshiBrSh6TmEnriEHlIWqExrJqe5P9SBRhY1YaEGAA== X-Received: by 2002:aa7:d383:: with SMTP id x3mr20241686edq.61.1553606425323; Tue, 26 Mar 2019 06:20:25 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:24 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:19:56 +0100 Message-Id: <20190326132008.11781-9-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KhOWaExkRCrZ3M4KGs0sS3Kpfa/m/jgUC/3/JkFzOz8=; b=JHW5kF8iTZQcOK8Dxqz5BIvRZWctXq1PpNdw4uJpGpajyQTLMah1DzH1EzFFJ5RKgb ZDfzFIev3NYt3gOseuMY0m42NaGY/kPUg0F63cDnRJ3tJN8wBBUj9nfwYa9MNHCgCbP/ 5Y5rpFlW/ElBDHd3KRoK2m1ZbaGoWY3slq9VA= Subject: [Intel-gfx] [PATCH 09/21] drm/gma500: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This will change the fb name from "psbdrmfb" to "gma500drmfb". v2: Rebase Signed-off-by: Daniel Vetter Cc: Patrik Jakobsson Acked-by: Noralf Trønnes --- drivers/gpu/drm/gma500/framebuffer.c | 7 +------ drivers/gpu/drm/gma500/framebuffer.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index c934b3df1f81..a9d3a4a30ab8 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c @@ -389,7 +389,6 @@ static int psbfb_create(struct psb_fbdev *fbdev, ret = PTR_ERR(info); goto out; } - info->par = fbdev; mode_cmd.pixel_format = drm_mode_legacy_fb_format(bpp, depth); @@ -402,9 +401,6 @@ static int psbfb_create(struct psb_fbdev *fbdev, fbdev->psb_fb_helper.fb = fb; - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - strcpy(info->fix.id, "psbdrmfb"); - if (dev_priv->ops->accel_2d && pitch_lines > 8) /* 2D engine */ info->fbops = &psbfb_ops; else if (gtt_roll) { /* GTT rolling seems best */ @@ -427,8 +423,7 @@ static int psbfb_create(struct psb_fbdev *fbdev, info->apertures->ranges[0].size = dev_priv->gtt.stolen_size; } - drm_fb_helper_fill_var(info, &fbdev->psb_fb_helper, - sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(info, &fbdev->psb_fb_helper, sizes); info->fix.mmio_start = pci_resource_start(dev->pdev, 0); info->fix.mmio_len = pci_resource_len(dev->pdev, 0); diff --git a/drivers/gpu/drm/gma500/framebuffer.h b/drivers/gpu/drm/gma500/framebuffer.h index 23dc3c5f8f0d..e8e6357f033b 100644 --- a/drivers/gpu/drm/gma500/framebuffer.h +++ b/drivers/gpu/drm/gma500/framebuffer.h @@ -34,7 +34,7 @@ struct psb_framebuffer { }; struct psb_fbdev { - struct drm_fb_helper psb_fb_helper; + struct drm_fb_helper psb_fb_helper; /* must be first */ struct psb_framebuffer pfb; }; From patchwork Tue Mar 26 13:19:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871065 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CA5EB922 for ; Tue, 26 Mar 2019 13:20:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B87EA28F92 for ; Tue, 26 Mar 2019 13:20:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6A7829077; Tue, 26 Mar 2019 13:20:46 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5CD4728F92 for ; Tue, 26 Mar 2019 13:20:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 18FF16E061; Tue, 26 Mar 2019 13:20:33 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id 953546E05A for ; Tue, 26 Mar 2019 13:20:29 +0000 (UTC) Received: by mail-ed1-x543.google.com with SMTP id p20so10247353eds.6 for ; Tue, 26 Mar 2019 06:20:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xTrKBtAF/vst0Q7kErpFnW3Wo/9qa2k5cuoPn1zJ5ns=; b=BfWeqLXd0pa7UhxSx97ivQDUnb7CNgflzL+QQ23ZDI/YqOMFaUNow3R7KpzXHv76UP ld24iIQERO06uOQ6+OZ2GUEI0P6S2npbd74XbhYKcOcQzqyrnYJ8LN7NG65UsPAHh2Uy D1jhqYiWfr9ZFwBWdXEejZl64a9WLVnqcJpXvcxafJZ1ZNvzw7qoeHJbP/3NKS/lKMyy MIAke7/xlzjBpdfNKr/5vicT+Ko3VPbhzIIkjWSwsJLNdw5zB7VNgq6GuDToaagq/47j +toq+NJtIvJCSndBLIb/l2mnfa9+IejhpXvC+D7tEFSTEqNkM84mqypaY46UhkvkFvO9 jJtA== X-Gm-Message-State: APjAAAWJi/wn3XP/lixXGR7EaL+Z5TZ6TZJdmJXThVY2YjPtn0Gkiblj JF7VtXGJkt69IA7FFp2tVMchjg== X-Google-Smtp-Source: APXvYqwTsK20emDMjWfxBQeNr5hWbqO/wWPxVmCHmVzZq9NQAwUV/MMHkq4dwlHv/nr8AjdIgMTA0g== X-Received: by 2002:a50:a325:: with SMTP id 34mr19322414edn.286.1553606426699; Tue, 26 Mar 2019 06:20:26 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:25 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:19:57 +0100 Message-Id: <20190326132008.11781-10-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xTrKBtAF/vst0Q7kErpFnW3Wo/9qa2k5cuoPn1zJ5ns=; b=DjFF+qle8pKF6RqnGBk2gv1rIRfTFGSiyhQkMI2Vh4XJ6hROn02tIZnJfMlwv/eZej LUa+X0yZ4lz7dyEAymr3ZwjTdplge4htDh9YOq4Ldmv1y7KRu8zNWy2ods4Z5ae7OeUZ /OgcIX/7+dXrDBDl4xyPIcD/mvoyN45LPTGG0= Subject: [Intel-gfx] [PATCH 10/21] drm/hibmc: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ajit Negi , Daniel Vetter , Intel Graphics Development , John Garry , Xinliang Liu , Junwei Zhang , Souptick Joarder , Alex Deucher , Daniel Vetter , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Should not result in any changes. v2: Rebase Signed-off-by: Daniel Vetter Cc: Alex Deucher Cc: Junwei Zhang Cc: Xinliang Liu Cc: "Christian König" Cc: Ajit Negi Cc: Souptick Joarder Cc: Daniel Vetter Cc: John Garry Acked-by: Noralf Trønnes --- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 2 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h index 3c168ae77b0c..0a381c22de26 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h @@ -31,7 +31,7 @@ struct hibmc_framebuffer { }; struct hibmc_fbdev { - struct drm_fb_helper helper; + struct drm_fb_helper helper; /* must be first */ struct hibmc_framebuffer *fb; int size; }; diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c index de9d7cc97e44..8026859aa07d 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c @@ -116,8 +116,6 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper, goto out_release_fbi; } - info->par = hi_fbdev; - hi_fbdev->fb = hibmc_framebuffer_init(priv->dev, &mode_cmd, gobj); if (IS_ERR(hi_fbdev->fb)) { ret = PTR_ERR(hi_fbdev->fb); @@ -129,14 +127,9 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper, priv->fbdev->size = size; hi_fbdev->helper.fb = &hi_fbdev->fb->fb; - strcpy(info->fix.id, "hibmcdrmfb"); - info->fbops = &hibmc_drm_fb_ops; - drm_fb_helper_fill_fix(info, hi_fbdev->fb->fb.pitches[0], - hi_fbdev->fb->fb.format->depth); - drm_fb_helper_fill_var(info, &priv->fbdev->helper, sizes->fb_width, - sizes->fb_height); + drm_fb_helper_fill_info(info, &priv->fbdev->helper, sizes); info->screen_base = bo->kmap.virtual; info->screen_size = size; From patchwork Tue Mar 26 13:19:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871067 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 896891390 for ; Tue, 26 Mar 2019 13:20:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75B322901F for ; Tue, 26 Mar 2019 13:20:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73D1A29021; Tue, 26 Mar 2019 13:20:49 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2E9542901F for ; Tue, 26 Mar 2019 13:20:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 39FEF6E05F; Tue, 26 Mar 2019 13:20:34 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id F06986E05F for ; Tue, 26 Mar 2019 13:20:29 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id h22so10722960edw.7 for ; Tue, 26 Mar 2019 06:20:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pMbY5TfaRJAxP2S0sitQ07kh0/0L3AV/JF716xVbdyk=; b=WlaVerW6TOm7l1j/5C7cxK+Z/t5erzK+OO1cUhxSx4ywGUMBQNHiPN5/qQ4UyxOI03 rERM+VVqfqF7duA8ipciDjXhjgiq6FjltzfLxqEqXGG/Z6WgW03cAtpXgDm+YYQW219i /vH9uLoCnAxFJ9nOSt0/ae5gffzxxuMzhx2/2UjdOxolbJaffg1b4q15esRywRV2j/Yn fp4nNoc3gIhz8hnimh5pB1q8lMBGJ4cJHt9Q3ow7Ku951C/DtZ78X0kIH997bkKgNSeH CtjsgCnrysoSHTx7wTIIZc1R1FCC9PflJ93NtDC6Cwip0EdVGotLh+J9bx9gp8ihq8WP 8QCA== X-Gm-Message-State: APjAAAWascsbL3oJtIZHL0qtS3cu2Q/kl7CHGchmsaMIJyXUNZelHM7E FP+cEMKoKn7FRYD6ZC0aTiAOkw== X-Google-Smtp-Source: APXvYqwM0U1nP2E9XptECyEAMveoc4FND5Zge8jwOdeM4sieoyTvp3vo55dN7TJ5lOqDSj5Y3An6lg== X-Received: by 2002:a50:8bb4:: with SMTP id m49mr20807323edm.28.1553606428093; Tue, 26 Mar 2019 06:20:28 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:27 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:19:58 +0100 Message-Id: <20190326132008.11781-11-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pMbY5TfaRJAxP2S0sitQ07kh0/0L3AV/JF716xVbdyk=; b=JaivRV3qVqiQZj4re+qGu0C95zHnPlhQrKP9blFoVbvWgEXbCCJCzBjdhp3s+MHNsX sfgBolEDyDkuEOGnB0Mtqrft1g11I5wieDOwnmtqG1BI/rxqcz4/aqFQgbvgGNX64ihC DoV8Qvb7TxOCV/hmZVmDLu3Sv3dxpJr8arp+U= Subject: [Intel-gfx] [PATCH 11/21] drm/i915: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This changes the fb name from "inteldrmfb" to "i915drmfb". v2: Rebase Signed-off-by: Daniel Vetter Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/i915/intel_fbdev.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index f9ab94b99a3c..ef93c27e60b4 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -235,12 +235,8 @@ static int intelfb_create(struct drm_fb_helper *helper, goto out_unpin; } - info->par = helper; - ifbdev->helper.fb = fb; - strcpy(info->fix.id, "inteldrmfb"); - info->fbops = &intelfb_ops; /* setup aperture base/size for vesafb takeover */ @@ -259,8 +255,7 @@ static int intelfb_create(struct drm_fb_helper *helper, info->screen_base = vaddr; info->screen_size = vma->node.size; - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(info, &ifbdev->helper, sizes); /* If the object is shmemfs backed, it will have given us zeroed pages. * If the object is stolen however, it will be full of whatever From patchwork Tue Mar 26 13:19:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871081 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 490351390 for ; Tue, 26 Mar 2019 13:20:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3585D28FD4 for ; Tue, 26 Mar 2019 13:20:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2998729074; Tue, 26 Mar 2019 13:20:57 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BA5DE2902B for ; Tue, 26 Mar 2019 13:20:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 904886E06B; Tue, 26 Mar 2019 13:20:36 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id BFFE76E054 for ; Tue, 26 Mar 2019 13:20:30 +0000 (UTC) Received: by mail-ed1-x543.google.com with SMTP id v21so10731231edq.4 for ; Tue, 26 Mar 2019 06:20:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PMER7ZM3+sB6RKzUxh30dnufIE4fQPyouiDL4pNGujM=; b=p+i0OAEkdVuXMMjCC6GD+wzMN65FCAhX4C0/ydmd9zslLGwVOTgSHlaOIXrunWcRGv vlwG2tRlI4uO6YsLb60KBWuyRojfstUN4PHekHpzpfDYu09+1/aS9a8dcZaVL/O5W3M/ 86FWcOGWcAUxoyYDLRCgOLC2OOxJufuBsH6tv1DzbiUCzjXQzpLSmfV2UJC82V3SpyjP OjTEphJLP+9/RqZLJsv3IQlPbrxPloCfF+M8vB9mYK3Lo+JOEzVqElbtU0tahLBEKZPa 6oReXsEzfw9O0lZGYLX7fwYhHhQxTob+IsUEUo5GjGZ2rjCCywXkklAx250G5VuVmjds EnKA== X-Gm-Message-State: APjAAAXLsPwOFLNGKR5ToFCH4AP46TZacUpd4eby8cQJI1JH/tIhR324 C4IJpa+AEUJXDUwlVrAblYkGpQ== X-Google-Smtp-Source: APXvYqyzHZ97J7Hrs3UmHndMNcHhjSyS8WlhHfXvZM/aaHzkaj1f54oRtKm+SYQmJKfEE24m39QaPw== X-Received: by 2002:aa7:cb57:: with SMTP id w23mr20119226edt.264.1553606429424; Tue, 26 Mar 2019 06:20:29 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:28 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:19:59 +0100 Message-Id: <20190326132008.11781-12-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PMER7ZM3+sB6RKzUxh30dnufIE4fQPyouiDL4pNGujM=; b=D51Tua7t8kG4tjA4p0cb72YsSl74MfePUO9LMtPECyN0IuRgSrcMqu9cXYq4XZzLpD ZQRzpgNH74lw52qpMUOY+llTJnnj18T0wOYZIc1HwsvP49iORpHspZ8w90v3IHyQL89n 46fT+saLrK0otUfSylhExp1jvXdWKRLpyWTEo= Subject: [Intel-gfx] [PATCH 12/21] drm/mga200g: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Junwei Zhang , Daniel Vetter , Alex Deucher , Dave Airlie , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Should not result in any changes. v2: Rebase Signed-off-by: Daniel Vetter Cc: Dave Airlie Cc: Alex Deucher Cc: "Christian König" Cc: Junwei Zhang Cc: Daniel Vetter Acked-by: Noralf Trønnes --- drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- drivers/gpu/drm/mgag200/mgag200_fb.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h index 0aaedc554879..71a235c2d848 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.h +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h @@ -113,7 +113,7 @@ struct mga_framebuffer { }; struct mga_fbdev { - struct drm_fb_helper helper; + struct drm_fb_helper helper; /* must be first */ struct mga_framebuffer mfb; void *sysram; int size; diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c index 6893934b26c0..5b7e64cac004 100644 --- a/drivers/gpu/drm/mgag200/mgag200_fb.c +++ b/drivers/gpu/drm/mgag200/mgag200_fb.c @@ -195,8 +195,6 @@ static int mgag200fb_create(struct drm_fb_helper *helper, goto err_alloc_fbi; } - info->par = mfbdev; - ret = mgag200_framebuffer_init(dev, &mfbdev->mfb, &mode_cmd, gobj); if (ret) goto err_alloc_fbi; @@ -209,17 +207,13 @@ static int mgag200fb_create(struct drm_fb_helper *helper, /* setup helper */ mfbdev->helper.fb = fb; - strcpy(info->fix.id, "mgadrmfb"); - info->fbops = &mgag200fb_ops; /* setup aperture base/size for vesafb takeover */ info->apertures->ranges[0].base = mdev->dev->mode_config.fb_base; info->apertures->ranges[0].size = mdev->mc.vram_size; - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(info, &mfbdev->helper, sizes->fb_width, - sizes->fb_height); + drm_fb_helper_fill_info(info, &mfbdev->helper, sizes); info->screen_base = sysram; info->screen_size = size; From patchwork Tue Mar 26 13:20:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871079 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CEB2A1390 for ; Tue, 26 Mar 2019 13:20:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC9C428FA2 for ; Tue, 26 Mar 2019 13:20:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0D9429076; Tue, 26 Mar 2019 13:20:54 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7710A2906C for ; Tue, 26 Mar 2019 13:20:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B0826E064; Tue, 26 Mar 2019 13:20:36 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id B56666E064 for ; Tue, 26 Mar 2019 13:20:33 +0000 (UTC) Received: by mail-ed1-x543.google.com with SMTP id s39so5225499edb.2 for ; Tue, 26 Mar 2019 06:20:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WTdg/Aw6xSxB38ya9cIMEU72GkPczaO/Ral2PlG6pEE=; b=fVQ8DtVTiYX28dMyFmJBD9wdjA49hB+w5fdcmy3yMl1LXDgZgNaeOArlK/wxf2Pt5f 9DUJDfW9pawzo0T8i9OsqeSCxNawwWKOXYnCgyo+yEJ4imqNLMPtGL52CD6I8DIH4Mub 4kGB/CGM/lvfB30oeEvhP8r/BYh2bkfM7YCF7+wWi4VUbTm2uhki/6zevYDa9LxdPg+u hOvJT8rFbUTFoy5v0Msfd8XFmc0pZsGNeEIYQ2/eos88DP085cBv9+jBDxBH8xyACuzO WsgWV2CgKUhyZoqrgQQQ9w5jxfvzVgQmcoWeSDyxczK4+sr68fZBiFg23SsQGWLyTwSe nLbA== X-Gm-Message-State: APjAAAVqLuE8DZoVmr8FyrGxS4ZXi4t8cjTP5RPNi4Q5eWWUc9RozMOQ NZah+QM5GK+ICkCMH5cSK1MEJQ== X-Google-Smtp-Source: APXvYqwJsHLIbai0PPvRWFRTZEVe7580W+EEXVzvNNfjAMm4dagzUGxKf3IROTH47jlFk7l3r4krJA== X-Received: by 2002:a17:906:f44:: with SMTP id h4mr17022965ejj.4.1553606430868; Tue, 26 Mar 2019 06:20:30 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:29 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:20:00 +0100 Message-Id: <20190326132008.11781-13-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WTdg/Aw6xSxB38ya9cIMEU72GkPczaO/Ral2PlG6pEE=; b=TnW9BbvvlcBTZaQR0Y2K0UTjggMhYozpsuFVc/ebPKDY0kbrrLbsGAaT0o8JJGSv20 bxhdrmBjnIOcVdWh9G12KwrqCYCEiwhytQCJ+RS9tXVt0bGHMmCROXoqsGwZwk1YhyZc RCFKjD8okCPVLhaP+1NE3mCyjoQURPGZy5YW4= Subject: [Intel-gfx] [PATCH 13/21] drm/bochs: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , linux-arm-msm@vger.kernel.org, Daniel Vetter , freedreno@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This will change the fb name from "msm" to "msmdrmfb". v2: Rebase Signed-off-by: Daniel Vetter Cc: Rob Clark Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/msm/msm_fbdev.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c index c03e860ba737..d088299babf3 100644 --- a/drivers/gpu/drm/msm/msm_fbdev.c +++ b/drivers/gpu/drm/msm/msm_fbdev.c @@ -122,13 +122,9 @@ static int msm_fbdev_create(struct drm_fb_helper *helper, fbdev->fb = fb; helper->fb = fb; - fbi->par = helper; fbi->fbops = &msm_fb_ops; - strcpy(fbi->fix.id, "msm"); - - drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(fbi, helper, sizes); dev->mode_config.fb_base = paddr; From patchwork Tue Mar 26 13:20:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871085 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 15C351390 for ; Tue, 26 Mar 2019 13:21:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0394529076 for ; Tue, 26 Mar 2019 13:21:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EADA129077; Tue, 26 Mar 2019 13:20:59 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9A3C529021 for ; Tue, 26 Mar 2019 13:20:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E4B06E06D; Tue, 26 Mar 2019 13:20:45 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F4856E048 for ; Tue, 26 Mar 2019 13:20:34 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id a25so10717072edc.8 for ; Tue, 26 Mar 2019 06:20:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AMQjQ8p5IYKyc/k3Ozc5jkm9T3PqDPRFgUUMBsBd3h0=; b=YeP+qw14S5Qu/MBEKvhB8j4opJBw8qksMmIb/0VK/3AflNe6QJeDOlJSUGWKuAgbq2 sXxAPNoI0dce8KtlMrXQYNHx6wQqNa/03/IqMyzXobu0x+ItPWd2/ZtZkKV3TFWcAXT0 9/axsUgY1ZzYAun/NWik4uS2aVX73aljX81PsdLKIVk6MlRkjVIf+gqP3xfRF2DXWngW A0anvrAXv9eyWOOS71X/63zjYRmUyrYI3HXA/DAFCfMS/nj3iwqbgO2xlbFXZQcnoRGI wQfXFWlhjt/QLlQmntv7lnkLIDv12EWHyoa4iaoF65pok7ESfgl/JZ7FRSQ39x25AwGi dzkw== X-Gm-Message-State: APjAAAWmoWjardGj6lmJBsD8+iK1GfiXoy4QU2CzA/PyPeagosdXg1zv mmDbrFswgsqqqn0CAJ1UHD23ojT+sks= X-Google-Smtp-Source: APXvYqxipfmejIl7kb7+2Y8E2zy9VageFcC52KvU7WNGeW1sVdr3YHXL3DDJCCNdEK7WU50liCcatQ== X-Received: by 2002:a17:906:1347:: with SMTP id x7mr9990190ejb.64.1553606432182; Tue, 26 Mar 2019 06:20:32 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:31 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:20:01 +0100 Message-Id: <20190326132008.11781-14-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AMQjQ8p5IYKyc/k3Ozc5jkm9T3PqDPRFgUUMBsBd3h0=; b=GDPrKpVyRFBbY9AWRbzAwG6qdT8yD8qbUvYH7//1tItZ3mF9GH4WhffgXUAbftPGRH cVSygZ3GaJGSAyl0CIcCsaw/4PEKUGd9Fds7sqsQl192ump/+hIDavVOtugodrrE1ji1 vkOIz50de0CsTpmjytKHXnoMNxvsSUOzfcw3A= Subject: [Intel-gfx] [PATCH 14/21] drm/nouveau: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nouveau@lists.freedesktop.org, Daniel Vetter , Intel Graphics Development , Ben Skeggs , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This changes the fb name from "nouveaufb" to "nouveaudrmfb". Aside: I wonder whether the in_interrupt() check is good enough for the nouveau acceleration. Cargo-cult says drm_can_sleep() is needed, which isn't actually working if you pick a .config without PREEMPT. For the generic fbdev defio support we've gone with offloading everything to a worker. For the non-accel callbacks (set_par, blank and friends) checking for oops_in_progress is good enough to catch all the evil calling contexts. v2: Rebase Signed-off-by: Daniel Vetter Cc: Ben Skeggs Cc: nouveau@lists.freedesktop.org Acked-by: Noralf Trønnes --- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 7 +------ drivers/gpu/drm/nouveau/nouveau_fbcon.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 9d6dba07c727..73cc3217068a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -366,12 +366,9 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, goto out_unlock; } - info->par = fbcon; - /* setup helper */ fbcon->helper.fb = &fb->base; - strcpy(info->fix.id, "nouveaufb"); if (!chan) info->flags = FBINFO_HWACCEL_DISABLED; else @@ -386,9 +383,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, info->screen_base = nvbo_kmap_obj_iovirtual(fb->nvbo); info->screen_size = fb->nvbo->bo.mem.num_pages << PAGE_SHIFT; - drm_fb_helper_fill_fix(info, fb->base.pitches[0], - fb->base.format->depth); - drm_fb_helper_fill_var(info, &fbcon->helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(info, &fbcon->helper, sizes); /* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */ diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.h b/drivers/gpu/drm/nouveau/nouveau_fbcon.h index db9d52047ef8..73a7eeba3973 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.h +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.h @@ -32,7 +32,7 @@ #include "nouveau_display.h" struct nouveau_fbdev { - struct drm_fb_helper helper; + struct drm_fb_helper helper; /* must be first */ unsigned int saved_flags; struct nvif_object surf2d; struct nvif_object clip; From patchwork Tue Mar 26 13:20:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871083 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B3D8B922 for ; Tue, 26 Mar 2019 13:20:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F5D0290FD for ; Tue, 26 Mar 2019 13:20:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93BA22903A; Tue, 26 Mar 2019 13:20:57 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 36EEB29076 for ; Tue, 26 Mar 2019 13:20:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1E2566E062; Tue, 26 Mar 2019 13:20:40 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A6F26E06A for ; Tue, 26 Mar 2019 13:20:36 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id h22so10723187edw.7 for ; Tue, 26 Mar 2019 06:20:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MSnj7eFpwwsZTwXgU3ma9ADobKWqbB5RR+QENEsrFlc=; b=ThAqP8ZaGIo1QxTmSO1zE+sCYl4En5m/uL0ooOjpJNJwcydaYKUHtZbfhg67wIcECJ WvxaeIwy4XCUdbiklkE1od1Y0xrINz35Q+lKW/76yOfhC1p0o1KVY1qzhbg2t9HbuWNm k7cLqS3GWNFoqMRGPa1Bn026VVNUdb5wy2oTyHxYKlpKPLfwcUjLCKlhYHtUfbOPWYsB 5Fi3O8RXnnw3XSC33foL07PcBQSXN6Oc6hQNEwgxaI6jA/TNafUWVlYhxCbJYIJlJq14 PPiEEMD0szqPj/kiJiEzYr/MhMC75VepuwwgjU/hpJl7q668c9E1yOx80dHa1ZRykBid HQcg== X-Gm-Message-State: APjAAAXxm+/RUHzykjskyDIBJ5FdBoYKIU4ZgWfLCVHnAXGySj3jl/Ke CpEP9cmJ059fYr41690oiJcwhw== X-Google-Smtp-Source: APXvYqyofR/+VqTEcKLcxLW7Do1VWTCwIcs4ac6roMNpY17PLFqxcbtW9cn2X1fcnwS0WqGkT8KG3w== X-Received: by 2002:a50:b7b6:: with SMTP id h51mr19165224ede.277.1553606433465; Tue, 26 Mar 2019 06:20:33 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:32 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:20:02 +0100 Message-Id: <20190326132008.11781-15-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MSnj7eFpwwsZTwXgU3ma9ADobKWqbB5RR+QENEsrFlc=; b=UFJq13zcpA6T0A/nxHtybCnZiauZ1XiZsdb8yhXOZePFjEru2eBkheDR35PSCfMWSq WIpf/GtNIzFU5lz7/wPlwhFmpeF4hKLg4GLUba/46ZcDzckqyoh2GVvW+hhIxs7RIwQ+ 7/ESU43lMhvTXtRWQ6iUm2Q+e09chErkorulg= Subject: [Intel-gfx] [PATCH 15/21] drm/omap: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Tomi Valkeinen , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This changes the fb name from "omapdrm" to "omapdrmfb". v2: Rebase Signed-off-by: Daniel Vetter Cc: Tomi Valkeinen Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/omapdrm/omap_fbdev.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index 851c59f07eb1..50aabd854f4d 100644 --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c @@ -183,13 +183,9 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, fbdev->fb = fb; helper->fb = fb; - fbi->par = helper; fbi->fbops = &omap_fb_ops; - strcpy(fbi->fix.id, MODULE_NAME); - - drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(fbi, helper, sizes); dev->mode_config.fb_base = dma_addr; From patchwork Tue Mar 26 13:20:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871115 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 68C7C922 for ; Tue, 26 Mar 2019 13:21:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5631E28FB5 for ; Tue, 26 Mar 2019 13:21:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A6BD2901F; Tue, 26 Mar 2019 13:21:19 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0989628FB5 for ; Tue, 26 Mar 2019 13:21:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5B8D86E03B; Tue, 26 Mar 2019 13:20:58 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id 522A96E05B for ; Tue, 26 Mar 2019 13:20:36 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id a25so10717202edc.8 for ; Tue, 26 Mar 2019 06:20:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eABN7MUhcZhCJ6eRjV76xpF3ewbo/q0bb+3DvwpeUsA=; b=lecLLY7WuODfYcJO/MbhmvJwHX9oW8bsxeJ1Rq8dyhaAqOx8FejPBwFtd43xurcJf3 0+LyDFxuCfNjiBCB/lVhX47GAjjMJ7Q0f2RobZMbfWdKAfrFLRb1xP2wN0GUiOiI6H6u 4elrDhwgpxMgUcJLmQmmbJNysKm5NasQ0SlO3uXjBJefvoE90CFO6xSNCjEn5X0rXGcw rxSKgwDE4jnNODe4deFutE13punpY2RznDdtYfdfsntjsEkKuGKDLuatV1TCl5VjtoPi piTZ3NwRY3EyToHzltLJgjy6SDfJEgmsq1USuHEaa/fnNUIxO3SGBAFDU9dut22fh+UY 4YDQ== X-Gm-Message-State: APjAAAXNF+1UzNkAr5NcqebNGNLbQsGsDTRSFeK91/Z7us6AHc6DmGPB WW7WlJZML6ZLk3K1PJJ13BugvA== X-Google-Smtp-Source: APXvYqzLGaU54cAjGodqGPPLcRlDE7+sMJMme6YzEVcXK3OTKVmphw9jtUPC6uTnqkVJphOztIKP/Q== X-Received: by 2002:a17:906:6003:: with SMTP id o3mr17463138ejj.128.1553606434719; Tue, 26 Mar 2019 06:20:34 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:33 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:20:03 +0100 Message-Id: <20190326132008.11781-16-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eABN7MUhcZhCJ6eRjV76xpF3ewbo/q0bb+3DvwpeUsA=; b=P8JAGE+GONcuBWMAClPM8/70kHfH9Bf0Su4PdkLpEldYSJd7m8oq3yeK3Tb5FSuqHv /iX4JUKxDFfBzU2BlhciwZykZeMaywwDDZNYxxXufNrryNyZg47xRy45PjWkseNtO/Bj uzdji278rYLzaQHPOeIfQjUu1XkhnIFmTNHc8= Subject: [Intel-gfx] [PATCH 16/21] drm/radeon: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "David \(ChunMing\) Zhou" , Daniel Vetter , Intel Graphics Development , amd-gfx@lists.freedesktop.org, Alex Deucher , Daniel Vetter , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This should not result in any changes. v2: Rebase Signed-off-by: Daniel Vetter Cc: Alex Deucher Cc: "Christian König" Cc: "David (ChunMing) Zhou" Cc: amd-gfx@lists.freedesktop.org Acked-by: Noralf Trønnes --- drivers/gpu/drm/radeon/radeon_fb.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index d50bff20f7de..1298b84cb1c7 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c @@ -42,7 +42,7 @@ * the helper contains a pointer to radeon framebuffer baseclass. */ struct radeon_fbdev { - struct drm_fb_helper helper; + struct drm_fb_helper helper; /* must be first */ struct drm_framebuffer fb; struct radeon_device *rdev; }; @@ -247,8 +247,6 @@ static int radeonfb_create(struct drm_fb_helper *helper, /* radeon resume is fragile and needs a vt switch to help it along */ info->skip_vt_switch = false; - info->par = rfbdev; - ret = radeon_framebuffer_init(rdev->ddev, &rfbdev->fb, &mode_cmd, gobj); if (ret) { DRM_ERROR("failed to initialize framebuffer %d\n", ret); @@ -262,10 +260,6 @@ static int radeonfb_create(struct drm_fb_helper *helper, memset_io(rbo->kptr, 0x0, radeon_bo_size(rbo)); - strcpy(info->fix.id, "radeondrmfb"); - - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - info->fbops = &radeonfb_ops; tmp = radeon_bo_gpu_offset(rbo) - rdev->mc.vram_start; @@ -274,7 +268,7 @@ static int radeonfb_create(struct drm_fb_helper *helper, info->screen_base = rbo->kptr; info->screen_size = radeon_bo_size(rbo); - drm_fb_helper_fill_var(info, &rfbdev->helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(info, &rfbdev->helper, sizes); /* setup aperture base/size for vesafb takeover */ info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base; From patchwork Tue Mar 26 13:20:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871087 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E4D811390 for ; Tue, 26 Mar 2019 13:21:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2758290FC for ; Tue, 26 Mar 2019 13:21:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D057329074; Tue, 26 Mar 2019 13:21:00 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1358B2903A for ; Tue, 26 Mar 2019 13:20:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 678206E067; Tue, 26 Mar 2019 13:20:40 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id E13BA6E06F for ; Tue, 26 Mar 2019 13:20:37 +0000 (UTC) Received: by mail-ed1-x543.google.com with SMTP id x14so8074436eds.1 for ; Tue, 26 Mar 2019 06:20:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yrfdge2Nqrh6arVhSdlo0upydE4epXNMjFt6CZLmtq8=; b=pUv8TRfT7NTZk+1LqloZJLPpF1+Qn2aQWEBF047ETc0iHCdq/46feXgRP7nih0i7Ky kC6TKlMdzeYcrSSDOmV3Y9FwqXmfNIlqQO3sW1tg14d+7Ou5X7iWs5Rut90tIGNWyR/m JCpkELeAjymDJS9GHu3jAmh9Z4xKdHkEsy8dRMICM3kwA7Mrj35W1vFqKTVZdhYC8PdJ LRN6P6bRUibIMETFaRbcD+tL+J4vUyOGKGGR6TslvvNRUzcMswMHSqWFfNf1PeXEXpYy 3YqlMQ+XYd6+R8aMxqMbUvejrBIG7je0jol7ACFg5rfAwT9q3X7n7HRX80Qe9tMgkGfN ePgg== X-Gm-Message-State: APjAAAXRRTDTJ1yzAhiZxqwxU+wGRsWDz0FeeIbc0xxUSthczKry+JaO D0N6pPxXkokunb+f0BvgXF4Cbg== X-Google-Smtp-Source: APXvYqwsEGQdstyZaWuRuY7rE2oYDTS2eM3vd6D2ZOv2iwIWYBqQlyTaA6h7IAVuzVvJOczFL3YQZA== X-Received: by 2002:a50:fe14:: with SMTP id f20mr19753643edt.187.1553606436024; Tue, 26 Mar 2019 06:20:36 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:35 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:20:04 +0100 Message-Id: <20190326132008.11781-17-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yrfdge2Nqrh6arVhSdlo0upydE4epXNMjFt6CZLmtq8=; b=G/qE1OLKVRnKkf/6tUInIBkj/vDvi8hjkTDQ5Pygt1jEoNSlHWu7fdcG2V2qcsNeLu FT63ako0ib7zAD0KW0UVEphEI2k0V7UTVGwfZnjiteJERhcQSyOHzXlZeZCWBxE1kRKV yzgNraDsYCbykng3iTaxgfgnp4dWY1UKA/OUc= Subject: [Intel-gfx] [PATCH 17/21] drm/rockchip: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Stuebner , Daniel Vetter , Intel Graphics Development , Sandy Huang , linux-rockchip@lists.infradead.org, Daniel Vetter , linux-arm-kernel@lists.infradead.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This will set an fb name for the first time! v2: Rebase Reviewed-by: Heiko Stuebner Signed-off-by: Daniel Vetter Cc: Sandy Huang Cc: "Heiko Stübner" Cc: linux-arm-kernel@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c index 0cbcef88d4d7..30459de66b67 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c @@ -90,12 +90,10 @@ static int rockchip_drm_fbdev_create(struct drm_fb_helper *helper, goto out; } - fbi->par = helper; fbi->fbops = &rockchip_drm_fbdev_ops; fb = helper->fb; - drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(fbi, helper, sizes); offset = fbi->var.xoffset * bytes_per_pixel; offset += fbi->var.yoffset * fb->pitches[0]; From patchwork Tue Mar 26 13:20:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871117 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 744B11390 for ; Tue, 26 Mar 2019 13:21:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6195128FB6 for ; Tue, 26 Mar 2019 13:21:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5657829102; Tue, 26 Mar 2019 13:21:20 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 21DAC29018 for ; Tue, 26 Mar 2019 13:21:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 567396E045; Tue, 26 Mar 2019 13:21:00 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id E36CA6E048 for ; Tue, 26 Mar 2019 13:20:38 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id v21so10731662edq.4 for ; Tue, 26 Mar 2019 06:20:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P1SoUkfA9EPatsMScG2RJ03PBn2MkLtTodK4/2n1CsY=; b=YYQkD7+x8NDPhTvIVUro8PRmq4jZP7RUTWIOf28T8m/j1fWuKm/NP1NeeBiGJV15JO +uIFC+PtcAchJKYs0HuvDSk//0ohEBatxQQwofHpPnkNxu9LHC/750g6SqbJC16AiIcD LyMX5Snip3AI0GAyQL0065azJkPmfuAGTapVaiRjjHA6o7pZGhtyBdbN9kwCKNdgIB1B 5cgPIlK1XMTTUFW2sLg8pp/HuRtBctTltDkVJE/dA40s6XWPWt96LXrRjBAzccFE8JN+ jVCOxDHCnmRY3ev8/qOnjm+PnQ4voDRlFH72SwzyBQBKQY8/t2tZTwvSzpCAZ9axkWYe 6R6A== X-Gm-Message-State: APjAAAXmyy2kNGqn9EkVfn7pg1XU3+dGflq7ySIr0z3EnmHPFpxiS7MY aLkZeTD6d1yTi1VLe4IvnSYrjhdV/tw= X-Google-Smtp-Source: APXvYqwY/ytXicaNbkURPNxr2q0mgtRV/WN7hHZ+/KU4Gu3W8a5FtUWjUrSJ9qXr6Cfxnc7UkcKo+g== X-Received: by 2002:a50:97d0:: with SMTP id f16mr19391774edb.287.1553606437434; Tue, 26 Mar 2019 06:20:37 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:36 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:20:05 +0100 Message-Id: <20190326132008.11781-18-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P1SoUkfA9EPatsMScG2RJ03PBn2MkLtTodK4/2n1CsY=; b=Cx5AhqVde0nmcqQo3DwuXX9h21ma+VKnO7673eUMWRad+l4t2xnQjpTJ4/fXYmASM/ eEJMDyLy1kYq+TwsNPSoPSECm7TdEXFkeYBaALUxvw/co4WxUlIkGsQaiO81KTXSIBp5 T9zygRyhzAArJjVqO4q8+O0OVU3h+gIBvEx10= Subject: [Intel-gfx] [PATCH 18/21] drm/tegra: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Jonathan Hunter , linux-tegra@vger.kernel.org, Daniel Vetter , Thierry Reding Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Another driver that didn't set fbinfo->fix.id before. v2: Fix subject and rebase Acked-by: Thierry Reding Signed-off-by: Daniel Vetter Cc: Thierry Reding Cc: Jonathan Hunter Cc: linux-tegra@vger.kernel.org Reviewed-by: Noralf Trønnes Acked-by: Thierry Reding --- drivers/gpu/drm/tegra/fb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c index 0a4ce05e00ab..1dd83a757dba 100644 --- a/drivers/gpu/drm/tegra/fb.c +++ b/drivers/gpu/drm/tegra/fb.c @@ -255,11 +255,9 @@ static int tegra_fbdev_probe(struct drm_fb_helper *helper, helper->fb = fb; helper->fbdev = info; - info->par = helper; info->fbops = &tegra_fb_ops; - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(info, helper, fb->width, fb->height); + drm_fb_helper_fill_info(info, helper, sizes); offset = info->var.xoffset * bytes_per_pixel + info->var.yoffset * fb->pitches[0]; From patchwork Tue Mar 26 13:20:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871103 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62E6B1390 for ; Tue, 26 Mar 2019 13:21:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50E9A28FC6 for ; Tue, 26 Mar 2019 13:21:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F1D628FF9; Tue, 26 Mar 2019 13:21:11 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E4FEE29018 for ; Tue, 26 Mar 2019 13:21:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 921C96E071; Tue, 26 Mar 2019 13:20:51 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C8526E048 for ; Tue, 26 Mar 2019 13:20:41 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id x10so10673250edh.11 for ; Tue, 26 Mar 2019 06:20:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jOnyj+WyZ6pkF2m7wzquGOf3M+A2EpYXLC6i7NwDWvQ=; b=f+WLCWmkqVhnpOtbvagGPZ3zT1AW08HIVCOBay6VFqhiAKZ2G0nUEhrqDcWKWxhPow vfq/FL4PI3H46bTrkPGpV5dmaRYz8TztvVHaX5aEmWJdZ/GaYMYaelXAVQMBuxODiUkz RE2V9DjR24Gk9s6ENF5ZJdYyz0pF2zpPr81XvMP9rqsPv793CaA2SBBOgoEYVUK0X65T zrF1gYc1fupKGVsUnYnegq/zYToHf9DIzVLfslRivmmFUiu8zHQMwvDhq4KXFCnqJlh+ e63gJMWh8NcUhfd/rmwv1EQesLsRim+YY2fGZN9kDsLRCEPMO53SwXVLQk3fgYj7zAQQ ppqA== X-Gm-Message-State: APjAAAUoGHsT7/vGSPhtp32HETqFztwl259irmXyuj8hGYCWaPa8o9xT G7qTFOePUnLZSTBTkdH2F7+0NQ== X-Google-Smtp-Source: APXvYqyrBDVqYWI+vxQf0ocQowuKiQKuS0T3elb9N67mDhZGg3cT8Kp0Fmwzxq6QMk5Qb8G2NvU2nQ== X-Received: by 2002:a05:6402:506:: with SMTP id m6mr19975116edv.194.1553606438886; Tue, 26 Mar 2019 06:20:38 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:38 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:20:06 +0100 Message-Id: <20190326132008.11781-19-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jOnyj+WyZ6pkF2m7wzquGOf3M+A2EpYXLC6i7NwDWvQ=; b=Vq+vG2hXM+gFOx3YD/ddMBOYC1Xbcyw4ftDpnxSLuS1IFF9je1VpcC6mG+N1uMp32u 7/p2fVm0tbWN3xfOpPmGu4hd7ixySvEfuC0GvKvkowJYcd0ZY/uTVKyQZhRw4u6jWSAo 3e+3p7jCXnEfNBxOXbtF/XCCVEpIZCyBEcRW4= Subject: [Intel-gfx] [PATCH 19/21] drm/udl: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Emil Lundmark , Greg Kroah-Hartman , Daniel Vetter , Intel Graphics Development , Mikulas Patocka , Daniel Vetter , Dave Airlie Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This should not result in any changes. v2: Rebase Signed-off-by: Daniel Vetter Cc: Dave Airlie Cc: Sean Paul Cc: Mikulas Patocka Cc: Daniel Vetter Cc: Greg Kroah-Hartman Cc: Emil Lundmark Acked-by: Noralf Trønnes --- drivers/gpu/drm/udl/udl_fb.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c index dd9ffded223b..59e005edf309 100644 --- a/drivers/gpu/drm/udl/udl_fb.c +++ b/drivers/gpu/drm/udl/udl_fb.c @@ -32,7 +32,7 @@ module_param(fb_bpp, int, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP); module_param(fb_defio, int, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP); struct udl_fbdev { - struct drm_fb_helper helper; + struct drm_fb_helper helper; /* must be first */ struct udl_framebuffer ufb; int fb_count; }; @@ -402,15 +402,12 @@ static int udlfb_create(struct drm_fb_helper *helper, ufbdev->helper.fb = fb; - strcpy(info->fix.id, "udldrmfb"); - info->screen_base = ufbdev->ufb.obj->vmapping; info->fix.smem_len = size; info->fix.smem_start = (unsigned long)ufbdev->ufb.obj->vmapping; info->fbops = &udlfb_ops; - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(info, &ufbdev->helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(info, &ufbdev->helper, sizes); DRM_DEBUG_KMS("allocated %dx%d vmal %p\n", fb->width, fb->height, From patchwork Tue Mar 26 13:20:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871089 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C220F922 for ; Tue, 26 Mar 2019 13:21:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B04C2286D1 for ; Tue, 26 Mar 2019 13:21:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AEC4F2906C; Tue, 26 Mar 2019 13:21:01 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4AC5C286D1 for ; Tue, 26 Mar 2019 13:21:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B1B6C6E069; Tue, 26 Mar 2019 13:20:44 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F2936E068 for ; Tue, 26 Mar 2019 13:20:42 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id q14so10722153edr.5 for ; Tue, 26 Mar 2019 06:20:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+56PIy9tn2OfGguxyaaSn6r4OcvRHTOL0jgqVYdmcGo=; b=RMJr+DDnRBl+6I1G1kR02Xh2HsWDVM6XtUZwbxffpVyoXUt3NTps1fY+vg3Ajro7M/ r8L3OMbDG0STa9bqcJj8ZAah9fzAoED2qupOnupa8UWRh/Soe5jq3lad1NGo4y9rAY0n 9EErpnnpojZjzU/fPrf85UQlCIKUfOV7HQ9sX9vi2dMzUo4gd0Mytc5sMw5q+2stpoiR GcYnYbXIcc48dsxuITxsZDXUrUKjlmTQo0I0onm7UEuMnIeMQPtHnayerTF7ezkwcUld HEeevKM21wJtDtcObUQnc0f7ZhaUFlMlVVsjphV2yEeEk50k/Bsc+Br2nws4pcpC5wFn Jw+w== X-Gm-Message-State: APjAAAV1+W5g5jq2uq+GVShjH1ahDJBNumjNU0IFdGUk0g/j5dRyDIM7 7f6SUURzqdiEhfMoLe5REKqFcQ== X-Google-Smtp-Source: APXvYqzbXE/S6KtuHOPfJjqxjzKFv2guNAeERGViNewkq0SUuCaEAwaW0hQd+cWiDTwLCE5ftK/YQQ== X-Received: by 2002:a05:6402:88a:: with SMTP id e10mr19908814edy.88.1553606440143; Tue, 26 Mar 2019 06:20:40 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:39 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:20:07 +0100 Message-Id: <20190326132008.11781-20-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+56PIy9tn2OfGguxyaaSn6r4OcvRHTOL0jgqVYdmcGo=; b=OMwAcnbIdHMUEhA+L/nXrr+3jHiUMSip6wTVexNINycm/P/+BwlkDBdw55Nrix8RDV WcRnQKJDtpLAvMvLRI5wsxYm2rXfQO5ma4HMJuyJMiKUSqENTtX+9DyaXOErqH7XK1qY YV7NYBs55OE/iUpy9ld9qkDweKxRZXAp9PenE= Subject: [Intel-gfx] [PATCH 20/21] drm/vboxvideo: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Kapshuk , Bartlomiej Zolnierkiewicz , Daniel Vetter , Intel Graphics Development , Greg Kroah-Hartman , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This should not result in any changes. v2: Rebase over vbox changes - vbox gained it's own line to fill fix.id. v3: Rebase Reviewed-by: Greg Kroah-Hartman (v2) Signed-off-by: Daniel Vetter Cc: Greg Kroah-Hartman Cc: Hans de Goede Cc: Daniel Vetter Cc: Alexander Kapshuk Cc: Bartlomiej Zolnierkiewicz Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/vboxvideo/vbox_fb.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/vboxvideo/vbox_fb.c b/drivers/gpu/drm/vboxvideo/vbox_fb.c index 83a04afd1766..b724fe7c0c30 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_fb.c +++ b/drivers/gpu/drm/vboxvideo/vbox_fb.c @@ -90,13 +90,9 @@ int vboxfb_create(struct drm_fb_helper *helper, if (IS_ERR(info->screen_base)) return PTR_ERR(info->screen_base); - info->par = helper; - fb = &vbox->afb.base; helper->fb = fb; - strcpy(info->fix.id, "vboxdrmfb"); - info->fbops = &vboxfb_ops; /* @@ -106,9 +102,7 @@ int vboxfb_create(struct drm_fb_helper *helper, info->apertures->ranges[0].base = pci_resource_start(pdev, 0); info->apertures->ranges[0].size = pci_resource_len(pdev, 0); - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(info, helper, sizes->fb_width, - sizes->fb_height); + drm_fb_helper_fill_info(info, helper, sizes); gpu_addr = vbox_bo_gpu_offset(bo); info->fix.smem_start = info->apertures->ranges[0].base + gpu_addr; From patchwork Tue Mar 26 13:20:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871105 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4A178922 for ; Tue, 26 Mar 2019 13:21:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36DE6286D1 for ; Tue, 26 Mar 2019 13:21:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3537C29007; Tue, 26 Mar 2019 13:21:12 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D9ACC2901F for ; Tue, 26 Mar 2019 13:21:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D21736E072; Tue, 26 Mar 2019 13:20:51 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A0C96E048 for ; Tue, 26 Mar 2019 13:20:43 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id q3so10747961edg.0 for ; Tue, 26 Mar 2019 06:20:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gfqcYr2ey981w0WlnadQC9u9ggX25i238//q2bWNcrA=; b=Sl01/C+naQbJsCtYLYPJ5HgARUHbGoJ9avve/NCGsGXjhmOrw/ZF36PBB6umXzLlSU VJ/L3SZCM5G0hDnHdl62Hg/t+xrGJad7D7dg61iceN7gwX+/K0Pmrd11Qp7a71I7eLor tWNGAvcyDADYZFSI0W2HqdCzxZ8g5slrcTcSnukG8vLM5DCl93BujxtYa1Nunw2O16GB UssDPoLzMON/vIiwfrFBTpA5ezRKfUkH2o3BW0IYd7nzgoLqFndZ225NR9NODtlzWVUh S0O3mg9ehS9gi33FUw5tdizfO3LvLy1dkvekzp0/iDzxCtONN1woO1c0mjTpJ34PenjS AZXQ== X-Gm-Message-State: APjAAAWtRRzc7QavUcHUL/jNY1LWZMkYsjbuBLphR1ptOC/sdYhABgjr N//IT3pWaoYApW8m4ZJv/9BnbR3E6wA= X-Google-Smtp-Source: APXvYqx0McXXcQ0VvL3D8cREnd4yU+4DuS5WuZBzVPVSDG6xiWGNrpJbnujBP8ro2nJbjj7l2bKK2Q== X-Received: by 2002:a17:906:7f9a:: with SMTP id f26mr10822794ejr.28.1553606441415; Tue, 26 Mar 2019 06:20:41 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:40 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:20:08 +0100 Message-Id: <20190326132008.11781-21-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gfqcYr2ey981w0WlnadQC9u9ggX25i238//q2bWNcrA=; b=CVqKU/Yiz/3oWUM/QQVNEm9vjwfgvi5atDVy9249M0/kiq58aMCRLtYRQK68ToIXpH NRGrE58tE5z9W2EkeMTb+bGa0nw0vD6L0X15nKFk07P6CBT8PYFT6Zg+3YVP1wGE2N3g 6HQ89X+cpQ0pCgBPO9I38DeK/RJ6VmmShH6As= Subject: [Intel-gfx] [PATCH 21/21] drm/fb-helper: Unexport fill_{var,info} X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Not used by drivers anymore. v2: Rebase Signed-off-by: Daniel Vetter Reviewed-by: Alex Deucher Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/drm_fb_helper.c | 38 +++++---------------------------- include/drm/drm_fb_helper.h | 4 ---- 2 files changed, 5 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 42423ca28991..6ae8d5fa142c 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -2037,21 +2037,8 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, return 0; } -/** - * drm_fb_helper_fill_fix - initializes fixed fbdev information - * @info: fbdev registered by the helper - * @pitch: desired pitch - * @depth: desired depth - * - * Helper to fill in the fixed fbdev information useful for a non-accelerated - * fbdev emulations. Drivers which support acceleration methods which impose - * additional constraints need to set up their own limits. - * - * Drivers should call this (or their equivalent setup code) from their - * &drm_fb_helper_funcs.fb_probe callback. - */ -void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch, - uint32_t depth) +static void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch, + uint32_t depth) { info->fix.type = FB_TYPE_PACKED_PIXELS; info->fix.visual = depth == 8 ? FB_VISUAL_PSEUDOCOLOR : @@ -2066,24 +2053,10 @@ void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch, info->fix.line_length = pitch; } -EXPORT_SYMBOL(drm_fb_helper_fill_fix); -/** - * drm_fb_helper_fill_var - initalizes variable fbdev information - * @info: fbdev instance to set up - * @fb_helper: fb helper instance to use as template - * @fb_width: desired fb width - * @fb_height: desired fb height - * - * Sets up the variable fbdev metainformation from the given fb helper instance - * and the drm framebuffer allocated in &drm_fb_helper.fb. - * - * Drivers should call this (or their equivalent setup code) from their - * &drm_fb_helper_funcs.fb_probe callback after having allocated the fbdev - * backing storage framebuffer. - */ -void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper, - uint32_t fb_width, uint32_t fb_height) +static void drm_fb_helper_fill_var(struct fb_info *info, + struct drm_fb_helper *fb_helper, + uint32_t fb_width, uint32_t fb_height) { struct drm_framebuffer *fb = fb_helper->fb; @@ -2103,7 +2076,6 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe info->var.xres = fb_width; info->var.yres = fb_height; } -EXPORT_SYMBOL(drm_fb_helper_fill_var); /** * drm_fb_helper_fill_info - initializes fbdev information diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 9ef72f20662d..9ba9db5dc34d 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -289,10 +289,6 @@ int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper); struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper); void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper); -void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper, - uint32_t fb_width, uint32_t fb_height); -void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch, - uint32_t depth); void drm_fb_helper_fill_info(struct fb_info *info, struct drm_fb_helper *fb_helper, struct drm_fb_helper_surface_size *sizes);