* [PATCH] drm/i915: Fake AGP is dead
@ 2015-07-27 9:47 Daniel Vetter
2015-07-28 8:43 ` shuang.he
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Vetter @ 2015-07-27 9:47 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter
Remove the leftovers, yay!
AGP for i915 kms died long ago with
commit 3bb6ce66866310f50d461b9eff949c1ce95560ce
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed Nov 13 22:14:16 2013 +0100
drm/i915: Kill legeacy AGP for gen3 kms
and with ums now gone to there's really no users any more.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/i915/i915_dma.c | 10 ----------
drivers/gpu/drm/i915/i915_drv.c | 4 ----
drivers/gpu/drm/i915/i915_drv.h | 1 -
3 files changed, 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 2893cd0fe5ba..183fd7ae0ccb 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1245,13 +1245,3 @@ const struct drm_ioctl_desc i915_ioctls[] = {
};
int i915_max_ioctl = ARRAY_SIZE(i915_ioctls);
-
-/*
- * This is really ugly: Because old userspace abused the linux agp interface to
- * manage the gtt, we need to claim that all intel devices are agp. For
- * otherwise the drm core refuses to initialize the agp support code.
- */
-int i915_driver_device_is_agp(struct drm_device *dev)
-{
- return 1;
-}
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7fb9de55c7bb..f1dad27c5aff 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -915,8 +915,6 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (PCI_FUNC(pdev->devfn))
return -ENODEV;
- driver.driver_features &= ~(DRIVER_USE_AGP);
-
return drm_get_pci_dev(pdev, ent, &driver);
}
@@ -1621,7 +1619,6 @@ static struct drm_driver driver = {
* deal with them for Intel hardware.
*/
.driver_features =
- DRIVER_USE_AGP |
DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME |
DRIVER_RENDER,
.load = i915_driver_load,
@@ -1636,7 +1633,6 @@ static struct drm_driver driver = {
.suspend = i915_suspend_legacy,
.resume = i915_resume_legacy,
- .device_is_agp = i915_driver_device_is_agp,
#if defined(CONFIG_DEBUG_FS)
.debugfs_init = i915_debugfs_init,
.debugfs_cleanup = i915_debugfs_cleanup,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 9aebf92132a5..213003aacc51 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2619,7 +2619,6 @@ extern void i915_driver_preclose(struct drm_device *dev,
struct drm_file *file);
extern void i915_driver_postclose(struct drm_device *dev,
struct drm_file *file);
-extern int i915_driver_device_is_agp(struct drm_device * dev);
#ifdef CONFIG_COMPAT
extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
unsigned long arg);
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Fake AGP is dead
2015-07-27 9:47 [PATCH] drm/i915: Fake AGP is dead Daniel Vetter
@ 2015-07-28 8:43 ` shuang.he
2015-07-28 11:29 ` Chris Wilson
0 siblings, 1 reply; 4+ messages in thread
From: shuang.he @ 2015-07-28 8:43 UTC (permalink / raw)
To: shuang.he, julianx.dumez, christophe.sureau, lei.a.liu, intel-gfx,
daniel.vetter
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 6873
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK 297/297 297/297
SNB 315/315 315/315
IVB 342/342 342/342
BYT -1 284/284 283/284
HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*BYT igt@gem_partial_pwrite_pread@reads PASS(1) FAIL(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Fake AGP is dead
2015-07-28 8:43 ` shuang.he
@ 2015-07-28 11:29 ` Chris Wilson
2015-07-28 15:23 ` Daniel Vetter
0 siblings, 1 reply; 4+ messages in thread
From: Chris Wilson @ 2015-07-28 11:29 UTC (permalink / raw)
To: shuang.he; +Cc: julianx.dumez, intel-gfx, lei.a.liu, daniel.vetter
On Tue, Jul 28, 2015 at 01:43:11AM -0700, shuang.he@intel.com wrote:
> Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
> Task id: 6873
> -------------------------------------Summary-------------------------------------
> Platform Delta drm-intel-nightly Series Applied
> ILK 297/297 297/297
> SNB 315/315 315/315
> IVB 342/342 342/342
> BYT -1 284/284 283/284
> HSW 378/378 378/378
> -------------------------------------Detailed-------------------------------------
> Platform Test drm-intel-nightly Series Applied
> *BYT igt@gem_partial_pwrite_pread@reads PASS(1) FAIL(1)
> Note: You need to pay more attention to line start with '*'
The original message went astry, but I read through it on patchwork and
it really is just dead code elimination.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
I felt the changelog was a little vague (I didn't understand the "really
no users left" comment), so I wouldn't mind if you tighten it up a bit!
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Fake AGP is dead
2015-07-28 11:29 ` Chris Wilson
@ 2015-07-28 15:23 ` Daniel Vetter
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2015-07-28 15:23 UTC (permalink / raw)
To: Chris Wilson, shuang.he, julianx.dumez, christophe.sureau,
lei.a.liu, intel-gfx, daniel.vetter
On Tue, Jul 28, 2015 at 12:29:37PM +0100, Chris Wilson wrote:
> On Tue, Jul 28, 2015 at 01:43:11AM -0700, shuang.he@intel.com wrote:
> > Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
> > Task id: 6873
> > -------------------------------------Summary-------------------------------------
> > Platform Delta drm-intel-nightly Series Applied
> > ILK 297/297 297/297
> > SNB 315/315 315/315
> > IVB 342/342 342/342
> > BYT -1 284/284 283/284
> > HSW 378/378 378/378
> > -------------------------------------Detailed-------------------------------------
> > Platform Test drm-intel-nightly Series Applied
> > *BYT igt@gem_partial_pwrite_pread@reads PASS(1) FAIL(1)
> > Note: You need to pay more attention to line start with '*'
>
> The original message went astry, but I read through it on patchwork and
> it really is just dead code elimination.
>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> I felt the changelog was a little vague (I didn't understand the "really
> no users left" comment), so I wouldn't mind if you tighten it up a bit!
Done a bit of clarification and pushed to dinq, thanks for the review. And
yay for mailer delay ...
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-28 15:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-27 9:47 [PATCH] drm/i915: Fake AGP is dead Daniel Vetter
2015-07-28 8:43 ` shuang.he
2015-07-28 11:29 ` Chris Wilson
2015-07-28 15:23 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox