diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-11-14 17:51:28 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-11-15 14:53:23 -0500 |
commit | 308e5bcbdb10452e8aba31aa21432fb67ee46d72 (patch) | |
tree | 5e4eebef07685c4047f54d1727fc9bcbace8889d /drivers/gpu/drm/nouveau/nouveau_display.c | |
parent | 8cf5c9177151537e73ff1816540e4ba24b174391 (diff) |
drm: add an fb creation ioctl that takes a pixel format v5
To properly support the various plane formats supported by different
hardware, the kernel must know the pixel format of a framebuffer object.
So add a new ioctl taking a format argument corresponding to a fourcc
name from the new drm_fourcc.h header file. Implement the fb creation
hooks in terms of the new mode_fb_cmd2 using helpers where the old
bpp/depth values are needed.
v2: create DRM specific fourcc header file for sharing with libdrm etc
v3: fix rebase failure and use DRM fourcc codes in intel_display.c and
update commit message
v4: make fb_cmd2 handle field into an array for multi-object formats
pull in Ville's fix for the memcpy in drm_plane_init
apply Ville's cleanup to zero out fb_cmd2 arg in drm_mode_addfb
v5: add 'flags' field for interlaced support (from Ville)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Reviewed-by: Rob Clark <rob.clark@linaro.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_display.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_display.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index ddbabefb4273..7687a77f01d1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c | |||
@@ -64,7 +64,7 @@ static const struct drm_framebuffer_funcs nouveau_framebuffer_funcs = { | |||
64 | int | 64 | int |
65 | nouveau_framebuffer_init(struct drm_device *dev, | 65 | nouveau_framebuffer_init(struct drm_device *dev, |
66 | struct nouveau_framebuffer *nv_fb, | 66 | struct nouveau_framebuffer *nv_fb, |
67 | struct drm_mode_fb_cmd *mode_cmd, | 67 | struct drm_mode_fb_cmd2 *mode_cmd, |
68 | struct nouveau_bo *nvbo) | 68 | struct nouveau_bo *nvbo) |
69 | { | 69 | { |
70 | struct drm_nouveau_private *dev_priv = dev->dev_private; | 70 | struct drm_nouveau_private *dev_priv = dev->dev_private; |
@@ -124,13 +124,13 @@ nouveau_framebuffer_init(struct drm_device *dev, | |||
124 | static struct drm_framebuffer * | 124 | static struct drm_framebuffer * |
125 | nouveau_user_framebuffer_create(struct drm_device *dev, | 125 | nouveau_user_framebuffer_create(struct drm_device *dev, |
126 | struct drm_file *file_priv, | 126 | struct drm_file *file_priv, |
127 | struct drm_mode_fb_cmd *mode_cmd) | 127 | struct drm_mode_fb_cmd2 *mode_cmd) |
128 | { | 128 | { |
129 | struct nouveau_framebuffer *nouveau_fb; | 129 | struct nouveau_framebuffer *nouveau_fb; |
130 | struct drm_gem_object *gem; | 130 | struct drm_gem_object *gem; |
131 | int ret; | 131 | int ret; |
132 | 132 | ||
133 | gem = drm_gem_object_lookup(dev, file_priv, mode_cmd->handle); | 133 | gem = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); |
134 | if (!gem) | 134 | if (!gem) |
135 | return ERR_PTR(-ENOENT); | 135 | return ERR_PTR(-ENOENT); |
136 | 136 | ||