aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Stone <daniels@collabora.com>2018-03-30 10:11:25 -0400
committerThierry Reding <treding@nvidia.com>2018-05-17 11:44:48 -0400
commite1189921b5ff9dcfec52b21cf12bb52c5dccd34d (patch)
tree5f07dcbec1db0bbdda2ce9e98999824dbf13aae2
parentcc7add70cad12054e096b034578827d7065f64bb (diff)
drm/tegra: Remove duplicate framebuffer num_planes
drm_framebuffer already stores num_planes for us. Signed-off-by: Daniel Stone <daniels@collabora.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: linux-tegra@vger.kernel.org Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/drm/tegra/drm.h1
-rw-r--r--drivers/gpu/drm/tegra/fb.c6
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
index fe263cf58f34..61a4657e45fa 100644
--- a/drivers/gpu/drm/tegra/drm.h
+++ b/drivers/gpu/drm/tegra/drm.h
@@ -32,7 +32,6 @@ struct reset_control;
32struct tegra_fb { 32struct tegra_fb {
33 struct drm_framebuffer base; 33 struct drm_framebuffer base;
34 struct tegra_bo **planes; 34 struct tegra_bo **planes;
35 unsigned int num_planes;
36}; 35};
37 36
38#ifdef CONFIG_DRM_FBDEV_EMULATION 37#ifdef CONFIG_DRM_FBDEV_EMULATION
diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c
index e69434909a42..75badf371721 100644
--- a/drivers/gpu/drm/tegra/fb.c
+++ b/drivers/gpu/drm/tegra/fb.c
@@ -107,7 +107,7 @@ static void tegra_fb_destroy(struct drm_framebuffer *framebuffer)
107 struct tegra_fb *fb = to_tegra_fb(framebuffer); 107 struct tegra_fb *fb = to_tegra_fb(framebuffer);
108 unsigned int i; 108 unsigned int i;
109 109
110 for (i = 0; i < fb->num_planes; i++) { 110 for (i = 0; i < framebuffer->format->num_planes; i++) {
111 struct tegra_bo *bo = fb->planes[i]; 111 struct tegra_bo *bo = fb->planes[i];
112 112
113 if (bo) { 113 if (bo) {
@@ -155,11 +155,9 @@ static struct tegra_fb *tegra_fb_alloc(struct drm_device *drm,
155 return ERR_PTR(-ENOMEM); 155 return ERR_PTR(-ENOMEM);
156 } 156 }
157 157
158 fb->num_planes = num_planes;
159
160 drm_helper_mode_fill_fb_struct(drm, &fb->base, mode_cmd); 158 drm_helper_mode_fill_fb_struct(drm, &fb->base, mode_cmd);
161 159
162 for (i = 0; i < fb->num_planes; i++) 160 for (i = 0; i < fb->base.format->num_planes; i++)
163 fb->planes[i] = planes[i]; 161 fb->planes[i] = planes[i];
164 162
165 err = drm_framebuffer_init(drm, &fb->base, &tegra_fb_funcs); 163 err = drm_framebuffer_init(drm, &fb->base, &tegra_fb_funcs);