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

Commit 9216d44d authored by Shaohua Li's avatar Shaohua Li Committed by Eric Anholt
Browse files

drm/i915: disable FBC for Pineview, fixing a boot hang. 



Pineview doesn't have this FBC mechanism, so this code doesn't apply.

Signed-off-by: default avatarShaohua Li <shaohua.li@intel.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 16129139

drivers/gpu/drm/i915/i915_dma.c

+1 −2
Original line number Diff line number Diff line
@@ -1227,8 +1227,7 @@ static int i915_load_modeset_init(struct drm_device *dev, 
		goto out;



	/* Try to set up FBC with a reasonable compressed buffer size */

	if (IS_MOBILE(dev) && (IS_I9XX(dev) || IS_I965G(dev) || IS_GM45(dev)) &&

	    i915_powersave) {

	if (I915_HAS_FBC(dev) && i915_powersave) {

		int cfb_size;



		/* Try to get an 8M buffer... */

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); 


#define HAS_FW_BLC(dev) (IS_I9XX(dev) || IS_G4X(dev) || IS_IGDNG(dev))

#define HAS_PIPE_CXSR(dev) (IS_G4X(dev) || IS_IGDNG(dev))

#define I915_HAS_FBC(dev) (IS_MOBILE(dev) && (IS_I9XX(dev) || IS_I965G(dev)))

#define I915_HAS_FBC(dev) (IS_MOBILE(dev) && (IS_I9XX(dev) || IS_GM45(dev)) && !IS_IGD(dev))



#define PRIMARY_RINGBUFFER_SIZE         (128*1024)