github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 23:52:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915: s/state/plane_state/

Browse Source 
Use the canonical 'plane_state' name for function arguments
where appropriate.

Also do the s/int plane/int color_plane/ in couple of the
function prototypes while at it.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250213150220.13580-13-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Ville Syrjälä 2025-02-13 17:02:20 +02:00
parent 9ba19223a5
commit 1bcba22853
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/gpu/drm/i915/display/intel_fb.c
View File

@ -1049,13 +1049,13 @@ static u32 intel_adjust_aligned_offset(int *x, int *y,
* the x/y offsets.
*/
u32 intel_plane_adjust_aligned_offset(int *x, int *y,
const struct intel_plane_state *state,
const struct intel_plane_state *plane_state,
int color_plane,
u32 old_offset, u32 new_offset)
{
return intel_adjust_aligned_offset(x, y, state->hw.fb, color_plane,
state->hw.rotation,
state->view.color_plane[color_plane].mapping_stride,
return intel_adjust_aligned_offset(x, y, plane_state->hw.fb, color_plane,
plane_state->hw.rotation,
plane_state->view.color_plane[color_plane].mapping_stride,
old_offset, new_offset);
}
@ -1129,14 +1129,14 @@ static u32 intel_compute_aligned_offset(struct intel_display *display,
}
u32 intel_plane_compute_aligned_offset(int *x, int *y,
const struct intel_plane_state *state,
const struct intel_plane_state *plane_state,
int color_plane)
{
struct intel_display *display = to_intel_display(state);
struct intel_plane *plane = to_intel_plane(state->uapi.plane);
const struct drm_framebuffer *fb = state->hw.fb;
unsigned int rotation = state->hw.rotation;
unsigned int pitch = state->view.color_plane[color_plane].mapping_stride;
struct intel_display *display = to_intel_display(plane_state);
struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
const struct drm_framebuffer *fb = plane_state->hw.fb;
unsigned int rotation = plane_state->hw.rotation;
unsigned int pitch = plane_state->view.color_plane[color_plane].mapping_stride;
unsigned int alignment = plane->min_alignment(plane, fb, color_plane);
return intel_compute_aligned_offset(display, x, y, fb, color_plane,
@ -1945,12 +1945,12 @@ void intel_fb_fill_view(const struct intel_framebuffer *fb, unsigned int rotatio
* with gen2/3, and 90/270 degree rotations isn't supported on any of them.
*/
u32 intel_fb_xy_to_linear(int x, int y,
const struct intel_plane_state *state,
const struct intel_plane_state *plane_state,
int color_plane)
{
const struct drm_framebuffer *fb = state->hw.fb;
const struct drm_framebuffer *fb = plane_state->hw.fb;
unsigned int cpp = fb->format->cpp[color_plane];
unsigned int pitch = state->view.color_plane[color_plane].mapping_stride;
unsigned int pitch = plane_state->view.color_plane[color_plane].mapping_stride;
return y * pitch + x * cpp;
}
@ -1961,12 +1961,12 @@ u32 intel_fb_xy_to_linear(int x, int y,
* specify the start of scanout from the beginning of the gtt mapping.
*/
void intel_add_fb_offsets(int *x, int *y,
const struct intel_plane_state *state,
const struct intel_plane_state *plane_state,
int color_plane)
{
*x += state->view.color_plane[color_plane].x;
*y += state->view.color_plane[color_plane].y;
*x += plane_state->view.color_plane[color_plane].x;
*y += plane_state->view.color_plane[color_plane].y;
}
static

11
drivers/gpu/drm/i915/display/intel_fb.h
View File

@ -71,11 +71,11 @@ void intel_fb_plane_get_subsampling(int *hsub, int *vsub,
int color_plane);
u32 intel_plane_adjust_aligned_offset(int *x, int *y,
const struct intel_plane_state *state,
const struct intel_plane_state *plane_state,
int color_plane,
u32 old_offset, u32 new_offset);
u32 intel_plane_compute_aligned_offset(int *x, int *y,
const struct intel_plane_state *state,
const struct intel_plane_state *plane_state,
int color_plane);
bool intel_fb_needs_pot_stride_remap(const struct intel_framebuffer *fb);
@ -94,10 +94,11 @@ unsigned int intel_fb_view_vtd_guard(const struct drm_framebuffer *fb,
int intel_plane_compute_gtt(struct intel_plane_state *plane_state);
unsigned int intel_fb_xy_to_linear(int x, int y,
const struct intel_plane_state *state,
int plane);
const struct intel_plane_state *plane_state,
int color_plane);
void intel_add_fb_offsets(int *x, int *y,
const struct intel_plane_state *state, int plane);
const struct intel_plane_state *plane_state,
int color_plane);
int intel_framebuffer_init(struct intel_framebuffer *ifb,
struct drm_gem_object *obj,