From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 893A9C77B61 for ; Thu, 13 Apr 2023 07:19:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 477B310E10A; Thu, 13 Apr 2023 07:19:26 +0000 (UTC) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1342610E10A for ; Thu, 13 Apr 2023 07:19:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681370365; x=1712906365; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=VU9H5Qq9LvRLyVXfAMKoZ/xchmkpVtJT7/1v53cjG+Y=; b=k1sem4F5+w0gFvH8mHPKVH5gB0vtJ9DzXJCgOjhgsi5BGebtlaYXW4R+ bkETGFW5MvO7YGSxDxzNU63HSNptVhpB3GJRJZSY4havj1VGLBcjq6yIR Zf6SujokKZZ/asSWanOHN+66KvTMqnCcewxLIlOLpmH5sr3vbDUgLmBo9 l9CnZnCL8MxRmPBiM3/L7aEOZArhEJfgODz6Py1M7WMYUxapTq+g95re8 N8Ujwcbwj/uPdUU1IlnBzb14NQ7QjE97BImeumuq92DmNQodsL8ddso2M u12pj/exFDYEgsthkmrdOsUWrcTcQe6s1ukrUg77fiNJlFttBK75YtDy3 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="406946993" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="406946993" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2023 00:19:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="833023782" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="833023782" Received: from svadali-mobl1.amr.corp.intel.com (HELO localhost) ([10.252.55.23]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2023 00:19:22 -0700 From: Jani Nikula To: Lucas De Marchi , intel-xe@lists.freedesktop.org In-Reply-To: <871qkocku6.fsf@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20230412232846.3411883-1-lucas.demarchi@intel.com> <20230412232846.3411883-3-lucas.demarchi@intel.com> <871qkocku6.fsf@intel.com> Date: Thu, 13 Apr 2023 10:19:19 +0300 Message-ID: <87y1mwb66g.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-xe] [PATCH 2/6] fixup! drm/i915/display: Remaining changes to make xe compile X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lucas De Marchi , Matt Roper Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Thu, 13 Apr 2023, Jani Nikula wrote: > On Wed, 12 Apr 2023, Lucas De Marchi wrote: >> --- >> drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c >> index ed996546edfc..46447dd58f3f 100644 >> --- a/drivers/gpu/drm/i915/display/intel_fbdev.c >> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c >> @@ -165,7 +165,7 @@ static int intelfb_alloc(struct drm_fb_helper *helper, >> DIV_ROUND_UP(sizes->surface_bpp, 8), 64); >> #else >> mode_cmd.pitches[0] = ALIGN(mode_cmd.width * >> - DIV_ROUND_UP(sizes->surface_bpp, 8), GEN8_PAGE_SIZE); >> + DIV_ROUND_UP(sizes->surface_bpp, 8), XE_PAGE_SIZE); > > Won't that break i915 build? Won't, -ENOCOFFEE. > >> #endif >> mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp, >> sizes->surface_depth); -- Jani Nikula, Intel Open Source Graphics Center