From patchwork Wed Oct 14 13:56:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 53675 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9EDv7Xg015827 for ; Wed, 14 Oct 2009 13:57:07 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9AF18A08BF; Wed, 14 Oct 2009 06:57:07 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.ffwll.ch (cable-static-49-187.intergga.ch [157.161.49.187]) by gabe.freedesktop.org (Postfix) with ESMTP id EE008A08BF for ; Wed, 14 Oct 2009 06:57:03 -0700 (PDT) Received: by mail.ffwll.ch (Postfix, from userid 1000) id ED90820C178; Wed, 14 Oct 2009 15:57:01 +0200 (CEST) X-Spam-ASN: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on orange.ffwll.ch X-Spam-Level: X-Spam-Hammy: 0.000-+--struct, 0.000-+--signed-off-by, 0.000-+--signedoffby X-Spam-Status: No, score=-4.4 required=6.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Spammy: 0.967-+--H*Ad:U*daniel.vetter, 0.964-+--H*m:ffwll, 0.949-+--H*r:mail.ffwll.ch Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id 2590120C15A; Wed, 14 Oct 2009 15:56:51 +0200 (CEST) Received: from daniel by biene with local (Exim 4.69) (envelope-from ) id 1My4Lm-0001UZ-Rc; Wed, 14 Oct 2009 15:57:10 +0200 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Wed, 14 Oct 2009 15:56:54 +0200 Message-Id: X-Mailer: git-send-email 1.6.4.3 In-Reply-To: <2460d76ad5480bde2371b54120d2dcd9c1da0bcc.1255528349.git.daniel.vetter@ffwll.ch> References: <2460d76ad5480bde2371b54120d2dcd9c1da0bcc.1255528349.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 2/3] Xv: fixup the disabled drmmode overlay code X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org diff --git a/src/i830_video.c b/src/i830_video.c index 6e51ba7..69276de 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -214,7 +214,7 @@ static Bool drmmode_has_overlay(ScrnInfoPtr scrn) gp.param = I915_PARAM_HAS_OVERLAY; gp.value = &has_overlay; - drmCommandWriteRead(p830->drmSubFD, DRM_I915_GETPARAM, &gp, sizeof(gp)); + drmCommandWriteRead(intel->drmSubFD, DRM_I915_GETPARAM, &gp, sizeof(gp)); return has_overlay ? TRUE : FALSE; #else @@ -226,7 +226,7 @@ static void drmmode_overlay_update_attrs(ScrnInfoPtr scrn) { #ifdef DRM_MODE_OVERLAY_LANDED intel_screen_private *intel = intel_get_screen_private(scrn); - intel_adaptor_private *adaptor_priv = GET_PORT_PRIVATE(scrn); + intel_adaptor_private *adaptor_priv = intel_get_adaptor_private(scrn); struct drm_intel_overlay_attrs attrs; int ret; @@ -242,7 +242,7 @@ static void drmmode_overlay_update_attrs(ScrnInfoPtr scrn) attrs.gamma4 = adaptor_priv->gamma4; attrs.gamma5 = adaptor_priv->gamma5; - ret = drmCommandWriteRead(p830->drmSubFD, DRM_I915_OVERLAY_ATTRS, + ret = drmCommandWriteRead(intel->drmSubFD, DRM_I915_OVERLAY_ATTRS, &attrs, sizeof(attrs)); if (ret != 0) @@ -259,7 +259,7 @@ static void drmmode_overlay_off(ScrnInfoPtr scrn) request.flags = 0; - ret = drmCommandWrite(p830->drmSubFD, DRM_I915_OVERLAY_PUT_IMAGE, + ret = drmCommandWrite(intel->drmSubFD, DRM_I915_OVERLAY_PUT_IMAGE, &request, sizeof(request)); if (ret != 0) @@ -276,7 +276,7 @@ drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc, { #ifdef DRM_MODE_OVERLAY_LANDED intel_screen_private *intel = intel_get_screen_private(scrn); - intel_adaptor_private *adaptor_priv = GET_PORT_PRIVATE(scrn); + intel_adaptor_private *adaptor_priv = intel_get_adaptor_private(scrn); struct drm_intel_overlay_put_image request; int ret; int planar = is_planar_fourcc(id); @@ -327,7 +327,7 @@ drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc, request.flags |= I915_OVERLAY_Y_SWAP; } - ret = drmCommandWrite(p830->drmSubFD, DRM_I915_OVERLAY_PUT_IMAGE, + ret = drmCommandWrite(intel->drmSubFD, DRM_I915_OVERLAY_PUT_IMAGE, &request, sizeof(request)); /* drop the newly displaying buffer right away */