On 20/10/2025 17:04, Thomas Zimmermann wrote:
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.
Thanks, it looks good to me.
Reviewed-by: Jocelyn Falempe <[email protected]>
Signed-off-by: Thomas Zimmermann <[email protected]>
---
drivers/gpu/drm/drm_client.c | 14 +++++++-------
include/drm/drm_client.h | 5 -----
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
index 3fa38d4ac70b..5fa8a1628563 100644
--- a/drivers/gpu/drm/drm_client.c
+++ b/drivers/gpu/drm/drm_client.c
@@ -184,7 +184,7 @@ static void drm_client_buffer_delete(struct
drm_client_buffer *buffer)
static struct drm_client_buffer *
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);
struct drm_mode_create_dumb dumb_args = { };
@@ -212,9 +212,9 @@ drm_client_buffer_create(struct drm_client_dev *client, u32
width, u32 height,
goto err_delete;
}
- buffer->pitch = dumb_args.pitch;
buffer->gem = obj;
*handle = dumb_args.handle;
+ *pitch = dumb_args.pitch;
return buffer;
@@ -349,7 +349,7 @@ static void drm_client_buffer_rmfb(struct drm_client_buffer *buffer)
static int drm_client_buffer_addfb(struct drm_client_buffer *buffer,
u32 width, u32 height, u32 format,
- u32 handle)
+ u32 handle, u32 pitch)
{
struct drm_client_dev *client = buffer->client;
struct drm_mode_fb_cmd2 fb_req = { };
@@ -359,7 +359,7 @@ static int drm_client_buffer_addfb(struct drm_client_buffer
*buffer,
fb_req.height = height;
fb_req.pixel_format = format;
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);
if (ret)
@@ -395,15 +395,15 @@ struct drm_client_buffer *
drm_client_framebuffer_create(struct drm_client_dev *client, u32 width, u32
height, u32 format)
{
struct drm_client_buffer *buffer;
- u32 handle;
+ u32 handle, pitch;
int ret;
buffer = drm_client_buffer_create(client, width, height, format,
- &handle);
+ &handle, &pitch);
if (IS_ERR(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
diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h
index 3556928d3938..db0665263a10 100644
--- a/include/drm/drm_client.h
+++ b/include/drm/drm_client.h
@@ -163,11 +163,6 @@ struct drm_client_buffer {
*/
struct drm_client_dev *client;
- /**
- * @pitch: Buffer pitch
- */
- u32 pitch;
-
/**
* @gem: GEM object backing this buffer
*
