mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-05-02 18:17:50 -04:00
drm/client: Remove pitch from struct drm_client_buffer
Only the client-buffer setup uses the pitch field from struct drm_client_buffer. Remove the field and pass the value among setup helpers. Clients that need the pitch should rather look at the framebuffer's pitches[0] directly. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com> Tested-by: Francesco Valla <francesco@valla.it> Link: https://patch.msgid.link/20251027121042.143588-2-tzimmermann@suse.de
This commit is contained in:
@@ -188,7 +188,7 @@ static void drm_client_buffer_delete(struct drm_client_buffer *buffer)
|
|||||||
|
|
||||||
static struct drm_client_buffer *
|
static struct drm_client_buffer *
|
||||||
drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height,
|
drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height,
|
||||||
u32 format, u32 *handle)
|
u32 format, u32 *handle, u32 *pitch)
|
||||||
{
|
{
|
||||||
const struct drm_format_info *info = drm_format_info(format);
|
const struct drm_format_info *info = drm_format_info(format);
|
||||||
struct drm_mode_create_dumb dumb_args = { };
|
struct drm_mode_create_dumb dumb_args = { };
|
||||||
@@ -216,9 +216,9 @@ drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height,
|
|||||||
goto err_delete;
|
goto err_delete;
|
||||||
}
|
}
|
||||||
|
|
||||||
buffer->pitch = dumb_args.pitch;
|
|
||||||
buffer->gem = obj;
|
buffer->gem = obj;
|
||||||
*handle = dumb_args.handle;
|
*handle = dumb_args.handle;
|
||||||
|
*pitch = dumb_args.pitch;
|
||||||
|
|
||||||
return buffer;
|
return buffer;
|
||||||
|
|
||||||
@@ -353,7 +353,7 @@ static void drm_client_buffer_rmfb(struct drm_client_buffer *buffer)
|
|||||||
|
|
||||||
static int drm_client_buffer_addfb(struct drm_client_buffer *buffer,
|
static int drm_client_buffer_addfb(struct drm_client_buffer *buffer,
|
||||||
u32 width, u32 height, u32 format,
|
u32 width, u32 height, u32 format,
|
||||||
u32 handle)
|
u32 handle, u32 pitch)
|
||||||
{
|
{
|
||||||
struct drm_client_dev *client = buffer->client;
|
struct drm_client_dev *client = buffer->client;
|
||||||
struct drm_mode_fb_cmd2 fb_req = { };
|
struct drm_mode_fb_cmd2 fb_req = { };
|
||||||
@@ -363,7 +363,7 @@ static int drm_client_buffer_addfb(struct drm_client_buffer *buffer,
|
|||||||
fb_req.height = height;
|
fb_req.height = height;
|
||||||
fb_req.pixel_format = format;
|
fb_req.pixel_format = format;
|
||||||
fb_req.handles[0] = handle;
|
fb_req.handles[0] = handle;
|
||||||
fb_req.pitches[0] = buffer->pitch;
|
fb_req.pitches[0] = pitch;
|
||||||
|
|
||||||
ret = drm_mode_addfb2(client->dev, &fb_req, client->file);
|
ret = drm_mode_addfb2(client->dev, &fb_req, client->file);
|
||||||
if (ret)
|
if (ret)
|
||||||
@@ -399,15 +399,15 @@ struct drm_client_buffer *
|
|||||||
drm_client_framebuffer_create(struct drm_client_dev *client, u32 width, u32 height, u32 format)
|
drm_client_framebuffer_create(struct drm_client_dev *client, u32 width, u32 height, u32 format)
|
||||||
{
|
{
|
||||||
struct drm_client_buffer *buffer;
|
struct drm_client_buffer *buffer;
|
||||||
u32 handle;
|
u32 handle, pitch;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
buffer = drm_client_buffer_create(client, width, height, format,
|
buffer = drm_client_buffer_create(client, width, height, format,
|
||||||
&handle);
|
&handle, &pitch);
|
||||||
if (IS_ERR(buffer))
|
if (IS_ERR(buffer))
|
||||||
return buffer;
|
return buffer;
|
||||||
|
|
||||||
ret = drm_client_buffer_addfb(buffer, width, height, format, handle);
|
ret = drm_client_buffer_addfb(buffer, width, height, format, handle, pitch);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The handle is only needed for creating the framebuffer, destroy it
|
* The handle is only needed for creating the framebuffer, destroy it
|
||||||
|
|||||||
@@ -173,11 +173,6 @@ struct drm_client_buffer {
|
|||||||
*/
|
*/
|
||||||
struct drm_client_dev *client;
|
struct drm_client_dev *client;
|
||||||
|
|
||||||
/**
|
|
||||||
* @pitch: Buffer pitch
|
|
||||||
*/
|
|
||||||
u32 pitch;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @gem: GEM object backing this buffer
|
* @gem: GEM object backing this buffer
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user