summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2015-03-19 17:57:11 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-03-20 11:48:19 +0100
commitbdd7554d568fa165b0e86fc32b1cde3c895ff774 (patch)
treef3a352f3da3431e9b6bb219cb9c2a8d81a51622d /drivers/gpu/drm/i915/intel_drv.h
parent6702cf16e0ba8b0129f5aa1b6609d4e9c70bc13b (diff)
downloadlinux-bdd7554d568fa165b0e86fc32b1cde3c895ff774.tar.gz
linux-bdd7554d568fa165b0e86fc32b1cde3c895ff774.tar.bz2
linux-bdd7554d568fa165b0e86fc32b1cde3c895ff774.zip
drm/i915: Kill intel_plane->obj
intel_plane->obj is not used anymore so kill it. Also don't pass both the fb and obj to the sprite .update_plane() hook, as just passing the fb is enough. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 8bb18e507f5f..c06854df466d 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -507,7 +507,6 @@ struct intel_plane {
struct drm_plane base;
int plane;
enum pipe pipe;
- struct drm_i915_gem_object *obj;
bool can_scale;
int max_downscale;
@@ -527,7 +526,6 @@ struct intel_plane {
void (*update_plane)(struct drm_plane *plane,
struct drm_crtc *crtc,
struct drm_framebuffer *fb,
- struct drm_i915_gem_object *obj,
int crtc_x, int crtc_y,
unsigned int crtc_w, unsigned int crtc_h,
uint32_t x, uint32_t y,