[PATCH 1/7] drm/i915: Remove leftover intel_sprite_set_colorkey_ioctl() prototype

[Ville Syrjälä]

On Sun, Sep 22, 2024 at 09:31:10AM +0000, Govindapillai, Vinod wrote:
> On Mon, 2024-09-16 at 19:24 +0300, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > 
> > intel_sprite_set_colorkey_ioctl() lives in intel_sprice_uapi.{c,h}
> > these days. For some reason the old protoype was left behind
> > in intel_sprite.h and even used by i915_driver.c. Remove the
> > leftovers and switch to including the correct header for the
> > prototype.
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_sprite.h | 3 ---
> >  drivers/gpu/drm/i915/i915_driver.c          | 2 +-
> >  2 files changed, 1 insertion(+), 4 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h
> > b/drivers/gpu/drm/i915/display/intel_sprite.h
> > index 044a032e41b9..f22abeb82032 100644
> > --- a/drivers/gpu/drm/i915/display/intel_sprite.h
> > +++ b/drivers/gpu/drm/i915/display/intel_sprite.h
> > @@ -10,7 +10,6 @@
> >  
> >  struct drm_device;
> >  struct drm_display_mode;
> Not related to this patch, the above seems to be unused as well.

drm_device I should have removed in this patch it seems.
The other one is some older leftover.

I'll see if I can remember to remedy that when applying
the patch...

> 
> Reviewed-by: Vinod Govindapillai <vinod.govindapillai at intel.com>

Ta.


> 
> > -struct drm_file;
> >  struct drm_i915_private;
> >  struct intel_crtc_state;
> >  struct intel_plane_state;
> > @@ -19,8 +18,6 @@ enum pipe;
> >  #ifdef I915
> >  struct intel_plane *intel_sprite_plane_create(struct drm_i915_private *dev_priv,
> >                                               enum pipe pipe, int plane);
> > -int intel_sprite_set_colorkey_ioctl(struct drm_device *dev, void *data,
> > -                                   struct drm_file *file_priv);
> >  int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state);
> >  int chv_plane_check_rotation(const struct intel_plane_state *plane_state);
> >  
> > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> > index 943e938040c0..b0ec54a4e033 100644
> > --- a/drivers/gpu/drm/i915/i915_driver.c
> > +++ b/drivers/gpu/drm/i915/i915_driver.c
> > @@ -59,7 +59,7 @@
> >  #include "display/intel_overlay.h"
> >  #include "display/intel_pch_refclk.h"
> >  #include "display/intel_pps.h"
> > -#include "display/intel_sprite.h"
> > +#include "display/intel_sprite_uapi.h"
> >  #include "display/skl_watermark.h"
> >  
> >  #include "gem/i915_gem_context.h"
> 

-- 
Ville Syrjälä
Intel