diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-01-24 11:58:31 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-01-29 04:56:42 -0500 |
| commit | f12d0b91affc59d289e1bfdbbc787d27376494f2 (patch) | |
| tree | ee679a0db89a050a45fe8a85978fdceda3c2e14e /drivers/gpu/drm | |
| parent | 168982d243d7f8dc368e508a61a8516a23b0bbec (diff) | |
drm/<drivers>: Don't set FBINFO_(FLAG_)DEFAULT
Both macros evaluate to 0. At the same time flag is already set to
zero since the struct is kzalloc'd in framebuffer_alloc().
As called by drm_fb_helper_alloc_fbi() in the DRM drivers.
v2: Rebase and improve commit message per Emil's suggestion.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: nouveau@lists.freedesktop.org
Cc: linux-rockchip@lists.infradead.org
Cc: linux-tegra@vger.kernel.org
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190124165831.16427-27-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/gma500/framebuffer.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/tegra/fb.c | 1 |
5 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index f057082a9b30..c30dd88cdb25 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c | |||
| @@ -88,7 +88,6 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper, | |||
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | fbi->par = helper; | 90 | fbi->par = helper; |
| 91 | fbi->flags = FBINFO_FLAG_DEFAULT; | ||
| 92 | fbi->fbops = &exynos_drm_fb_ops; | 91 | fbi->fbops = &exynos_drm_fb_ops; |
| 93 | 92 | ||
| 94 | drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth); | 93 | drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth); |
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index adefae58b5fc..c934b3df1f81 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c | |||
| @@ -405,7 +405,6 @@ static int psbfb_create(struct psb_fbdev *fbdev, | |||
| 405 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); | 405 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); |
| 406 | strcpy(info->fix.id, "psbdrmfb"); | 406 | strcpy(info->fix.id, "psbdrmfb"); |
| 407 | 407 | ||
| 408 | info->flags = FBINFO_DEFAULT; | ||
| 409 | if (dev_priv->ops->accel_2d && pitch_lines > 8) /* 2D engine */ | 408 | if (dev_priv->ops->accel_2d && pitch_lines > 8) /* 2D engine */ |
| 410 | info->fbops = &psbfb_ops; | 409 | info->fbops = &psbfb_ops; |
| 411 | else if (gtt_roll) { /* GTT rolling seems best */ | 410 | else if (gtt_roll) { /* GTT rolling seems best */ |
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 032317c81bf0..d275418edd24 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c | |||
| @@ -374,9 +374,9 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, | |||
| 374 | 374 | ||
| 375 | strcpy(info->fix.id, "nouveaufb"); | 375 | strcpy(info->fix.id, "nouveaufb"); |
| 376 | if (!chan) | 376 | if (!chan) |
| 377 | info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_DISABLED; | 377 | info->flags = FBINFO_HWACCEL_DISABLED; |
| 378 | else | 378 | else |
| 379 | info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_COPYAREA | | 379 | info->flags = FBINFO_HWACCEL_COPYAREA | |
| 380 | FBINFO_HWACCEL_FILLRECT | | 380 | FBINFO_HWACCEL_FILLRECT | |
| 381 | FBINFO_HWACCEL_IMAGEBLIT; | 381 | FBINFO_HWACCEL_IMAGEBLIT; |
| 382 | info->fbops = &nouveau_fbcon_sw_ops; | 382 | info->fbops = &nouveau_fbcon_sw_ops; |
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c index a7c457737738..8ce68bd508be 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | |||
| @@ -91,7 +91,6 @@ static int rockchip_drm_fbdev_create(struct drm_fb_helper *helper, | |||
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | fbi->par = helper; | 93 | fbi->par = helper; |
| 94 | fbi->flags = FBINFO_FLAG_DEFAULT; | ||
| 95 | fbi->fbops = &rockchip_drm_fbdev_ops; | 94 | fbi->fbops = &rockchip_drm_fbdev_ops; |
| 96 | 95 | ||
| 97 | fb = helper->fb; | 96 | fb = helper->fb; |
diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c index 5ee48a6bb3ad..0a4ce05e00ab 100644 --- a/drivers/gpu/drm/tegra/fb.c +++ b/drivers/gpu/drm/tegra/fb.c | |||
| @@ -256,7 +256,6 @@ static int tegra_fbdev_probe(struct drm_fb_helper *helper, | |||
| 256 | helper->fbdev = info; | 256 | helper->fbdev = info; |
| 257 | 257 | ||
| 258 | info->par = helper; | 258 | info->par = helper; |
| 259 | info->flags = FBINFO_FLAG_DEFAULT; | ||
| 260 | info->fbops = &tegra_fb_ops; | 259 | info->fbops = &tegra_fb_ops; |
| 261 | 260 | ||
| 262 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); | 261 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); |
