Commit f86d45ac authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Remove leftover intel_sprite_set_colorkey_ioctl() prototype 



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.

v2: Drop more unnecessary forward declarations

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240916162413.8555-2-ville.syrjala@linux.intel.com


Reviewed-by: default avatarVinod Govindapillai <vinod.govindapillai@intel.com>
parent c2579a21

drivers/gpu/drm/i915/display/intel_sprite.h

+0 −5
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ 


#include <linux/types.h>



struct drm_device;

struct drm_display_mode;

struct drm_file;

struct drm_i915_private;

struct intel_crtc_state;

struct intel_plane_state;
@@ -19,8 +16,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);

drivers/gpu/drm/i915/i915_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -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"