From patchwork Fri Aug 14 06:57:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1344664 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BSZ5n0h0gz9sPB; Fri, 14 Aug 2020 16:58:21 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1k6TfN-0007mP-HV; Fri, 14 Aug 2020 06:58:17 +0000 Received: from mail-pl1-f182.google.com ([209.85.214.182]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1k6TfJ-0007fV-6h for kernel-team@lists.ubuntu.com; Fri, 14 Aug 2020 06:58:13 +0000 Received: by mail-pl1-f182.google.com with SMTP id y6so3765673plt.3 for ; Thu, 13 Aug 2020 23:58:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PLaX5bPqoBoIQ2yfsrjmIpAWXA0ybN+l6Ujk9fwDuuc=; b=eR6MLUA/NL0PowaSyO09Lm+IvIiWAIhWxwIipAM+XsCZcZs1RoZh52sDvJKuqO42yO MpCOvF+KnMiw+fntec/TQE6eBkg0XK1qjHp2kDcEaUA9z0ygqqPSzhKrUosIeqVOYLSQ x7U3ofPOpFOhYtHEOGaAc9wnsPbIUY/CxU+QEBdRdRV/MuZJu28xau41TuKhPgaSV9O/ oRSwvTKEc9lvVdWzbD8370VsVnSgSGDKlTr7RQb1ZrHmHHdFOC+a9mXKsdpLSt8Ct2if qRORqviSaR42T45pYn79HGlvv7vwoB+y3T9ln+E7hnvkB7A7EzbwsnZPVFWkQGCIBQhk VtBQ== X-Gm-Message-State: AOAM533la7RRuhCD/S3tzckkPUX7MRAUl+gR7P9WKZIXS8JKoA3/MsTs hlkiUAvW/PxIy0cxjO3PeXpdJQ6i22Rr/w== X-Google-Smtp-Source: ABdhPJyC87tJygMQ4bb9cwdAPL1ruNE8XPLFWiFyl0577bvWcX/nV1K7bBGFgY4rYaJKKMgaK+FOsA== X-Received: by 2002:a17:902:9009:: with SMTP id a9mr1027396plp.252.1597388288141; Thu, 13 Aug 2020 23:58:08 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id m3sm7096834pjs.22.2020.08.13.23.58.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2020 23:58:07 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 09/31][SRU][OEM-5.6] drm/i915: Move intel_atomic_state_free() into intel_atomic.c Date: Fri, 14 Aug 2020 14:57:18 +0800 Message-Id: <20200814065740.276039-10-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200814065740.276039-1-vicamo.yang@canonical.com> References: <20200814065740.276039-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.182; envelope-from=vicamo@gmail.com; helo=mail-pl1-f182.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Ville Syrjälä BugLink: https://bugs.launchpad.net/bugs/1891451 Move intel_atomic_state_free() next to its counterpart. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20200120174728.21095-13-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak (cherry picked from commit 5f34299384cb70e7d844d3301be783d437dda97b) Signed-off-by: You-Sheng Yang --- drivers/gpu/drm/i915/display/intel_atomic.c | 11 +++++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 1 + drivers/gpu/drm/i915/display/intel_display.c | 11 ----------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c index 1269f63ea006..1c13423d4945 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic.c +++ b/drivers/gpu/drm/i915/display/intel_atomic.c @@ -495,6 +495,17 @@ intel_atomic_state_alloc(struct drm_device *dev) return &state->base; } +void intel_atomic_state_free(struct drm_atomic_state *_state) +{ + struct intel_atomic_state *state = to_intel_atomic_state(_state); + + drm_atomic_state_default_release(&state->base); + + i915_sw_fence_fini(&state->commit_ready); + + kfree(state); +} + void intel_atomic_state_clear(struct drm_atomic_state *s) { struct intel_atomic_state *state = to_intel_atomic_state(s); diff --git a/drivers/gpu/drm/i915/display/intel_atomic.h b/drivers/gpu/drm/i915/display/intel_atomic.h index 74c749dbfb4f..88133eea0a17 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic.h +++ b/drivers/gpu/drm/i915/display/intel_atomic.h @@ -45,6 +45,7 @@ void intel_crtc_destroy_state(struct drm_crtc *crtc, void intel_crtc_free_hw_state(struct intel_crtc_state *crtc_state); void intel_crtc_copy_color_blobs(struct intel_crtc_state *crtc_state); struct drm_atomic_state *intel_atomic_state_alloc(struct drm_device *dev); +void intel_atomic_state_free(struct drm_atomic_state *state); void intel_atomic_state_clear(struct drm_atomic_state *state); struct intel_crtc_state * diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 4972d5ef45c2..45940fe951b0 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -17160,17 +17160,6 @@ intel_user_framebuffer_create(struct drm_device *dev, return fb; } -static void intel_atomic_state_free(struct drm_atomic_state *state) -{ - struct intel_atomic_state *intel_state = to_intel_atomic_state(state); - - drm_atomic_state_default_release(state); - - i915_sw_fence_fini(&intel_state->commit_ready); - - kfree(state); -} - static enum drm_mode_status intel_mode_valid(struct drm_device *dev, const struct drm_display_mode *mode)