author Maarten Lankhorst <maarten.lankho...@linux.intel.com> 2015-12-03 12:49:13 (GMT) committer Maarten Lankhorst <maarten.lankho...@linux.intel.com> 2015-12-07 09:56:08 (GMT) commit 92826fcdfc147a7d16766e987c12a9dfe1860c3f (patch) tree 5d5f93ea48390b6f51328461f31d46c196b4b0c9 parent ab1d3a0e5a44f5b1a8d1f811e925c8519b56fba4 (diff) drm/i915: Calculate watermark related members in the crtc_state, v4. This removes pre/post_wm_update from intel_crtc->atomic, and creates atomic state for it in intel_crtc.
Changes since v1: - Rebase on top of wm changes. Changes since v2: - Split disable_cxsr into a separate patch. Changes since v3: - Move some of the changes to intel_wm_need_update. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/56603a49.5000...@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vet...@ffwll.ch> Diffstat -rw-r--r-- drivers/gpu/drm/i915/intel_atomic.c 1 -rw-r--r-- drivers/gpu/drm/i915/intel_display.c 39 -rw-r--r-- drivers/gpu/drm/i915/intel_drv.h 2 3 files changed, 21 insertions, 21 deletions diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index 96e3fa9..d0b1c9a 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -96,6 +96,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false; crtc_state->disable_cxsr = false; + crtc_state->wm_changed = false; return &crtc_state->base; } diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8dcab23..a8fb7cf 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4793,6 +4793,8 @@ intel_pre_disable_primary(struct drm_crtc *crtc) static void intel_post_plane_update(struct intel_crtc *crtc) { struct intel_crtc_atomic_commit *atomic = &crtc->atomic; + struct intel_crtc_state *pipe_config = + to_intel_crtc_state(crtc->base.state); struct drm_device *dev = crtc->base.dev; if (atomic->wait_vblank) @@ -4802,7 +4804,7 @@ static void intel_post_plane_update(struct intel_crtc *crtc) crtc->wm.cxsr_allowed = true; - if (crtc->atomic.update_wm_post) + if (pipe_config->wm_changed) intel_update_watermarks(&crtc->base); if (atomic->update_fbc) @@ -4835,6 +4837,9 @@ static void intel_pre_plane_update(struct intel_crtc *crtc) crtc->wm.cxsr_allowed = false; intel_set_memory_cxsr(dev_priv, false); } + + if (!needs_modeset(&pipe_config->base) && pipe_config->wm_changed) + intel_update_watermarks(&crtc->base); } static void intel_crtc_disable_planes(struct drm_crtc *crtc, unsigned plane_mask) @@ -11696,9 +11701,14 @@ static bool intel_wm_need_update(struct drm_plane *plane, struct intel_plane_state *cur = to_intel_plane_state(plane->state); /* Update watermarks on tiling or size changes. */ - if (!plane->state->fb || !state->fb || - plane->state->fb->modifier[0] != state->fb->modifier[0] || - plane->state->rotation != state->rotation || + if (new->visible != cur->visible) + return true; + + if (!cur->base.fb || !new->base.fb) + return false; + + if (cur->base.fb->modifier[0] != new->base.fb->modifier[0] || + cur->base.rotation != new->base.rotation || drm_rect_width(&new->src) != drm_rect_width(&cur->src) || drm_rect_height(&new->src) != drm_rect_height(&cur->src) || drm_rect_width(&new->dst) != drm_rect_width(&cur->dst) || @@ -11768,17 +11778,9 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, plane->base.id, was_visible, visible, turn_off, turn_on, mode_changed); - if (turn_on) { - intel_crtc->atomic.update_wm_pre = true; - /* must disable cxsr around plane enable/disable */ - if (plane->type != DRM_PLANE_TYPE_CURSOR) { - pipe_config->disable_cxsr = true; - /* to potentially re-enable cxsr */ - intel_crtc->atomic.wait_vblank = true; - intel_crtc->atomic.update_wm_post = true; - } - } else if (turn_off) { - intel_crtc->atomic.update_wm_post = true; + if (turn_on || turn_off) { + pipe_config->wm_changed = true; + /* must disable cxsr around plane enable/disable */ if (plane->type != DRM_PLANE_TYPE_CURSOR) { if (is_crtc_enabled) @@ -11786,7 +11788,7 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, pipe_config->disable_cxsr = true; } } else if (intel_wm_need_update(plane, plane_state)) { - intel_crtc->atomic.update_wm_pre = true; + pipe_config->wm_changed = true; } if (visible || was_visible) @@ -11931,7 +11933,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc, } if (mode_changed && !crtc_state->active) - intel_crtc->atomic.update_wm_post = true; + pipe_config->wm_changed = true; if (mode_changed && crtc_state->enable && dev_priv->display.crtc_compute_clock && @@ -13854,9 +13856,6 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc, to_intel_crtc_state(old_crtc_state); bool modeset = needs_modeset(crtc->state); - if (intel_crtc->atomic.update_wm_pre) - intel_update_watermarks(crtc); - /* Perform vblank evasion around commit operation */ intel_pipe_update_start(intel_crtc); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 5247461..974ab04 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -369,6 +369,7 @@ struct intel_crtc_state { bool update_pipe; /* can a fast modeset be performed? */ bool disable_cxsr; + bool wm_changed; /* watermarks are updated */ /* Pipe source size (ie. panel fitter input size) * All planes will be positioned inside this space, @@ -535,7 +536,6 @@ struct intel_crtc_atomic_commit { bool disable_fbc; bool disable_ips; bool pre_disable_primary; - bool update_wm_pre, update_wm_post; /* Sleepable operations to perform after commit */ unsigned fb_bits; -- You received this bug notification because you are a member of Kernel Packages, which is subscribed to linux in Ubuntu. https://bugs.launchpad.net/bugs/1542939 Title: system freeze after vt switching Status in Linux: Fix Released Status in linux package in Ubuntu: Confirmed Status in Fedora: Unknown Bug description: I'm trying to use the ctrl+alt+1 to switch to a terminal - ok, after switching back by ctrl+alt+7 the system freeze ProblemType: Bug DistroRelease: Ubuntu 16.04 Package: linux-image-4.4.0-3-generic 4.4.0-3.17 ProcVersionSignature: Ubuntu 4.4.0-3.17-generic 4.4.1 Uname: Linux 4.4.0-3-generic x86_64 ApportVersion: 2.19.4-0ubuntu2 Architecture: amd64 AudioDevicesInUse: USER PID ACCESS COMMAND /dev/snd/controlC0: stinger 1644 F.... pulseaudio Date: Sun Feb 7 22:27:42 2016 HibernationDevice: RESUME=UUID=888e93f3-1a7d-4bf8-a00d-cea6a759d03a InstallationDate: Installed on 2015-11-12 (87 days ago) InstallationMedia: Ubuntu 16.04 LTS "Xenial Xerus" - Alpha amd64 (20151112) Lsusb: Bus 002 Device 003: ID 24ae:2000 Bus 002 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub Bus 002 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 001 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub MachineType: ASUSTeK Computer Inc. P53E ProcFB: 0 inteldrmfb ProcKernelCmdLine: BOOT_IMAGE=/boot/vmlinuz-4.4.0-3-generic root=UUID=9ad09333-ac7d-4b10-99a0-1e598daa4753 ro quiet splash vt.handoff=7 RelatedPackageVersions: linux-restricted-modules-4.4.0-3-generic N/A linux-backports-modules-4.4.0-3-generic N/A linux-firmware 1.155 SourcePackage: linux UpgradeStatus: No upgrade log present (probably fresh install) dmi.bios.date: 03/15/2012 dmi.bios.vendor: American Megatrends Inc. dmi.bios.version: P53E.209 dmi.board.asset.tag: ATN12345678901234567 dmi.board.name: P53E dmi.board.vendor: ASUSTeK Computer Inc. dmi.board.version: 1.0 dmi.chassis.asset.tag: No Asset Tag dmi.chassis.type: 10 dmi.chassis.vendor: ASUSTeK Computer Inc. dmi.chassis.version: 1.0 dmi.modalias: dmi:bvnAmericanMegatrendsInc.:bvrP53E.209:bd03/15/2012:svnASUSTeKComputerInc.:pnP53E:pvr1.0:rvnASUSTeKComputerInc.:rnP53E:rvr1.0:cvnASUSTeKComputerInc.:ct10:cvr1.0: dmi.product.name: P53E dmi.product.version: 1.0 dmi.sys.vendor: ASUSTeK Computer Inc. To manage notifications about this bug go to: https://bugs.launchpad.net/linux/+bug/1542939/+subscriptions -- Mailing list: https://launchpad.net/~kernel-packages Post to : kernel-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~kernel-packages More help : https://help.launchpad.net/ListHelp
