Skip to content

Commit 2b875c2

Browse files
mattropedanvet
mattrope
authored and
danvet
committed
drm/i915: Make intel_plane_state subclass drm_plane_state
Reviewed-by: Bob Paauwe <bob.j.paauwe@intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
1 parent f4a2cf2 commit 2b875c2

File tree

3 files changed

+27
-28
lines changed

3 files changed

+27
-28
lines changed

‎drivers/gpu/drm/i915/intel_display.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11693,8 +11693,8 @@ static int
1169311693
intel_check_primary_plane(struct drm_plane *plane,
1169411694
struct intel_plane_state *state)
1169511695
{
11696-
struct drm_crtc *crtc = state->crtc;
11697-
struct drm_framebuffer *fb = state->fb;
11696+
struct drm_crtc *crtc = state->base.crtc;
11697+
struct drm_framebuffer *fb = state->base.fb;
1169811698
struct drm_rect *dest = &state->dst;
1169911699
struct drm_rect *src = &state->src;
1170011700
const struct drm_rect *clip = &state->clip;
@@ -11710,8 +11710,8 @@ static int
1171011710
intel_prepare_primary_plane(struct drm_plane *plane,
1171111711
struct intel_plane_state *state)
1171211712
{
11713-
struct drm_crtc *crtc = state->crtc;
11714-
struct drm_framebuffer *fb = state->fb;
11713+
struct drm_crtc *crtc = state->base.crtc;
11714+
struct drm_framebuffer *fb = state->base.fb;
1171511715
struct drm_device *dev = crtc->dev;
1171611716
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
1171711717
enum pipe pipe = intel_crtc->pipe;
@@ -11746,9 +11746,9 @@ static void
1174611746
intel_commit_primary_plane(struct drm_plane *plane,
1174711747
struct intel_plane_state *state)
1174811748
{
11749-
struct drm_crtc *crtc = state->crtc;
11750-
struct drm_framebuffer *fb = state->fb;
11751-
struct drm_device *dev = crtc->dev;
11749+
struct drm_crtc *crtc = state->base.crtc;
11750+
struct drm_framebuffer *fb = state->base.fb;
11751+
struct drm_device *dev = plane->dev;
1175211752
struct drm_i915_private *dev_priv = dev->dev_private;
1175311753
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
1175411754
enum pipe pipe = intel_crtc->pipe;
@@ -11847,8 +11847,8 @@ intel_primary_plane_setplane(struct drm_plane *plane, struct drm_crtc *crtc,
1184711847
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
1184811848
int ret;
1184911849

11850-
state.crtc = crtc;
11851-
state.fb = fb;
11850+
state.base.crtc = crtc;
11851+
state.base.fb = fb;
1185211852

1185311853
/* sample coordinates in 16.16 fixed point */
1185411854
state.src.x1 = src_x;
@@ -11961,9 +11961,9 @@ static int
1196111961
intel_check_cursor_plane(struct drm_plane *plane,
1196211962
struct intel_plane_state *state)
1196311963
{
11964-
struct drm_crtc *crtc = state->crtc;
11964+
struct drm_crtc *crtc = state->base.crtc;
1196511965
struct drm_device *dev = crtc->dev;
11966-
struct drm_framebuffer *fb = state->fb;
11966+
struct drm_framebuffer *fb = state->base.fb;
1196711967
struct drm_rect *dest = &state->dst;
1196811968
struct drm_rect *src = &state->src;
1196911969
const struct drm_rect *clip = &state->clip;
@@ -12018,8 +12018,8 @@ intel_prepare_cursor_plane(struct drm_plane *plane,
1201812018
struct intel_plane_state *state)
1201912019
{
1202012020
struct drm_device *dev = plane->dev;
12021-
struct drm_framebuffer *fb = state->fb;
12022-
struct intel_crtc *intel_crtc = to_intel_crtc(state->crtc);
12021+
struct drm_framebuffer *fb = state->base.fb;
12022+
struct intel_crtc *intel_crtc = to_intel_crtc(state->base.crtc);
1202312023
struct drm_i915_gem_object *obj = intel_fb_obj(fb);
1202412024
struct drm_i915_gem_object *old_obj = intel_fb_obj(plane->fb);
1202512025
enum pipe pipe = intel_crtc->pipe;
@@ -12053,16 +12053,16 @@ static void
1205312053
intel_commit_cursor_plane(struct drm_plane *plane,
1205412054
struct intel_plane_state *state)
1205512055
{
12056-
struct drm_crtc *crtc = state->crtc;
12056+
struct drm_crtc *crtc = state->base.crtc;
1205712057
struct drm_device *dev = crtc->dev;
1205812058
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
1205912059
struct intel_plane *intel_plane = to_intel_plane(plane);
12060-
struct drm_i915_gem_object *obj = intel_fb_obj(state->fb);
12060+
struct drm_i915_gem_object *obj = intel_fb_obj(state->base.fb);
1206112061
enum pipe pipe = intel_crtc->pipe;
1206212062
unsigned old_width;
1206312063
uint32_t addr;
1206412064

12065-
plane->fb = state->fb;
12065+
plane->fb = state->base.fb;
1206612066
crtc->cursor_x = state->orig_dst.x1;
1206712067
crtc->cursor_y = state->orig_dst.y1;
1206812068

@@ -12122,8 +12122,8 @@ intel_cursor_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
1212212122
struct intel_plane_state state;
1212312123
int ret;
1212412124

12125-
state.crtc = crtc;
12126-
state.fb = fb;
12125+
state.base.crtc = crtc;
12126+
state.base.fb = fb;
1212712127

1212812128
/* sample coordinates in 16.16 fixed point */
1212912129
state.src.x1 = src_x;

‎drivers/gpu/drm/i915/intel_drv.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,7 @@ typedef struct dpll {
244244
} intel_clock_t;
245245

246246
struct intel_plane_state {
247-
struct drm_crtc *crtc;
248-
struct drm_framebuffer *fb;
247+
struct drm_plane_state base;
249248
struct drm_rect src;
250249
struct drm_rect dst;
251250
struct drm_rect clip;

‎drivers/gpu/drm/i915/intel_sprite.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,9 +1096,9 @@ static int
10961096
intel_check_sprite_plane(struct drm_plane *plane,
10971097
struct intel_plane_state *state)
10981098
{
1099-
struct intel_crtc *intel_crtc = to_intel_crtc(state->crtc);
1099+
struct intel_crtc *intel_crtc = to_intel_crtc(state->base.crtc);
11001100
struct intel_plane *intel_plane = to_intel_plane(plane);
1101-
struct drm_framebuffer *fb = state->fb;
1101+
struct drm_framebuffer *fb = state->base.fb;
11021102
struct drm_i915_gem_object *obj = intel_fb_obj(fb);
11031103
int crtc_x, crtc_y;
11041104
unsigned int crtc_w, crtc_h;
@@ -1262,11 +1262,11 @@ intel_prepare_sprite_plane(struct drm_plane *plane,
12621262
struct intel_plane_state *state)
12631263
{
12641264
struct drm_device *dev = plane->dev;
1265-
struct drm_crtc *crtc = state->crtc;
1265+
struct drm_crtc *crtc = state->base.crtc;
12661266
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
12671267
struct intel_plane *intel_plane = to_intel_plane(plane);
12681268
enum pipe pipe = intel_crtc->pipe;
1269-
struct drm_framebuffer *fb = state->fb;
1269+
struct drm_framebuffer *fb = state->base.fb;
12701270
struct drm_i915_gem_object *obj = intel_fb_obj(fb);
12711271
struct drm_i915_gem_object *old_obj = intel_plane->obj;
12721272
int ret;
@@ -1297,11 +1297,11 @@ intel_commit_sprite_plane(struct drm_plane *plane,
12971297
struct intel_plane_state *state)
12981298
{
12991299
struct drm_device *dev = plane->dev;
1300-
struct drm_crtc *crtc = state->crtc;
1300+
struct drm_crtc *crtc = state->base.crtc;
13011301
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
13021302
struct intel_plane *intel_plane = to_intel_plane(plane);
13031303
enum pipe pipe = intel_crtc->pipe;
1304-
struct drm_framebuffer *fb = state->fb;
1304+
struct drm_framebuffer *fb = state->base.fb;
13051305
struct drm_i915_gem_object *obj = intel_fb_obj(fb);
13061306
struct drm_i915_gem_object *old_obj = intel_plane->obj;
13071307
int crtc_x, crtc_y;
@@ -1391,8 +1391,8 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
13911391
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
13921392
int ret;
13931393

1394-
state.crtc = crtc;
1395-
state.fb = fb;
1394+
state.base.crtc = crtc;
1395+
state.base.fb = fb;
13961396

13971397
/* sample coordinates in 16.16 fixed point */
13981398
state.src.x1 = src_x;

0 commit comments

Comments
 (0)