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

Commit d5515991 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: Remove references to crtc->active from intel_fbdev.c 



It should really use the atomic state.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 44522d85

drivers/gpu/drm/i915/intel_fbdev.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -550,7 +550,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, 
			intel_fb_obj(crtc->primary->state->fb);

			intel_fb_obj(crtc->primary->state->fb);

		intel_crtc = to_intel_crtc(crtc);

		intel_crtc = to_intel_crtc(crtc);





		if (!intel_crtc->active || !obj) {

		if (!crtc->state->active || !obj) {

			DRM_DEBUG_KMS("pipe %c not active or no fb, skipping\n",

			DRM_DEBUG_KMS("pipe %c not active or no fb, skipping\n",

				      pipe_name(intel_crtc->pipe));

				      pipe_name(intel_crtc->pipe));

			continue;

			continue;
@@ -575,7 +575,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, 




		intel_crtc = to_intel_crtc(crtc);

		intel_crtc = to_intel_crtc(crtc);





		if (!intel_crtc->active) {

		if (!crtc->state->active) {

			DRM_DEBUG_KMS("pipe %c not active, skipping\n",

			DRM_DEBUG_KMS("pipe %c not active, skipping\n",

				      pipe_name(intel_crtc->pipe));

				      pipe_name(intel_crtc->pipe));

			continue;

			continue;
@@ -638,7 +638,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, 
	for_each_crtc(dev, crtc) {

	for_each_crtc(dev, crtc) {

		intel_crtc = to_intel_crtc(crtc);

		intel_crtc = to_intel_crtc(crtc);





		if (!intel_crtc->active)

		if (!crtc->state->active)

			continue;

			continue;





		WARN(!crtc->primary->fb,

		WARN(!crtc->primary->fb,