| Message ID | 20210208104149.423758-1-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/qxl: properly handle device init failures | expand |
Does this patch fix an issue raised previously? Or should they be used together? https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2466541.html <https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2466541.html> IMHO using this patch alone won’t fix the issue -- Best, - Tong > On Feb 8, 2021, at 5:41 AM, Gerd Hoffmann <kraxel@redhat.com> wrote: > > Specifically do not try release resources which where > not allocated in the first place. > > Cc: Tong Zhang <ztong0001@gmail.com> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > drivers/gpu/drm/qxl/qxl_display.c | 3 +++ > drivers/gpu/drm/qxl/qxl_kms.c | 4 ++++ > 2 files changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c > index c326412136c5..ec50d2cfd4e1 100644 > --- a/drivers/gpu/drm/qxl/qxl_display.c > +++ b/drivers/gpu/drm/qxl/qxl_display.c > @@ -1183,6 +1183,9 @@ int qxl_destroy_monitors_object(struct qxl_device *qdev) > { > int ret; > > + if (!qdev->monitors_config_bo) > + return 0; > + > qdev->monitors_config = NULL; > qdev->ram_header->monitors_config = 0; > > diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c > index 66d74aaaee06..4dc5ad13f12c 100644 > --- a/drivers/gpu/drm/qxl/qxl_kms.c > +++ b/drivers/gpu/drm/qxl/qxl_kms.c > @@ -288,6 +288,10 @@ void qxl_device_fini(struct qxl_device *qdev) > { > int cur_idx; > > + /* check if qxl_device_init() was successful (gc_work is initialized last) */ > + if (!qdev->gc_work.func) > + return; > + > for (cur_idx = 0; cur_idx < 3; cur_idx++) { > if (!qdev->current_release_bo[cur_idx]) > continue; > -- > 2.29.2 >
Does this patch fix an issue raised previously? Or should they be used together? https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2466541.html IMHO using this patch alone won’t fix the issue -- Best, - Tong > On Feb 8, 2021, at 5:41 AM, Gerd Hoffmann <kraxel@redhat.com> wrote: > > Specifically do not try release resources which where > not allocated in the first place. > > Cc: Tong Zhang <ztong0001@gmail.com> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > drivers/gpu/drm/qxl/qxl_display.c | 3 +++ > drivers/gpu/drm/qxl/qxl_kms.c | 4 ++++ > 2 files changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c > index c326412136c5..ec50d2cfd4e1 100644 > --- a/drivers/gpu/drm/qxl/qxl_display.c > +++ b/drivers/gpu/drm/qxl/qxl_display.c > @@ -1183,6 +1183,9 @@ int qxl_destroy_monitors_object(struct qxl_device *qdev) > { > int ret; > > + if (!qdev->monitors_config_bo) > + return 0; > + > qdev->monitors_config = NULL; > qdev->ram_header->monitors_config = 0; > > diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c > index 66d74aaaee06..4dc5ad13f12c 100644 > --- a/drivers/gpu/drm/qxl/qxl_kms.c > +++ b/drivers/gpu/drm/qxl/qxl_kms.c > @@ -288,6 +288,10 @@ void qxl_device_fini(struct qxl_device *qdev) > { > int cur_idx; > > + /* check if qxl_device_init() was successful (gc_work is initialized last) */ > + if (!qdev->gc_work.func) > + return; > + > for (cur_idx = 0; cur_idx < 3; cur_idx++) { > if (!qdev->current_release_bo[cur_idx]) > continue; > -- > 2.29.2 >
On Mon, Feb 08, 2021 at 12:07:01PM -0500, Tong Zhang wrote: > Does this patch fix an issue raised previously? Or should they be used together? > https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2466541.html > > IMHO using this patch alone won’t fix the issue This patch on top of drm-misc-next fixes the initialization error issue reported by you in my testing. take care, Gerd
Hi Gerd, I tested the patch on drm-misc-next and it fixed the issue. Thanks, - Tong > On Feb 9, 2021, at 7:16 AM, Gerd Hoffmann <kraxel@redhat.com> wrote: > > On Mon, Feb 08, 2021 at 12:07:01PM -0500, Tong Zhang wrote: >> Does this patch fix an issue raised previously? Or should they be used together? >> https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2466541.html >> >> IMHO using this patch alone won’t fix the issue > > This patch on top of drm-misc-next fixes the initialization error issue > reported by you in my testing. > > take care, > Gerd >
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index c326412136c5..ec50d2cfd4e1 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c @@ -1183,6 +1183,9 @@ int qxl_destroy_monitors_object(struct qxl_device *qdev) { int ret; + if (!qdev->monitors_config_bo) + return 0; + qdev->monitors_config = NULL; qdev->ram_header->monitors_config = 0; diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index 66d74aaaee06..4dc5ad13f12c 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c @@ -288,6 +288,10 @@ void qxl_device_fini(struct qxl_device *qdev) { int cur_idx; + /* check if qxl_device_init() was successful (gc_work is initialized last) */ + if (!qdev->gc_work.func) + return; + for (cur_idx = 0; cur_idx < 3; cur_idx++) { if (!qdev->current_release_bo[cur_idx]) continue;
Specifically do not try release resources which where not allocated in the first place. Cc: Tong Zhang <ztong0001@gmail.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- drivers/gpu/drm/qxl/qxl_display.c | 3 +++ drivers/gpu/drm/qxl/qxl_kms.c | 4 ++++ 2 files changed, 7 insertions(+)