From: "Sergio Miguéns Iglesias" <lonyelon@gmail.com>
To: airlied@linux.ie
Cc: nirmoy.das@amd.com, amd-gfx@lists.freedesktop.org,
linux-kernel@vger.kernel.org,
"Sergio Miguéns Iglesias" <sergio@lony.xyz>
Subject: [PATCH] DRM: amd: amdgpu: Fixed code style and removed unnecessary if statement
Date: Wed, 4 Aug 2021 01:49:44 +0200 [thread overview]
Message-ID: <20210803234944.142154-1-sergio@lony.xyz> (raw)
The file didn't follow the code style so it was changed. The "if" statement
checked if the framebuffer was initialized was also changed since that
condition is unlikely to happen. An unnecessary "if" was removed too since it
didn't execute any code if the condition was met.
Signed-off-by: Sergio Miguéns Iglesias <sergio@lony.xyz>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
index 09b048647523..d2ab07eb00fb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
@@ -42,15 +42,16 @@
#include "amdgpu_display.h"
/* object hierarchy -
- this contains a helper + a amdgpu fb
- the helper contains a pointer to amdgpu framebuffer baseclass.
-*/
+ * this contains a helper + a amdgpu fb
+ * the helper contains a pointer to amdgpu framebuffer baseclass.
+ */
static int
amdgpufb_open(struct fb_info *info, int user)
{
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(fb_helper->dev->dev);
pm_runtime_put_autosuspend(fb_helper->dev->dev);
@@ -182,9 +183,8 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,
ret = amdgpu_bo_kmap(abo, NULL);
amdgpu_bo_unreserve(abo);
- if (ret) {
+ if (ret)
goto out_unref;
- }
*gobj_p = gobj;
return 0;
@@ -233,7 +233,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper,
ret = amdgpu_display_gem_fb_init(adev_to_drm(adev), &rfbdev->rfb,
&mode_cmd, gobj);
- if (ret) {
+ if (unlikely(ret)) {
DRM_ERROR("failed to initialize framebuffer %d\n", ret);
goto out;
}
@@ -258,7 +258,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper,
/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
- if (info->screen_base == NULL) {
+ if (unlikely(info->screen_base == NULL)) {
ret = -ENOSPC;
goto out;
}
@@ -273,9 +273,6 @@ static int amdgpufb_create(struct drm_fb_helper *helper,
return 0;
out:
- if (abo) {
-
- }
if (fb && ret) {
drm_gem_object_put(gobj);
drm_framebuffer_unregister_private(fb);
--
2.32.0
reply other threads:[~2021-08-03 23:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210803234944.142154-1-sergio@lony.xyz \
--to=lonyelon@gmail.com \
--cc=airlied@linux.ie \
--cc=amd-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nirmoy.das@amd.com \
--cc=sergio@lony.xyz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).