aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2016-11-18 14:52:55 -0500
committerVille Syrjälä <ville.syrjala@linux.intel.com>2016-12-15 07:55:29 -0500
commite14c23c647abfc1fed96a55ba376cd9675a54098 (patch)
treec041a530663bebd1b44348aa8d9a9d7caa2f0f2f
parent95bce76015819e546528c13fe25d31771427c9d5 (diff)
drm: Store a pointer to drm_format_info under drm_framebuffer
To avoid having to look up the format information struct every time, let's just store a pointer to it under drm_framebuffer. v2: Don't populate the fb->format pointer in drm_framebuffer_init(). instead we'll treat a NULL format as an error later Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1) Link: http://patchwork.freedesktop.org/patch/msgid/1479498793-31021-20-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--drivers/gpu/drm/drm_modeset_helper.c1
-rw-r--r--include/drm/drm_framebuffer.h4
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_modeset_helper.c b/drivers/gpu/drm/drm_modeset_helper.c
index 57a319e3f780..1aa5e3bcc8a1 100644
--- a/drivers/gpu/drm/drm_modeset_helper.c
+++ b/drivers/gpu/drm/drm_modeset_helper.c
@@ -91,6 +91,7 @@ void drm_helper_mode_fill_fb_struct(struct drm_device *dev,
91 } 91 }
92 92
93 fb->dev = dev; 93 fb->dev = dev;
94 fb->format = info;
94 fb->width = mode_cmd->width; 95 fb->width = mode_cmd->width;
95 fb->height = mode_cmd->height; 96 fb->height = mode_cmd->height;
96 for (i = 0; i < 4; i++) { 97 for (i = 0; i < 4; i++) {
diff --git a/include/drm/drm_framebuffer.h b/include/drm/drm_framebuffer.h
index 1ddfa2928802..a3d2f25230a8 100644
--- a/include/drm/drm_framebuffer.h
+++ b/include/drm/drm_framebuffer.h
@@ -122,6 +122,10 @@ struct drm_framebuffer {
122 */ 122 */
123 struct drm_mode_object base; 123 struct drm_mode_object base;
124 /** 124 /**
125 * @format: framebuffer format information
126 */
127 const struct drm_format_info *format;
128 /**
125 * @funcs: framebuffer vfunc table 129 * @funcs: framebuffer vfunc table
126 */ 130 */
127 const struct drm_framebuffer_funcs *funcs; 131 const struct drm_framebuffer_funcs *funcs;