Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1b9d039 authored by Sagar Arun Kamble's avatar Sagar Arun Kamble Committed by Daniel Vetter
Browse files

drm/i915: Fix fb object's frontbuffer-bits 



Shared frontbuffer bits are causing warnings when same FB is displayed
in another plane without clearing the bits from previous plane.

v2: Removing coversion of fb bits to 64 bit as it is not needed for now. (Daniel)

Change-Id: Ic2df80747f314b82afd22f8326297c57d1e652c6
Signed-off-by: default avatarSagar Arun Kamble <sagar.a.kamble@intel.com>
Signed-off-by: default avatarKumar, Mahesh <mahesh1.kumar@intel.com>
[danvet: Drop INTEL_FRONTBUFFER_SPRITE_MASK since unused.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6b6d5626

drivers/gpu/drm/i915/i915_drv.h

+8 −7
Original line number Diff line number Diff line
@@ -2011,25 +2011,26 @@ struct drm_i915_gem_object_ops { 


/*

 * Frontbuffer tracking bits. Set in obj->frontbuffer_bits while a gem bo is

 * considered to be the frontbuffer for the given plane interface-vise. This

 * considered to be the frontbuffer for the given plane interface-wise. This

 * doesn't mean that the hw necessarily already scans it out, but that any

 * rendering (by the cpu or gpu) will land in the frontbuffer eventually.

 *

 * We have one bit per pipe and per scanout plane type.

 */

#define INTEL_FRONTBUFFER_BITS_PER_PIPE 4

#define INTEL_MAX_SPRITE_BITS_PER_PIPE 5

#define INTEL_FRONTBUFFER_BITS_PER_PIPE 8

#define INTEL_FRONTBUFFER_BITS \

	(INTEL_FRONTBUFFER_BITS_PER_PIPE * I915_MAX_PIPES)

#define INTEL_FRONTBUFFER_PRIMARY(pipe) \

	(1 << (INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe)))

#define INTEL_FRONTBUFFER_CURSOR(pipe) \

	(1 << (1 + (INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe))))

#define INTEL_FRONTBUFFER_SPRITE(pipe) \

	(1 << (2 +(INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe))))

#define INTEL_FRONTBUFFER_SPRITE(pipe, plane) \

	(1 << (2 + plane + (INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe))))

#define INTEL_FRONTBUFFER_OVERLAY(pipe) \

	(1 << (3 +(INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe))))

	(1 << (2 + INTEL_MAX_SPRITE_BITS_PER_PIPE + (INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe))))

#define INTEL_FRONTBUFFER_ALL_MASK(pipe) \

	(0xf << (INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe)))

	(0xff << (INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe)))



struct drm_i915_gem_object {

	struct drm_gem_object base;

drivers/gpu/drm/i915/intel_sprite.c

+1 −1
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) 


	intel_plane->pipe = pipe;

	intel_plane->plane = plane;

	intel_plane->frontbuffer_bit = INTEL_FRONTBUFFER_SPRITE(pipe);

	intel_plane->frontbuffer_bit = INTEL_FRONTBUFFER_SPRITE(pipe, plane);

	intel_plane->check_plane = intel_check_sprite_plane;

	intel_plane->commit_plane = intel_commit_sprite_plane;

	possible_crtcs = (1 << pipe);